Changeset - 50aa7cb78cfe
Parent rev.
Child rev.
[Not reviewed]
beta
0 8 0
Marcin Kuzminski - 14 years ago 2012-03-21 18:19:00
marcin@python-works.com
Mysql fixes
- force INNODB engine
- set utf8 charset
- fix convert_unicode flag in .ini files
- fix constraints and FK
8 files changed with 99 insertions and 44 deletions:
development.ini
1
1
production.ini
1
1
rhodecode/config/deployment.ini_tmpl
1
1
rhodecode/model/__init__.py
3
3
rhodecode/model/db.py
66
22
rhodecode/model/notification.py
2
2
rhodecode/tests/functional/test_changeset_comments.py
20
11
test.ini
5
3
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
@@ -210,13 +210,13 @@ logview.pylons.util = #eee
 
### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 
#########################################################
 
#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db
 
sqlalchemy.db1.url = postgresql://postgres:qwe@localhost/rhodecode
 
sqlalchemy.db1.echo = false
 
sqlalchemy.db1.pool_recycle = 3600
 
sqlalchemy.convert_unicode = true
 
sqlalchemy.db1.convert_unicode = true
 

			




	
	
	
		
 
################################

			




	
	
	
		
 
### LOGGING CONFIGURATION   ####

			




	
	
	
		
 
################################

			




	
	
	
		
 
[loggers]

			




	
	
	
		
 
keys = root, routes, rhodecode, sqlalchemy, beaker, templates, whoosh_indexer

			




        

    


    
    

    

        

                

                    production.ini
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -210,13 +210,13 @@ logview.pylons.util = #eee

			




	
	
	
		
 
### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###

			




	
	
	
		
 
#########################################################

			




	
	
	
		
 
#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db

			




	
	
	
		
 
sqlalchemy.db1.url = postgresql://postgres:qwe@localhost/rhodecode

			




	
	
	
		
 
sqlalchemy.db1.echo = false

			




	
	
	
		
 
sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.convert_unicode = true

			




	
	
	
		
 
sqlalchemy.db1.convert_unicode = true

			




	
	
	
		
 

			




	
	
	
		
 
################################

			




	
	
	
		
 
### LOGGING CONFIGURATION   ####

			




	
	
	
		
 
################################

			




	
	
	
		
 
[loggers]

			




	
	
	
		
 
keys = root, routes, rhodecode, sqlalchemy, beaker, templates, whoosh_indexer

			




        

    


    
    

    

        

                

                    rhodecode/config/deployment.ini_tmpl
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -220,13 +220,13 @@ sqlalchemy.db1.url = sqlite:///%(here)s/

			




	
	
	
		
 
# sqlalchemy.db1.url = mysql://user:pass@localhost/rhodecode

			




	
	
	
		
 

			




	
	
	
		
 
# see sqlalchemy docs for others

			




	
	
	
		
 

			




	
	
	
		
 
sqlalchemy.db1.echo = false

			




	
	
	
		
 
sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.convert_unicode = true

			




	
	
	
		
 
sqlalchemy.db1.convert_unicode = true

			




	
	
	
		
 

			




	
	
	
		
 
################################

			




	
	
	
		
 
### LOGGING CONFIGURATION   ####

			




	
	
	
		
 
################################

			




	
	
	
		
 
[loggers]

			




	
	
	
		
 
keys = root, routes, rhodecode, sqlalchemy, beaker, templates, whoosh_indexer

			




        

    


    
    

    

        

                

                    rhodecode/model/__init__.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -82,17 +82,17 @@ class BaseModel(object):

			




	
	
	
		
 
        :param instance: int or Instance

			




	
	
	
		
 
        :param callback: callback to call if all lookups failed

			




	
	
	
		
 
        """

			




	
	
	
		
 

			




	
	
	
		
 
        if isinstance(instance, cls):

			




	
	
	
		
 
            return instance

			




	
	
	
		
 
        elif isinstance(instance, int) or str(instance).isdigit():

			




	
	
	
		
 
        elif isinstance(instance, (int, long)) or str(instance).isdigit():

			




	
	
	
		
 
            return cls.get(instance)

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            if instance:

			




	
	
	
		
 
                if callback is None:

			




	
	
	
		
 
                    raise Exception(

			




	
	
	
		
 
                        'given object must be int or Instance of %s got %s, '

			




	
	
	
		
 
                        'no callback provided' % (cls, type(instance))

			




	
	
	
		
 
                        'given object must be int, long or Instance of %s '

			




	
	
	
		
 
                        'got %s, no callback provided' % (cls, type(instance))

			




	
	
	
		
 
                    )

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    return callback(instance)

			




        

    


    
    

    

        

                

                    rhodecode/model/db.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -148,13 +148,14 @@ class BaseModel(object):

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class RhodeCodeSetting(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'rhodecode_settings'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('app_settings_name'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




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

			




	
	
		
 
@@ -222,13 +223,14 @@ class RhodeCodeSetting(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class RhodeCodeUi(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'rhodecode_ui'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('ui_key'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    HOOK_UPDATE = 'changegroup.update'

			




	
	
	
		
 
    HOOK_REPO_SIZE = 'changegroup.repo_size'

			




	
	
	
		
 
    HOOK_PUSH = 'pretxnchangegroup.push_logger'

			




	
	
	
		
 
    HOOK_PULL = 'preoutgoing.pull_logger'

			




	
	
		
 
@@ -272,13 +274,14 @@ class RhodeCodeUi(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class User(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users'

			




	
	
	
		
 
    __table_args__ = (

			




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

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    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)

			




	
	
		
 
@@ -292,12 +295,13 @@ class User(Base, BaseModel):

			




	
	
	
		
 
    user_log = relationship('UserLog', cascade='all')

			




	
	
	
		
 
    user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')

			




	
	
	
		
 

			




	
	
	
		
 
    repositories = relationship('Repository')

			




	
	
	
		
 
    user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')

			




	
	
	
		
 
    repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')

			




	
	
	
		
 
    repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all')

			




	
	
	
		
 

			




	
	
	
		
 
    group_member = relationship('UsersGroupMember', cascade='all')

			




	
	
	
		
 

			




	
	
	
		
 
    notifications = relationship('UserNotification',)

			




	
	
	
		
 

			




	
	
	
		
 
    @hybrid_property

			




	
	
		
 
@@ -384,13 +388,16 @@ class User(Base, BaseModel):

			




	
	
	
		
 
            full_contact=self.full_contact

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserLog(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'user_logs'

			




	
	
	
		
 
    __table_args__ = {'extend_existing': True}

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




	
	
	
		
 
    user_log_id = Column("user_log_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)

			




	
	
	
		
 
    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True)

			




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

			




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

			




	
	
	
		
 
    action = Column("action", UnicodeText(length=1200000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
		
 
@@ -403,20 +410,24 @@ class UserLog(Base, BaseModel):

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 
    repository = relationship('Repository', cascade='')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UsersGroup(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users_groups'

			




	
	
	
		
 
    __table_args__ = {'extend_existing': True}

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




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

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan", lazy="joined")

			




	
	
	
		
 
    users_group_to_perm = relationship('UsersGroupToPerm', cascade='all')

			




	
	
	
		
 
    users_group_repo_to_perm = relationship('UsersGroupRepoToPerm', cascade='all')

			




	
	
	
		
 

			




	
	
	
		
 
    def __repr__(self):

			




	
	
	
		
 
        return '<userGroup(%s)>' % (self.users_group_name)

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def get_by_group_name(cls, group_name, cache=False,

			




	
	
		
 
@@ -441,13 +452,16 @@ class UsersGroup(Base, BaseModel):

			




	
	
	
		
 
                                    "get_users_group_%s" % users_group_id))

			




	
	
	
		
 
        return users_group.get(users_group_id)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UsersGroupMember(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users_groups_members'

			




	
	
	
		
 
    __table_args__ = {'extend_existing': True}

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    users_group_member_id = Column("users_group_member_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)

			




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

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -459,13 +473,14 @@ class UsersGroupMember(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class Repository(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'repositories'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('repo_name'),

			




	
	
	
		
 
        {'extend_existing': True},

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -708,13 +723,14 @@ class Repository(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
class RepoGroup(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'groups'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('group_name', 'group_parent_id'),

			




	
	
	
		
 
        CheckConstraint('group_id != group_parent_id'),

			




	
	
	
		
 
        {'extend_existing': True},

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




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

			




	
	
		
 
@@ -835,13 +851,16 @@ class RepoGroup(Base, BaseModel):

			




	
	
	
		
 
                       self.parent_group else [])

			




	
	
	
		
 
        return RepoGroup.url_sep().join(path_prefix + [group_name])

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class Permission(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'permissions'

			




	
	
	
		
 
    __table_args__ = {'extend_existing': True}

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




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

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    def __repr__(self):

			




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

			




	
	
		
 
@@ -872,13 +891,14 @@ class Permission(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserRepoToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'repo_to_perm'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('user_id', 'repository_id', 'permission_id'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    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)

			




	
	
	
		
 

			




	
	
		
 
@@ -900,13 +920,14 @@ class UserRepoToPerm(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'user_to_perm'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('user_id', 'permission_id'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User')

			




	
	
		
 
@@ -914,13 +935,14 @@ class UserToPerm(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UsersGroupRepoToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users_group_repo_to_perm'

			




	
	
	
		
 
    __table_args__ = (

			




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

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    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)

			




	
	
	
		
 

			




	
	
		
 
@@ -942,13 +964,14 @@ class UsersGroupRepoToPerm(Base, BaseMod

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UsersGroupToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users_group_to_perm'

			




	
	
	
		
 
    __table_args__ = (

			




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

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',  

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    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)

			




	
	
	
		
 

			




	
	
	
		
 
    users_group = relationship('UsersGroup')

			




	
	
		
 
@@ -956,13 +979,14 @@ class UsersGroupToPerm(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserRepoGroupToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'user_repo_group_to_perm'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('user_id', 'group_id', 'permission_id'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',  

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    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)

			




	
	
		
 
@@ -973,13 +997,14 @@ class UserRepoGroupToPerm(Base, BaseMode

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UsersGroupRepoGroupToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users_group_repo_group_to_perm'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('users_group_id', 'group_id'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    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)

			




	
	
	
		
 
    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)

			




	
	
		
 
@@ -988,13 +1013,17 @@ class UsersGroupRepoGroupToPerm(Base, Ba

			




	
	
	
		
 
    permission = relationship('Permission')

			




	
	
	
		
 
    group = relationship('RepoGroup')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class Statistics(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'statistics'

			




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

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
         UniqueConstraint('repository_id'), 

			




	
	
	
		
 
         {'extend_existing': True, 'mysql_engine':'InnoDB',  

			




	
	
	
		
 
          'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




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

			




	
	
	
		
 
    repository_id = Column("repository_id", Integer(), ForeignKey('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(1000000), nullable=False)#JSON data

			




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

			




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

			




	
	
		
 
@@ -1004,13 +1033,14 @@ class Statistics(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
class UserFollowing(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'user_followings'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('user_id', 'follows_repository_id'),

			




	
	
	
		
 
        UniqueConstraint('user_id', 'follows_user_id'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    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)

			




	
	
		
 
@@ -1025,13 +1055,17 @@ class UserFollowing(Base, BaseModel):

			




	
	
	
		
 
    def get_repo_followers(cls, repo_id):

			




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

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class CacheInvalidation(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'cache_invalidation'

			




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

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('cache_key'),

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




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

			




	
	
		
 
@@ -1128,13 +1162,16 @@ class CacheInvalidation(Base, BaseModel)

			




	
	
	
		
 
        Session.add(inv_obj)

			




	
	
	
		
 
        Session.commit()

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class ChangesetComment(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'changeset_comments'

			




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

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




	
	
	
		
 
    comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)

			




	
	
	
		
 
    repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)

			




	
	
	
		
 
    revision = Column('revision', String(40), nullable=False)

			




	
	
	
		
 
    line_no = Column('line_no', Unicode(10), nullable=True)

			




	
	
	
		
 
    f_path = Column('f_path', Unicode(1000), nullable=True)

			




	
	
	
		
 
    user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)

			




	
	
		
 
@@ -1157,13 +1194,16 @@ class ChangesetComment(Base, BaseModel):

			




	
	
	
		
 
                .filter(cls.revision == revision)\

			




	
	
	
		
 
                .join(ChangesetComment.author).all()

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class Notification(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'notifications'

			




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

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    TYPE_CHANGESET_COMMENT = u'cs_comment'

			




	
	
	
		
 
    TYPE_MESSAGE = u'message'

			




	
	
	
		
 
    TYPE_MENTION = u'mention'

			




	
	
	
		
 
    TYPE_REGISTRATION = u'registration'

			




	
	
	
		
 

			




	
	
		
 
@@ -1209,13 +1249,14 @@ class Notification(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class UserNotification(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'user_to_notification'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('user_id', 'notification_id'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    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)

			




	
	
	
		
 

			




	
	
		
 
@@ -1227,10 +1268,13 @@ class UserNotification(Base, BaseModel):

			




	
	
	
		
 
        self.read = True

			




	
	
	
		
 
        Session.add(self)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class DbMigrateVersion(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'db_migrate_version'

			




	
	
	
		
 
    __table_args__ = {'extend_existing': True}

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine':'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




	
	
	
		
 
    repository_id = Column('repository_id', String(250), primary_key=True)

			




	
	
	
		
 
    repository_path = Column('repository_path', Text)

			




	
	
	
		
 
    version = Column('version', Integer)

			




        

    


    
    

    

        

                

                    rhodecode/model/notification.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -45,17 +45,17 @@ class NotificationModel(BaseModel):

			




	
	
	
		
 
    def __get_user(self, user):

			




	
	
	
		
 
        return self._get_instance(User, user, callback=User.get_by_username)

			




	
	
	
		
 

			




	
	
	
		
 
    def __get_notification(self, notification):

			




	
	
	
		
 
        if isinstance(notification, Notification):

			




	
	
	
		
 
            return notification

			




	
	
	
		
 
        elif isinstance(notification, int):

			




	
	
	
		
 
        elif isinstance(notification, (int, long)):

			




	
	
	
		
 
            return Notification.get(notification)

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            if notification:

			




	
	
	
		
 
                raise Exception('notification must be int or Instance'

			




	
	
	
		
 
                raise Exception('notification must be int, long or Instance'

			




	
	
	
		
 
                                ' of Notification got %s' % type(notification))

			




	
	
	
		
 

			




	
	
	
		
 
    def create(self, created_by, subject, body, recipients=None,

			




	
	
	
		
 
               type_=Notification.TYPE_MESSAGE, with_email=True,

			




	
	
	
		
 
               email_kwargs={}):

			




	
	
	
		
 
        """

			




        

    


    
    

    

        

                

                    rhodecode/tests/functional/test_changeset_comments.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
