Changeset - a9550b59db90
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 15 years ago 2011-03-28 17:55:14
marcin@python-works.com
fixes for #143
2 files changed with 43 insertions and 46 deletions:
rhodecode/lib/dbmigrate/versions/001_initial_release.py
11
43
rhodecode/lib/dbmigrate/versions/002_version_1_1_0.py
32
3
0 comments (0 inline, 0 general)
rhodecode/lib/dbmigrate/versions/001_initial_release.py
➞
Show inline comments
 
@@ -11,45 +11,13 @@ from sqlalchemy.orm.session import Sessi
 
from rhodecode.model.meta import Base
 

			




	
	
	
		
 
from rhodecode.lib.dbmigrate.migrate import *

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 
class BaseModel(object):

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def _get_keys(cls):

			




	
	
	
		
 
        """return column names for this model """

			




	
	
	
		
 
        return class_mapper(cls).c.keys()

			




	
	
	
		
 

			




	
	
	
		
 
    def get_dict(self):

			




	
	
	
		
 
        """return dict with keys and values corresponding 

			




	
	
	
		
 
        to this model data """

			




	
	
	
		
 

			




	
	
	
		
 
        d = {}

			




	
	
	
		
 
        for k in self._get_keys():

			




	
	
	
		
 
            d[k] = getattr(self, k)

			




	
	
	
		
 
        return d

			




	
	
	
		
 

			




	
	
	
		
 
    def get_appstruct(self):

			




	
	
	
		
 
        """return list with keys and values tupples corresponding 

			




	
	
	
		
 
        to this model data """

			




	
	
	
		
 

			




	
	
	
		
 
        l = []

			




	
	
	
		
 
        for k in self._get_keys():

			




	
	
	
		
 
            l.append((k, getattr(self, k),))

			




	
	
	
		
 
        return l

			




	
	
	
		
 

			




	
	
	
		
 
    def populate_obj(self, populate_dict):

			




	
	
	
		
 
        """populate model with data from given populate_dict"""

			




	
	
	
		
 

			




	
	
	
		
 
        for k in self._get_keys():

			




	
	
	
		
 
            if k in populate_dict:

			




	
	
	
		
 
                setattr(self, k, populate_dict[k])

			




	
	
	
		
 

			




	
	
	
		
 
