Changeset - 7e4b3d3a9c5c
Parent rev.
Child rev.
[Not reviewed]
beta
0 1 0
Marcin Kuzminski - 14 years ago 2012-01-27 04:33:06
marcin@python-works.com
renamed repo groups table
- code garden
1 file changed with 54 insertions and 27 deletions:
rhodecode/model/db.py
54
27
0 comments (0 inline, 0 general)
rhodecode/model/db.py
➞
Show inline comments
 
@@ -142,22 +142,24 @@ class BaseModel(object):
 
        obj = cls.query().get(id_)
 
        Session.delete(obj)
 

			




	
	
	
		
 

			




	
	
	
		
 
class RhodeCodeSetting(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'rhodecode_settings'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('app_settings_name'), {'extend_existing': True})

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('app_settings_name'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    app_settings_name = Column("app_settings_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    _app_settings_value = Column("app_settings_value", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, k='', v=''):

			




	
	
	
		
 
        self.app_settings_name = k

			




	
	
	
		
 
        self.app_settings_value = v

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    @validates('_app_settings_value')

			




	
	
	
		
 
    def validate_settings_value(self, key, val):

			




	
	
	
		
 
        assert type(val) == unicode

			




	
	
	
		
 
        return val

			




	
	
	
		
 

			




	
	
	
		
 
    @hybrid_property

			




	
	
		
 
@@ -174,14 +176,16 @@ class RhodeCodeSetting(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
        :param val:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        self._app_settings_value = safe_unicode(val)

			




	
	
	
		
 

			




	
	
	
		
 
    def __repr__(self):

			




	
	
	
		
 
        return "<%s('%s:%s')>" % (self.__class__.__name__,

			




	
	
	
		
 
                                  self.app_settings_name, self.app_settings_value)

			




	
	
	
		
 
        return "<%s('%s:%s')>" % (

			




	
	
	
		
 
            self.__class__.__name__,

			




	
	
	
		
 
            self.app_settings_name, self.app_settings_value

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def get_by_name(cls, ldap_key):

			




	
	
	
		
 
        return cls.query()\

			




	
	
	
		
 
            .filter(cls.app_settings_name == ldap_key).scalar()

			




	
	
	
		
 

			




	
	
		
 
@@ -212,13 +216,16 @@ class RhodeCodeSetting(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
        return fd

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class RhodeCodeUi(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'rhodecode_ui'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('ui_key'), {'extend_existing': True})

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('ui_key'), 

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    HOOK_UPDATE = 'changegroup.update'

			




	
	
	
		
 
    HOOK_REPO_SIZE = 'changegroup.repo_size'

			




	
	
	
		
 
    HOOK_PUSH = 'pretxnchangegroup.push_logger'

			




	
	
	
		
 
    HOOK_PULL = 'preoutgoing.pull_logger'

			




	
	
	
		
 

			




	
	
		
 
@@ -259,13 +266,16 @@ class RhodeCodeUi(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
        Session.add(new_ui)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class User(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('username'), UniqueConstraint('email'), {'extend_existing': True})

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('username'), UniqueConstraint('email'), 

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    username = Column("username", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    password = Column("password", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    active = Column("active", Boolean(), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)

			




	
	
	
		
 
    name = Column("name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
		
 
@@ -445,13 +455,16 @@ class UsersGroupMember(Base, BaseModel):

			




	
	
	
		
 
        Session.commit()

			




	
	
	
		
 
        return ugm

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class Repository(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'repositories'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('repo_name'), {'extend_existing': True},)

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('repo_name'), 

			




	
	
	
		
 
        {'extend_existing': True},

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    repo_id = Column("repo_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    repo_name = Column("repo_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)

			




	
	
	
		
 
    clone_uri = Column("clone_uri", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=False, default=None)

			




	
	
	
		
 
    repo_type = Column("repo_type", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default='hg')

			




	
	
	
		
 
    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)

			




	
	
		
 
@@ -630,13 +643,12 @@ class Repository(Base, BaseModel):

			




	
	
	
		
 
            cmts = cmts.filter(ChangesetComment.revision.in_(revisions))

			




	
	
	
		
 
        grouped = defaultdict(list)

			




	
	
	
		
 
        for cmt in cmts.all():

			




	
	
	
		
 
            grouped[cmt.revision].append(cmt)

			




	
	
	
		
 
        return grouped

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    # SCM CACHE INSTANCE

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def invalidate(self):

			




	
	
		
 
@@ -690,15 +702,18 @@ class Repository(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
        return repo

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class RepoGroup(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'groups'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('group_name', 'group_parent_id'),

			




	
	
	
		
 
                      CheckConstraint('group_id != group_parent_id'), {'extend_existing': True},)

			




	
	
	
		
 
    __mapper_args__ = {'order_by':'group_name'}

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('group_name', 'group_parent_id'),

			




	
	
	
		
 
        CheckConstraint('group_id != group_parent_id'), 

			




	
	
	
		
 
        {'extend_existing': True},

			




	
	
	
		
 
    )

			




	
	
	
		
 
    __mapper_args__ = {'order_by': 'group_name'}

			




	
	
	
		
 

			




	
	
	
		
 
    group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    group_name = Column("group_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)

			




	
	
	
		
 
    group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    group_description = Column("group_description", String(length=10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 

			




	
	
		
 
@@ -796,13 +811,12 @@ class RepoGroup(Base, BaseModel):

			




	
	
	
		
 
                cnt += child.repositories.count()

			




	
	
	
		
 
                cnt += children_count(child)

			




	
	
	
		
 
            return cnt

			




	
	
	
		
 

			




	
	
	
		
 
        return cnt + children_count(self)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def get_new_name(self, group_name):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        returns new full group name based on parent and new name

			




	
	
	
		
 

			




	
	
	
		
 
        :param group_name:

			




	
	
	
		
 
        """

			




	
	
		
 
@@ -835,13 +849,15 @@ class Permission(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
        return q.all()

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserRepoToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'repo_to_perm'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('user_id', 'repository_id'), {'extend_existing': True})

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('user_id', 'repository_id'), {'extend_existing': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    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('users.user_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User')

			




	
	
		
 
@@ -871,13 +887,16 @@ class UserToPerm(Base, BaseModel):

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 
    permission = relationship('Permission', lazy='joined')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UsersGroupRepoToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users_group_repo_to_perm'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('repository_id', 'users_group_id', 'permission_id'), {'extend_existing': True})

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('repository_id', 'users_group_id', 'permission_id'), 

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    users_group = relationship('UsersGroup')

			




	
	
		
 
@@ -905,28 +924,34 @@ class UsersGroupToPerm(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
    users_group = relationship('UsersGroup')

			




	
	
	
		
 
    permission = relationship('Permission')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserRepoGroupToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'group_to_perm'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('group_id', 'permission_id'), {'extend_existing': True})

			




	
	
	
		
 
    __tablename__ = 'user_repo_group_to_perm'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('group_id', 'permission_id'), 

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 
    permission = relationship('Permission')

			




	
	
	
		
 
    group = relationship('RepoGroup')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UsersGroupRepoGroupToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users_group_repo_group_to_perm'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('group_id', 'permission_id'), {'extend_existing': True})

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('group_id', 'permission_id'), 

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 

			




	
	
		
 
@@ -947,28 +972,29 @@ class Statistics(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
    repository = relationship('Repository', single_parent=True)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserFollowing(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'user_followings'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('user_id', 'follows_repository_id'),

			




	
	
	
		
 
                      UniqueConstraint('user_id', 'follows_user_id')

			




	
	
	
		
 
                      , {'extend_existing': True})

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('user_id', 'follows_repository_id'),

			




	
	
	
		
 
        UniqueConstraint('user_id', 'follows_user_id'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 
    follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)

			




	
	
	
		
 

			




	
	
	
		
 
    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='Repository.repo_name')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def get_repo_followers(cls, repo_id):

			




	
	
	
		
 
        return cls.query().filter(cls.follows_repo_id == repo_id)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class CacheInvalidation(Base, BaseModel):

			




	
	
		
 
@@ -976,13 +1002,12 @@ class CacheInvalidation(Base, BaseModel)

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('cache_key'), {'extend_existing': True})

			




	
	
	
		
 
    cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    cache_key = Column("cache_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    cache_args = Column("cache_args", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, cache_key, cache_args=''):

			




	
	
	
		
 
        self.cache_key = cache_key

			




	
	
	
		
 
        self.cache_args = cache_args

			




	
	
	
		
 
        self.cache_active = False

			




	
	
	
		
 

			




	
	
	
		
 
    def __repr__(self):

			




	
	
		
 
@@ -1119,22 +1144,24 @@ class Notification(Base, BaseModel):

			




	
	
	
		
 
        from rhodecode.model.notification import NotificationModel

			




	
	
	
		
 
        return NotificationModel().make_description(self)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserNotification(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'user_to_notification'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('user_id', 'notification_id'),

			




	
	
	
		
 
                      {'extend_existing': True})

			




	
	
	
		
 
    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), primary_key=True)

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('user_id', 'notification_id'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)

			




	
	
	
		
 
    notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)

			




	
	
	
		
 
    read = Column('read', Boolean, default=False)

			




	
	
	
		
 
    sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User', lazy="joined")

			




	
	
	
		
 
    notification = relationship('Notification', lazy="joined",

			




	
	
	
		
 
                            order_by=lambda:Notification.created_on.desc(),)

			




	
	
	
		
 
                                rder_by=lambda: Notification.created_on.desc(),)

			




	
	
	
		
 

			




	
	
	
		
 
    def mark_as_read(self):

			




	
	
	
		
 
        self.read = True

			




	
	
	
		
 
        Session.add(self)

			




	
	
	
		
 

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-19746
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support