Changeset - cc8dc30b77f3
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Mads Kiilerich - 10 years ago 2016-01-05 16:30:12
madski@unity3d.com
db: change unicode fields to have Unicode type instead of String

Drop convert_unicode for Unicode fields where it doesn't apply; these fields
always use unicode in the database and returns unicode.

See
http://docs.sqlalchemy.org/en/latest/core/type_basics.html#sqlalchemy.types.String.params.convert_unicode
for the advice of using Unicode for unicode fields.
1 file changed with 13 insertions and 13 deletions:
kallithea/model/db.py
13
13
0 comments (0 inline, 0 general)
kallithea/model/db.py
➞
Show inline comments
 
@@ -179,13 +179,13 @@ class Setting(Base, BaseModel):
 
        'list': functools.partial(aslist, sep=',')
 
    }
 
    DEFAULT_UPDATE_URL = ''
 

			




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

			




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

			




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

			




	
	
	
		
 
    _app_settings_value = Column("app_settings_value", Unicode(4096), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    _app_settings_type = Column("app_settings_type", String(255, convert_unicode=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, key='', val='', type='unicode'):

			




	
	
	
		
 
        self.app_settings_name = key

			




	
	
	
		
 
        self.app_settings_value = val

			




	
	
	
		
 
        self.app_settings_type = type

			




	
	
		
 
@@ -408,14 +408,14 @@ class User(Base, BaseModel):

			




	
	
	
		
 

			




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

			




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

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    lastname = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    name = Column("firstname", Unicode(255), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    lastname = Column(Unicode(255), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    _email = Column("email", String(255, convert_unicode=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    last_login = Column(DateTime(timezone=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    extern_type = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    extern_name = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    api_key = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None)

			




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

			




	
	
		
 
@@ -785,15 +785,15 @@ class UserLog(Base, BaseModel):

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    user_log_id = Column(Integer(), nullable=False, unique=True, primary_key=True)

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    repository_name = Column(Unicode(255), nullable=True, unique=None, default=None)

			




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

			




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

			




	
	
	
		
 
    action = Column(UnicodeText(1200000), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    action_date = Column(DateTime(timezone=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    def __unicode__(self):

			




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

			




	
	
	
		
 
                                      self.repository_name,

			




	
	
	
		
 
                                      self.action)

			




	
	
		
 
@@ -810,14 +810,14 @@ class UserGroup(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users_groups'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        _table_args_default_dict,

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
    user_group_description = Column(String(10000, convert_unicode=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    users_group_name = Column(Unicode(255), nullable=False, unique=True, default=None)

			




	
	
	
		
 
    user_group_description = Column(Unicode(10000), nullable=True, unique=None, default=None)

			




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

			




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

			




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

			




	
	
	
		
 
    created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 
    _group_data = Column("group_data", LargeBinary(), nullable=True)  # JSON data

			




	
	
	
		
 

			




	
	
		
 
@@ -963,22 +963,22 @@ class Repository(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
    STATE_CREATED = 'repo_state_created'

			




	
	
	
		
 
    STATE_PENDING = 'repo_state_pending'

			




	
	
	
		
 
    STATE_ERROR = 'repo_state_error'

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
    repo_name = Column(Unicode(255), nullable=False, unique=True, default=None)

			




	
	
	
		
 
    repo_state = Column(String(255), nullable=True)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
    repo_type = Column(String(255, convert_unicode=False), nullable=False, unique=False, default=None)

			




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

			




	
	
	
		
 
    private = Column(Boolean(), nullable=True, unique=None, default=None)

			




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

			




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

			




	
	
	
		
 
    description = Column(String(10000, convert_unicode=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    description = Column(Unicode(10000), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    created_on = Column(DateTime(timezone=False), nullable=False, unique=None, default=datetime.datetime.now)

			




	
	
	
		
 
    updated_on = Column(DateTime(timezone=False), nullable=False, unique=None, default=datetime.datetime.now)

			




	
	
	
		
 
    _landing_revision = Column("landing_revision", String(255, convert_unicode=False), nullable=False, unique=False, default=None)

			




	
	
	
		
 
    enable_locking = Column(Boolean(), nullable=False, unique=None, default=False)

			




	
	
	
		
 
    _locked = Column("locked", String(255, convert_unicode=False), nullable=True, unique=False, default=None)

			




	
	
	
		
 
    _changeset_cache = Column("changeset_cache", LargeBinary(), nullable=True) #JSON data

			




	
	
		
 
@@ -1480,15 +1480,15 @@ class RepoGroup(Base, BaseModel):

			




	
	
	
		
 
    )

			




	
	
	
		
 
    __mapper_args__ = {'order_by': 'group_name'}

			




	
	
	
		
 

			




	
	
	
		
 
    SEP = ' &raquo; '

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
    group_name = Column(Unicode(255), nullable=False, unique=True, default=None)

			




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

			




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

			




	
	
	
		
 
    group_description = Column(Unicode(10000), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    enable_locking = Column(Boolean(), nullable=False, unique=None, default=False)

			




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

			




	
	
	
		
 
    created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 

			




	
	
	
		
 
    repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')

			




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

			




	
	
		
 
@@ -2033,15 +2033,15 @@ class CacheInvalidation(Base, BaseModel)

			




	
	
	
		
 
        _table_args_default_dict,

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    # cache_id, not used

			




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

			




	
	
	
		
 
    # cache_key as created by _get_cache_key

			




	
	
	
		
 
    cache_key = Column(String(255, convert_unicode=False))

			




	
	
	
		
 
    cache_key = Column(Unicode(255))

			




	
	
	
		
 
    # cache_args is a repo_name

			




	
	
	
		
 
    cache_args = Column(String(255, convert_unicode=False))

			




	
	
	
		
 
    cache_args = Column(Unicode(255))

			




	
	
	
		
 
    # instance sets cache_active True when it is caching, other instances set

			




	
	
	
		
 
    # cache_active to False to indicate that this cache is invalid

			




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

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        self.cache_key = cache_key

			




        

    



    


    



    



      

      





    
    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.