class RhodeCodeSettings(Base, BaseModel):

			




	
	
	
		
 
class RhodeCodeSettings(Base):

			




	
	
	
		
 
    __tablename__ = 'rhodecode_settings'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('app_settings_name'), {'useexisting':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=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




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

			




	
	
	
		
 

			




	
	
		
 
@@ -58,23 +26,23 @@ class RhodeCodeSettings(Base, BaseModel)

			




	
	
	
		
 
        self.app_settings_value = v

			




	
	
	
		
 

			




	
	
	
		
 
    def __repr__(self):

			




	
	
	
		
 
        return "<RhodeCodeSetting('%s:%s')>" % (self.app_settings_name,

			




	
	
	
		
 
                                                self.app_settings_value)

			




	
	
	
		
 

			




	
	
	
		
 
class RhodeCodeUi(Base, BaseModel):

			




	
	
	
		
 
class RhodeCodeUi(Base):

			




	
	
	
		
 
    __tablename__ = 'rhodecode_ui'

			




	
	
	
		
 
    __table_args__ = {'useexisting':True}

			




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

			




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

			




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

			




	
	
	
		
 
    ui_value = Column("ui_value", String(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, BaseModel):

			




	
	
	
		
 
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)

			




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

			




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

			




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

			




	
	
		
 
@@ -108,13 +76,13 @@ class User(Base, BaseModel):

			




	
	
	
		
 
            session.commit()

			




	
	
	
		
 
            log.debug('updated user %s lastlogin', self.username)

			




	
	
	
		
 
        except (DatabaseError,):

			




	
	
	
		
 
            session.rollback()

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserLog(Base, BaseModel):

			




	
	
	
		
 
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", String(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
		
 
@@ -122,13 +90,13 @@ class UserLog(Base, BaseModel):

			




	
	
	
		
 
    action = Column("action", String(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)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relation('User')

			




	
	
	
		
 
    repository = relation('Repository')

			




	
	
	
		
 

			




	
	
	
		
 
class Repository(Base, BaseModel):

			




	
	
	
		
 
class Repository(Base):

			




	
	
	
		
 
    __tablename__ = 'repositories'

			




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

			




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

			




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

			




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

			




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

			




	
	
		
 
@@ -145,57 +113,57 @@ class Repository(Base, BaseModel):

			




	
	
	
		
 
    repo_followers = relation('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def __repr__(self):

			




	
	
	
		
 
        return "<Repository('%s:%s')>" % (self.repo_id, self.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
class Permission(Base, BaseModel):

			




	
	
	
		
 
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", String(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    permission_longname = Column("permission_longname", String(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)

			




	
	
	
		
 

			




	
	
	
		
 
class RepoToPerm(Base, BaseModel):

			




	
	
	
		
 
class RepoToPerm(Base):

			




	
	
	
		
 
    __tablename__ = 'repo_to_perm'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('user_id', 'repository_id'), {'useexisting':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(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)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relation('User')

			




	
	
	
		
 
    permission = relation('Permission')

			




	
	
	
		
 
    repository = relation('Repository')

			




	
	
	
		
 

			




	
	
	
		
 
class UserToPerm(Base, BaseModel):

			




	
	
	
		
 
class UserToPerm(Base):

			




	
	
	
		
 
    __tablename__ = 'user_to_perm'

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('user_id', 'permission_id'), {'useexisting':True})

			




	
	
	
		
 
    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')

			




	
	
	
		
 

			




	
	
	
		
 
class Statistics(Base, BaseModel):

			




	
	
	
		
 
class Statistics(Base):

			




	
	
	
		
 
    __tablename__ = 'statistics'

			




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

			




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

			




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

			




	
	
	
		
 
    stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)

			




	
	
	
		
 
    commit_activity = Column("commit_activity", LargeBinary(), nullable=False)#JSON data

			




	
	
	
		
 
    commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data

			




	
	
	
		
 
    languages = Column("languages", LargeBinary(), nullable=False)#JSON data

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
class UserFollowing(Base, BaseModel):

			




	
	
	
		
 
class UserFollowing(Base):

			




	
	
	
		
 
    __tablename__ = 'user_followings'

			




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

			




	
	
	
		
 
                      UniqueConstraint('user_id', 'follows_user_id')

			




	
	
	
		
 
                      , {'useexisting':True})

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -206,13 +174,13 @@ class UserFollowing(Base, BaseModel):

			




	
	
	
		
 
    user = relation('User', primaryjoin='User.user_id==UserFollowing.user_id')

			




	
	
	
		
 

			




	
	
	
		
 
    follows_user = relation('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')

			




	
	
	
		
 
    follows_repository = relation('Repository')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class CacheInvalidation(Base, BaseModel):

			




	
	
	
		
 
class CacheInvalidation(Base):

			




	
	
	
		
 
    __tablename__ = 'cache_invalidation'

			




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

			




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

			




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

			




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

			




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

			




        

    


    
    

    

        

                

                    rhodecode/lib/dbmigrate/versions/002_version_1_1_0.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3,13 +3,12 @@ import datetime

			




	
	
	
		
 

			




	
	
	
		
 
from sqlalchemy import *

			




	
	
	
		
 
from sqlalchemy.exc import DatabaseError

			




	
	
	
		
 
from sqlalchemy.orm import relation, backref, class_mapper

			




	
	
	
		
 
from sqlalchemy.orm.session import Session

			




	
	
	
		
 
from rhodecode.model.meta import Base

			




	
	
	
		
 
from rhodecode.model.db import BaseModel

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib.dbmigrate.migrate import *

			




	
	
	
		
 
from rhodecode.lib.dbmigrate.migrate.changeset import *

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
		
 
@@ -67,19 +66,49 @@ def upgrade(migrate_engine):

			




	
	
	
		
 
                               unique=None, default=True)

			




	
	
	
		
 
    enable_statistics.create(tbl)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
    # Add table `user_followings`

			




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

			




	
	
	
		
 
    from rhodecode.model.db import UserFollowing

			




	
	
	
		
 
    class UserFollowing(Base, BaseModel):

			




	
	
	
		
 
        __tablename__ = 'user_followings'

			




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

			




	
	
	
		
 
                          UniqueConstraint('user_id', 'follows_user_id')

			




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

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        user = relation('User', primaryjoin='User.user_id==UserFollowing.user_id')

			




	
	
	
		
 

			




	
	
	
		
 
        follows_user = relation('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')

			




	
	
	
		
 
        follows_repository = relation('Repository')

			




	
	
	
		
 
        

			




	
	
	
		
 
    UserFollowing().__table__.create()

			




	
	
	
		
 

			




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

			




	
	
	
		
 
    # Add table `cache_invalidation`

			




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

			




	
	
	
		
 
    from rhodecode.model.db import CacheInvalidation

			




	
	
	
		
 
    class CacheInvalidation(Base, BaseModel):

			




	
	
	
		
 
        __tablename__ = 'cache_invalidation'

			




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

			




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

			




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

			




	
	
	
		
 
        cache_args = Column("cache_args", String(length=None, 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):

			




	
	
	
		
 
            return "<CacheInvalidation('%s:%s')>" % (self.cache_id, self.cache_key)

			




	
	
	
		
 
    CacheInvalidation().__table__.create()

			




	
	
	
		
 

			




	
	
	
		
 
    return

			




	
	
	
		
 

			




	
	
	
		
 
def downgrade(migrate_engine):

			




	
	
	
		
 
    meta = MetaData()

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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