Mercurial > kallithea
changeset 8108:8c99d5d8eb0e
cleanup: fix db.py "import *"
pyflakes rightfully complains about wildcard imports. But we like to keep the
short names, so let's just be explicit about which names we import.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 02 Jan 2020 00:57:38 +0100 |
parents | 8af15d2789fe |
children | e527cc2ce8dc |
files | kallithea/model/db.py |
diffstat | 1 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/db.py Wed Jan 08 03:11:31 2020 +0100 +++ b/kallithea/model/db.py Thu Jan 02 00:57:38 2020 +0100 @@ -38,7 +38,7 @@ import ipaddr import sqlalchemy from beaker.cache import cache_region, region_invalidate -from sqlalchemy import * +from sqlalchemy import Boolean, Column, DateTime, Float, ForeignKey, Index, Integer, LargeBinary, String, Unicode, UnicodeText, UniqueConstraint from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.orm import class_mapper, joinedload, relationship, validates from tg.i18n import lazy_ugettext as _ @@ -567,7 +567,7 @@ @classmethod def get_by_username(cls, username, case_insensitive=False, cache=False): if case_insensitive: - q = cls.query().filter(func.lower(cls.username) == func.lower(username)) + q = cls.query().filter(sqlalchemy.func.lower(cls.username) == sqlalchemy.func.lower(username)) else: q = cls.query().filter(cls.username == username) @@ -602,7 +602,7 @@ @classmethod def get_by_email(cls, email, cache=False): - q = cls.query().filter(func.lower(cls.email) == func.lower(email)) + q = cls.query().filter(sqlalchemy.func.lower(cls.email) == sqlalchemy.func.lower(email)) if cache: q = q.options(FromCache("sql_cache_short", @@ -612,7 +612,7 @@ if ret is None: q = UserEmailMap.query() # try fetching in alternate email map - q = q.filter(func.lower(UserEmailMap.email) == func.lower(email)) + q = q.filter(sqlalchemy.func.lower(UserEmailMap.email) == sqlalchemy.func.lower(email)) q = q.options(joinedload(UserEmailMap.user)) if cache: q = q.options(FromCache("sql_cache_short", @@ -857,7 +857,7 @@ def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - q = cls.query().filter(func.lower(cls.users_group_name) == func.lower(group_name)) + q = cls.query().filter(sqlalchemy.func.lower(cls.users_group_name) == sqlalchemy.func.lower(group_name)) else: q = cls.query().filter(cls.users_group_name == group_name) if cache: @@ -1054,7 +1054,7 @@ q = super(Repository, cls).query() if sorted: - q = q.order_by(func.lower(Repository.repo_name)) + q = q.order_by(sqlalchemy.func.lower(Repository.repo_name)) return q @@ -1082,7 +1082,7 @@ """Get the repo, defaulting to database case sensitivity. case_insensitive will be slower and should only be specified if necessary.""" if case_insensitive: - q = Session().query(cls).filter(func.lower(cls.repo_name) == func.lower(repo_name)) + q = Session().query(cls).filter(sqlalchemy.func.lower(cls.repo_name) == sqlalchemy.func.lower(repo_name)) else: q = Session().query(cls).filter(cls.repo_name == repo_name) q = q.options(joinedload(Repository.fork)) \ @@ -1475,7 +1475,7 @@ q = super(RepoGroup, cls).query() if sorted: - q = q.order_by(func.lower(RepoGroup.group_name)) + q = q.order_by(sqlalchemy.func.lower(RepoGroup.group_name)) return q @@ -1514,7 +1514,7 @@ group_name = group_name.rstrip('/') if case_insensitive: gr = cls.query() \ - .filter(func.lower(cls.group_name) == func.lower(group_name)) + .filter(sqlalchemy.func.lower(cls.group_name) == sqlalchemy.func.lower(group_name)) else: gr = cls.query() \ .filter(cls.group_name == group_name) @@ -2010,7 +2010,7 @@ user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id') follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id') - follows_repository = relationship('Repository', order_by=lambda: func.lower(Repository.repo_name)) + follows_repository = relationship('Repository', order_by=lambda: sqlalchemy.func.lower(Repository.repo_name)) @classmethod def get_repo_followers(cls, repo_id):