from rhodecode.tests import *

			




	
	
	
		
 
from rhodecode.model.db import ChangesetComment, Notification, User, \

			




	
	
	
		
 
    UserNotification

			




	
	
	
		
 

			




	
	
	
		
 
class TestChangeSetCommentrController(TestController):

			




	
	
	
		
 

			




	
	
	
		
 
class TestChangeSetCommentsController(TestController):

			




	
	
	
		
 

			




	
	
	
		
 
    def setUp(self):

			




	
	
	
		
 
        for x in ChangesetComment.query().all():

			




	
	
	
		
 
            self.Session.delete(x)

			




	
	
	
		
 
        self.Session.commit()

			




	
	
	
		
 

			




	
	
		
 
@@ -39,19 +40,24 @@ class TestChangeSetCommentrController(Te

			




	
	
	
		
 
                                repo_name=HG_REPO, revision=rev))

			




	
	
	
		
 
        # test DB

			




	
	
	
		
 
        self.assertEqual(ChangesetComment.query().count(), 1)

			




	
	
	
		
 
        self.assertTrue('''<div class="comments-number">%s '''

			




	
	
	
		
 
                        '''comment(s) (0 inline)</div>''' % 1 in response.body)

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(Notification.query().count(), 1)

			




	
	
	
		
 
        self.assertEqual(ChangesetComment.query().count(), 1)

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(Notification.query().count(), 1)

			




	
	
	
		
 
        notification = Notification.query().all()[0]

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(notification.type_, Notification.TYPE_CHANGESET_COMMENT)

			




	
	
	
		
 
        self.assertTrue((u'/vcs_test_hg/changeset/27cd5cce30c96924232df'

			




	
	
	
		
 
                          'fcd24178a07ffeb5dfc#comment-1') in notification.subject)

			




	
	
	
		
 
        ID = ChangesetComment.query().first().comment_id

			




	
	
	
		
 
        self.assertEqual(notification.type_, 

			




	
	
	
		
 
                         Notification.TYPE_CHANGESET_COMMENT)

			




	
	
	
		
 
        sbj = (u'/vcs_test_hg/changeset/'

			




	
	
	
		
 
               '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % ID)

			




	
	
	
		
 
        print "%s vs %s" % (sbj, notification.subject)

			




	
	
	
		
 
        self.assertTrue(sbj in notification.subject)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_create_inline(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'

			




	
	
	
		
 
        text = u'CommentOnRevision'

			




	
	
	
		
 
        f_path = 'vcs/web/simplevcs/views/repository.py'

			




	
	
		
 
@@ -73,17 +79,22 @@ class TestChangeSetCommentrController(Te

			




	
	
	
		
 
                        ''' (%s inline)</div>''' % 1 in response.body)

			




	
	
	
		
 
        self.assertTrue('''<div class="inline-comment-placeholder-line"'''

			




	
	
	
		
 
                        ''' line="n1" target_id="vcswebsimplevcsviews'''

			




	
	
	
		
 
                        '''repositorypy">''' in response.body)

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(Notification.query().count(), 1)

			




	
	
	
		
 
        notification = Notification.query().all()[0]

			




	
	
	
		
 
        self.assertEqual(ChangesetComment.query().count(), 1)

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(notification.type_, Notification.TYPE_CHANGESET_COMMENT)

			




	
	
	
		
 
        self.assertTrue((u'/vcs_test_hg/changeset/27cd5cce30c96924232df'

			




	
	
	
		
 
                          'fcd24178a07ffeb5dfc#comment-1') in notification.subject)

			




	
	
	
		
 
        notification = Notification.query().all()[0]

			




	
	
	
		
 
        ID = ChangesetComment.query().first().comment_id

			




	
	
	
		
 
        self.assertEqual(notification.type_, 

			




	
	
	
		
 
                         Notification.TYPE_CHANGESET_COMMENT)

			




	
	
	
		
 
        sbj = (u'/vcs_test_hg/changeset/'

			




	
	
	
		
 
               '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % ID)

			




	
	
	
		
 
        print "%s vs %s" % (sbj, notification.subject)

			




	
	
	
		
 
        self.assertTrue(sbj in notification.subject)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_create_with_mention(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'

			




	
	
	
		
 
        text = u'@test_regular check CommentOnRevision'

			




	
	
		
 
@@ -100,13 +111,12 @@ class TestChangeSetCommentrController(Te

			




	
	
	
		
 
                                repo_name=HG_REPO, revision=rev))

			




	
	
	
		
 
        # test DB

			




	
	
	
		
 
        self.assertEqual(ChangesetComment.query().count(), 1)

			




	
	
	
		
 
        self.assertTrue('''<div class="comments-number">%s '''

			




	
	
	
		
 
                        '''comment(s) (0 inline)</div>''' % 1 in response.body)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(Notification.query().count(), 2)

			




	
	
	
		
 
        users = [x.user.username for x in UserNotification.query().all()]

			




	
	
	
		
 

			




	
	
	
		
 
        # test_regular get's notification by @mention

			




	
	
	
		
 
        self.assertEqual(sorted(users), [u'test_admin', u'test_regular'])

			




	
	
	
		
 

			




	
	
		
 
@@ -121,13 +131,12 @@ class TestChangeSetCommentrController(Te

			




	
	
	
		
 
                                     params=params)

			




	
	
	
		
 

			




	
	
	
		
 
        comments = ChangesetComment.query().all()

			




	
	
	
		
 
        self.assertEqual(len(comments), 1)

			




	
	
	
		
 
        comment_id = comments[0].comment_id

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        self.app.delete(url(controller='changeset',

			




	
	
	
		
 
                                    action='delete_comment',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    comment_id=comment_id))

			




	
	
	
		
 

			




	
	
	
		
 
        comments = ChangesetComment.query().all()

			




        

    


    
    

    

        

                

                    test.ini
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -203,15 +203,17 @@ logview.pylons.util = #eee

			




	
	
	
		
 

			




	
	
	
		
 
#########################################################

			




	
	
	
		
 
### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###

			




	
	
	
		
 
#########################################################

			




	
	
	
		
 
sqlalchemy.db1.url = sqlite:///%(here)s/test.db

			




	
	
	
		
 
#sqlalchemy.db1.url = postgresql://postgres:qwe@localhost/rhodecode_tests

			




	
	
	
		
 
#sqlalchemy.db1.echo = false

			




	
	
	
		
 
#sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.convert_unicode = true

			




	
	
	
		
 
#sqlalchemy.db1.url = mysql://root:qwe123qwe@localhost/rhodecode_tests

			




	
	
	
		
 

			




	
	
	
		
 
sqlalchemy.db1.echo = false

			




	
	
	
		
 
sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.db1.convert_unicode = true

			




	
	
	
		
 

			




	
	
	
		
 
################################

			




	
	
	
		
 
### LOGGING CONFIGURATION   ####

			




	
	
	
		
 
################################

			




	
	
	
		
 
[loggers]

			




	
	
	
		
 
keys = root, routes, rhodecode, sqlalchemy, beaker, templates, whoosh_indexer

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.