diff options
Diffstat (limited to 'rhodecode/model/db.py')
-rw-r--r-- | rhodecode/model/db.py | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py index 3b675cb1..086c472e 100644 --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -22,9 +22,9 @@ class RhodeCodeUi(Base): ui_key = Column("ui_key", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) ui_value = Column("ui_value", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) ui_active = Column("ui_active", BOOLEAN(), nullable=True, unique=None, default=True) - - -class User(Base): + + +class User(Base): __tablename__ = 'users' __table_args__ = (UniqueConstraint('username'), UniqueConstraint('email'), {'useexisting':True}) user_id = Column("user_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) @@ -36,21 +36,21 @@ class User(Base): lastname = Column("lastname", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) email = Column("email", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) last_login = Column("last_login", DATETIME(timezone=False), nullable=True, unique=None, default=None) - + user_log = relation('UserLog') user_perms = relation('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id") - + @LazyProperty def full_contact(self): return '%s %s <%s>' % (self.name, self.lastname, self.email) - + def __repr__(self): return "<User('id:%s:%s')>" % (self.user_id, self.username) - + def update_lastlogin(self): """Update user lastlogin""" import datetime - + try: session = Session.object_session(self) self.last_login = datetime.datetime.now() @@ -58,24 +58,24 @@ class User(Base): session.commit() log.debug('updated user %s lastlogin', self.username) except Exception: - session.rollback() - - -class UserLog(Base): + session.rollback() + + +class UserLog(Base): __tablename__ = 'user_logs' __table_args__ = {'useexisting':True} user_log_id = Column("user_log_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None) repository_id = Column("repository_id", INTEGER(length=None, convert_unicode=False, assert_unicode=None), ForeignKey(u'repositories.repo_id'), nullable=False, unique=None, default=None) repository_name = Column("repository_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) - user_ip = Column("user_ip", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + user_ip = Column("user_ip", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) action = Column("action", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) action_date = Column("action_date", DATETIME(timezone=False), nullable=True, unique=None, default=None) revision = Column('revision', TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) - + user = relation('User') repository = relation('Repository') - + class Repository(Base): __tablename__ = 'repositories' __table_args__ = (UniqueConstraint('repo_name'), {'useexisting':True},) @@ -85,21 +85,23 @@ class Repository(Base): private = Column("private", BOOLEAN(), nullable=True, unique=None, default=None) description = Column("description", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) fork_id = Column("fork_id", INTEGER(), ForeignKey(u'repositories.repo_id'), nullable=True, unique=False, default=None) - + user = relation('User') fork = relation('Repository', remote_side=repo_id) repo_to_perm = relation('RepoToPerm', cascade='all') - + stats = relation('Statistics', cascade='all') + + def __repr__(self): return "<Repository('id:%s:%s')>" % (self.repo_id, self.repo_name) - + class Permission(Base): __tablename__ = 'permissions' __table_args__ = {'useexisting':True} permission_id = Column("permission_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) permission_name = Column("permission_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) permission_longname = Column("permission_longname", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) - + def __repr__(self): return "<Permission('%s:%s')>" % (self.permission_id, self.permission_name) @@ -109,8 +111,8 @@ class RepoToPerm(Base): repo_to_perm_id = Column("repo_to_perm_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None) permission_id = Column("permission_id", INTEGER(), ForeignKey(u'permissions.permission_id'), nullable=False, unique=None, default=None) - repository_id = Column("repository_id", INTEGER(), ForeignKey(u'repositories.repo_id'), nullable=False, unique=None, default=None) - + repository_id = Column("repository_id", INTEGER(), ForeignKey(u'repositories.repo_id'), nullable=False, unique=None, default=None) + user = relation('User') permission = relation('Permission') repository = relation('Repository') @@ -121,7 +123,7 @@ class UserToPerm(Base): user_to_perm_id = Column("user_to_perm_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None) permission_id = Column("permission_id", INTEGER(), ForeignKey(u'permissions.permission_id'), nullable=False, unique=None, default=None) - + user = relation('User') permission = relation('Permission') @@ -134,6 +136,6 @@ class Statistics(Base): commit_activity = Column("commit_activity", BLOB(), nullable=False)#JSON data commit_activity_combined = Column("commit_activity_combined", BLOB(), nullable=False)#JSON data languages = Column("languages", BLOB(), nullable=False)#JSON data - - repository = relation('Repository') + + repository = relation('Repository', single_parent=True) |