Mercurial > kallithea

changeset 6243:457f1de3ec5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
model: rename db.BaseModel to avoid confusion with base.BaseModel There exist two BaseModel classes in kallithea.model: - kallithea.model.base.BaseModel (previously kallithea.model.BaseModel) - kallithea.model.db.BaseModel Needless to say, this is very confusing, so rename one of them.
author Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
date Sun, 25 Sep 2016 15:11:14 +0200
parents d75d9ce1320d
children 3e46e6b6a27a
files kallithea/model/db.py
diffstat 1 files changed, 33 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/model/db.py	Sun Sep 25 15:06:34 2016 +0200
+++ b/kallithea/model/db.py	Sun Sep 25 15:11:14 2016 +0200
@@ -67,7 +67,7 @@
 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
 
 
-class BaseModel(object):
+class BaseDbModel(object):
     """
     Base Model for all classes
     """
@@ -180,7 +180,7 @@
                             'sqlite_autoincrement': True,
                            }
 
-class Setting(Base, BaseModel):
+class Setting(Base, BaseDbModel):
     __tablename__ = 'settings'
     __table_args__ = (
         _table_args_default_dict,
@@ -344,7 +344,7 @@
         return info
 
 
-class Ui(Base, BaseModel):
+class Ui(Base, BaseDbModel):
     __tablename__ = 'ui'
     __table_args__ = (
         # FIXME: ui_key as key is wrong and should be removed when the corresponding
@@ -414,7 +414,7 @@
                                     self.ui_key, self.ui_value)
 
 
-class User(Base, BaseModel):
+class User(Base, BaseDbModel):
     __tablename__ = 'users'
     __table_args__ = (
         Index('u_username_idx', 'username'),
@@ -562,7 +562,7 @@
     @classmethod
     def get_or_404(cls, id_, allow_default=True):
         '''
-        Overridden version of BaseModel.get_or_404, with an extra check on
+        Overridden version of BaseDbModel.get_or_404, with an extra check on
         the default user.
         '''
         user = super(User, cls).get_or_404(id_)
@@ -720,7 +720,7 @@
         return data
 
 
-class UserApiKeys(Base, BaseModel):
+class UserApiKeys(Base, BaseDbModel):
     __tablename__ = 'user_api_keys'
     __table_args__ = (
         Index('uak_api_key_idx', 'api_key'),
@@ -745,7 +745,7 @@
         return time.time() > self.expires
 
 
-class UserEmailMap(Base, BaseModel):
+class UserEmailMap(Base, BaseDbModel):
     __tablename__ = 'user_email_map'
     __table_args__ = (
         Index('uem_email_idx', 'email'),
@@ -775,7 +775,7 @@
         self._email = val.lower() if val else None
 
 
-class UserIpMap(Base, BaseModel):
+class UserIpMap(Base, BaseDbModel):
     __tablename__ = 'user_ip_map'
     __table_args__ = (
         UniqueConstraint('user_id', 'ip_addr'),
@@ -805,7 +805,7 @@
         return u"<%s('user_id:%s=>%s')>" % (self.__class__.__name__,
                                             self.user_id, self.ip_addr)
 
-class UserLog(Base, BaseModel):
+class UserLog(Base, BaseDbModel):
     __tablename__ = 'user_logs'
     __table_args__ = (
         _table_args_default_dict,
@@ -833,7 +833,7 @@
     repository = relationship('Repository', cascade='')
 
 
-class UserGroup(Base, BaseModel):
+class UserGroup(Base, BaseDbModel):
     __tablename__ = 'users_groups'
     __table_args__ = (
         _table_args_default_dict,
@@ -922,7 +922,7 @@
         return data
 
 
-class UserGroupMember(Base, BaseModel):
+class UserGroupMember(Base, BaseDbModel):
     __tablename__ = 'users_groups_members'
     __table_args__ = (
         _table_args_default_dict,
@@ -940,7 +940,7 @@
         self.user_id = u_id
 
 
-class RepositoryField(Base, BaseModel):
+class RepositoryField(Base, BaseDbModel):
     __tablename__ = 'repositories_fields'
     __table_args__ = (
         UniqueConstraint('repository_id', 'field_key'),  # no-multi field
@@ -978,7 +978,7 @@
         return row
 
 
-class Repository(Base, BaseModel):
+class Repository(Base, BaseDbModel):
     __tablename__ = 'repositories'
     __table_args__ = (
         Index('r_repo_name_idx', 'repo_name'),
@@ -1509,7 +1509,7 @@
     def __json__(self):
         return dict(landing_rev = self.landing_rev)
 
-class RepoGroup(Base, BaseModel):
+class RepoGroup(Base, BaseDbModel):
     __tablename__ = 'groups'
     __table_args__ = (
         CheckConstraint('group_id != group_parent_id', name='ck_groups_no_self_parent'),
@@ -1699,7 +1699,7 @@
         return data
 
 
-class Permission(Base, BaseModel):
+class Permission(Base, BaseDbModel):
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
@@ -1831,7 +1831,7 @@
         return q.all()
 
 
-class UserRepoToPerm(Base, BaseModel):
+class UserRepoToPerm(Base, BaseDbModel):
     __tablename__ = 'repo_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'repository_id', 'permission_id'),
@@ -1860,7 +1860,7 @@
         return u'<%s => %s >' % (self.user, self.repository)
 
 
-class UserUserGroupToPerm(Base, BaseModel):
+class UserUserGroupToPerm(Base, BaseDbModel):
     __tablename__ = 'user_user_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
@@ -1889,7 +1889,7 @@
         return u'<%s => %s >' % (self.user, self.user_group)
 
 
-class UserToPerm(Base, BaseModel):
+class UserToPerm(Base, BaseDbModel):
     __tablename__ = 'user_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'permission_id'),
@@ -1907,7 +1907,7 @@
         return u'<%s => %s >' % (self.user, self.permission)
 
 
-class UserGroupRepoToPerm(Base, BaseModel):
+class UserGroupRepoToPerm(Base, BaseDbModel):
     __tablename__ = 'users_group_repo_to_perm'
     __table_args__ = (
         UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
@@ -1936,7 +1936,7 @@
         return u'<UserGroupRepoToPerm:%s => %s >' % (self.users_group, self.repository)
 
 
-class UserGroupUserGroupToPerm(Base, BaseModel):
+class UserGroupUserGroupToPerm(Base, BaseDbModel):
     __tablename__ = 'user_group_user_group_to_perm'
     __table_args__ = (
         UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
@@ -1966,7 +1966,7 @@
         return u'<UserGroupUserGroup:%s => %s >' % (self.target_user_group, self.user_group)
 
 
-class UserGroupToPerm(Base, BaseModel):
+class UserGroupToPerm(Base, BaseDbModel):
     __tablename__ = 'users_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'permission_id',),
@@ -1981,7 +1981,7 @@
     permission = relationship('Permission')
 
 
-class UserRepoGroupToPerm(Base, BaseModel):
+class UserRepoGroupToPerm(Base, BaseDbModel):
     __tablename__ = 'user_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'group_id', 'permission_id'),
@@ -2007,7 +2007,7 @@
         return n
 
 
-class UserGroupRepoGroupToPerm(Base, BaseModel):
+class UserGroupRepoGroupToPerm(Base, BaseDbModel):
     __tablename__ = 'users_group_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'group_id'),
@@ -2033,7 +2033,7 @@
         return n
 
 
-class Statistics(Base, BaseModel):
+class Statistics(Base, BaseDbModel):
     __tablename__ = 'statistics'
     __table_args__ = (
          _table_args_default_dict,
@@ -2049,7 +2049,7 @@
     repository = relationship('Repository', single_parent=True)
 
 
-class UserFollowing(Base, BaseModel):
+class UserFollowing(Base, BaseDbModel):
     __tablename__ = 'user_followings'
     __table_args__ = (
         UniqueConstraint('user_id', 'follows_repository_id', name='uq_user_followings_user_repo'),
@@ -2073,7 +2073,7 @@
         return cls.query().filter(cls.follows_repo_id == repo_id)
 
 
-class CacheInvalidation(Base, BaseModel):
+class CacheInvalidation(Base, BaseDbModel):
     __tablename__ = 'cache_invalidation'
     __table_args__ = (
         Index('key_idx', 'cache_key'),
@@ -2198,7 +2198,7 @@
         return set(inv_obj.cache_key for inv_obj in cls.query().filter(cls.cache_active).all())
 
 
-class ChangesetComment(Base, BaseModel):
+class ChangesetComment(Base, BaseDbModel):
     __tablename__ = 'changeset_comments'
     __table_args__ = (
         Index('cc_revision_idx', 'revision'),
@@ -2255,7 +2255,7 @@
         return self.created_on > datetime.datetime.now() - datetime.timedelta(minutes=5)
 
 
-class ChangesetStatus(Base, BaseModel):
+class ChangesetStatus(Base, BaseDbModel):
     __tablename__ = 'changeset_statuses'
     __table_args__ = (
         Index('cs_revision_idx', 'revision'),
@@ -2311,7 +2311,7 @@
         return ChangesetStatus.get_status_lbl(self.status)
 
 
-class PullRequest(Base, BaseModel):
+class PullRequest(Base, BaseDbModel):
     __tablename__ = 'pull_requests'
     __table_args__ = (
         Index('pr_org_repo_id_idx', 'org_repo_id'),
@@ -2434,7 +2434,7 @@
         return h.url('pullrequest_show', repo_name=self.other_repo.repo_name,
                      pull_request_id=self.pull_request_id, **kwargs)
 
-class PullRequestReviewers(Base, BaseModel):
+class PullRequestReviewers(Base, BaseDbModel):
     __tablename__ = 'pull_request_reviewers'
     __table_args__ = (
         Index('pull_request_reviewers_user_id_idx', 'user_id'),
@@ -2453,7 +2453,7 @@
     pull_request = relationship('PullRequest')
 
 
-class Notification(Base, BaseModel):
+class Notification(Base, BaseDbModel):
     __tablename__ = 'notifications'
     __table_args__ = (
         Index('notification_type_idx', 'type'),
@@ -2514,7 +2514,7 @@
         return NotificationModel().make_description(self)
 
 
-class UserNotification(Base, BaseModel):
+class UserNotification(Base, BaseDbModel):
     __tablename__ = 'user_to_notification'
     __table_args__ = (
         UniqueConstraint('user_id', 'notification_id'),
@@ -2533,7 +2533,7 @@
         self.read = True
 
 
-class Gist(Base, BaseModel):
+class Gist(Base, BaseDbModel):
     __tablename__ = 'gists'
     __table_args__ = (
         Index('g_gist_access_id_idx', 'gist_access_id'),