Changeset - 83f7b5449860
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Mads Kiilerich - 10 years ago 2016-01-05 16:30:12
madski@unity3d.com
db: stop messing with convert_unicode in .ini and db scheme

convert_unicode=False is the default for String fields ... except when the .ini file contains sets it to True.

String fields are however no longer used for unicode and we can drop convert_unicode everywhere.

See
http://docs.sqlalchemy.org/en/latest/core/type_basics.html#sqlalchemy.types.String.params.convert_unicode
for the advice of never setting convert_unicode.
5 files changed with 25 insertions and 29 deletions:
development.ini
1
kallithea/bin/template.ini.mako
1
kallithea/config/deployment.ini_tmpl
1
kallithea/model/db.py
25
25
kallithea/tests/test.ini
1
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
@@ -496,13 +496,12 @@ sqlalchemy.db1.url = sqlite:///%(here)s/
 
#sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea?charset=utf8
 

			




	
	
	
		
 
# see sqlalchemy docs for others

			




	
	
	
		
 

			




	
	
	
		
 
sqlalchemy.db1.echo = false

			




	
	
	
		
 
sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.db1.convert_unicode = true

			




	
	
	
		
 

			




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

			




	
	
	
		
 
### LOGGING CONFIGURATION   ####

			




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

			




	
	
	
		
 

			




	
	
	
		
 
[loggers]

			




        

    


    
    

    

        

                

                    kallithea/bin/template.ini.mako
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -499,13 +499,12 @@ sqlalchemy.db1.url = mysql://user:pass@l

			




	
	
	
		
 

			




	
	
	
		
 
%endif

			




	
	
	
		
 
# see sqlalchemy docs for others

			




	
	
	
		
 

			




	
	
	
		
 
sqlalchemy.db1.echo = false

			




	
	
	
		
 
sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.db1.convert_unicode = true

			




	
	
	
		
 

			




	
	
	
		
 
<%text>################################</%text>

			




	
	
	
		
 
<%text>### LOGGING CONFIGURATION   ####</%text>

			




	
	
	
		
 
<%text>################################</%text>

			




	
	
	
		
 

			




	
	
	
		
 
[loggers]

			




        

    


    
    

    

        

                

                    kallithea/config/deployment.ini_tmpl
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
#sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea?charset=utf8

			




	
	
	
		
 

			




	
	
	
		
 
# see sqlalchemy docs for others

			




	
	
	
		
 

			




	
	
	
		
 
sqlalchemy.db1.echo = false

			




	
	
	
		
 
sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.db1.convert_unicode = true

			




	
	
	
		
 

			




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

			




	
	
	
		
 
### LOGGING CONFIGURATION   ####

			




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

			




	
	
	
		
 

			




	
	
	
		
 
[loggers]

			




        

    


    
    

    

        

                

                    kallithea/model/db.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -178,15 +178,15 @@ class Setting(Base, BaseModel):

			




	
	
	
		
 
        'bool': str2bool,

			




	
	
	
		
 
        '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_name = Column(String(255), 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)

			




	
	
	
		
 
    _app_settings_type = Column("app_settings_type", String(255), 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

			




	
	
	
		
 

			




	
	
		
 
@@ -340,15 +340,15 @@ class Ui(Base, BaseModel):

			




	
	
	
		
 
    HOOK_PUSH = 'changegroup.push_logger'

			




	
	
	
		
 
    HOOK_PRE_PUSH = 'prechangegroup.pre_push'

			




	
	
	
		
 
    HOOK_PULL = 'outgoing.pull_logger'

			




	
	
	
		
 
    HOOK_PRE_PULL = 'preoutgoing.pre_pull'

			




	
	
	
		
 

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    ui_section = Column(String(255), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    ui_key = Column(String(255), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    ui_value = Column(String(255), nullable=True, unique=None, default=None)

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    # def __init__(self, section='', key='', value=''):

			




	
	
	
		
 
    #     self.ui_section = section

			




	
	
	
		
 
    #     self.ui_key = key

			




	
	
	
		
 
    #     self.ui_value = value

			




	
	
		
 
@@ -404,23 +404,23 @@ class User(Base, BaseModel):

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    DEFAULT_USER = 'default'

			




	
	
	
		
 
    DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'

			




	
	
	
		
 

			




	
	
	
		
 
    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)

			




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

			




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

			




	
	
	
		
 
    _email = Column("email", String(255), 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)

			




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

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    _user_data = Column("user_data", LargeBinary(), nullable=True)  # JSON data

			




	
	
	
		
 

			




	
	
	
		
 
    user_log = relationship('UserLog')

			




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

			




	
	
		
 
@@ -700,13 +700,13 @@ class UserApiKeys(Base, BaseModel):

			




	
	
	
		
 
        _table_args_default_dict,

			




	
	
	
		
 
    )

			




	
	
	
		
 
    __mapper_args__ = {}

			




	
	
	
		
 

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    description = Column(UnicodeText(1024))

			




	
	
	
		
 
    expires = Column(Float(53), nullable=False)

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 

			




	
	
		
 
@@ -725,13 +725,13 @@ class UserEmailMap(Base, BaseModel):

			




	
	
	
		
 
        _table_args_default_dict,

			




	
	
	
		
 
    )

			




	
	
	
		
 
    __mapper_args__ = {}

			




	
	
	
		
 

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 

			




	
	
	
		
 
    @validates('_email')

			




	
	
	
		
 
    def validate_email(self, key, email):

			




	
	
	
		
 
        # check if this email is not main one

			




	
	
	
		
 
        main_email = Session().query(User).filter(User.email == email).scalar()

			




	
	
		
 
@@ -755,13 +755,13 @@ class UserIpMap(Base, BaseModel):

			




	
	
	
		
 
        _table_args_default_dict,

			




	
	
	
		
 
    )

			




	
	
	
		
 
    __mapper_args__ = {}

			




	
	
	
		
 

			




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

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def _get_ip_range(cls, ip_addr):

			




	
	
	
		
 
        from kallithea.lib import ipaddr

			




	
	
		
 
@@ -783,16 +783,16 @@ class UserLog(Base, BaseModel):

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        _table_args_default_dict,

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    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)

			




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

			




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

			




	
	
	
		
 
    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)

			




	
	
	
		
 
    user_ip = Column(String(255), 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,

			




	
	
		
 
@@ -921,16 +921,16 @@ class RepositoryField(Base, BaseModel):

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    PREFIX = 'ex_'  # prefix used in form to not conflict with already existing fields

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
    field_key = Column(String(250, convert_unicode=False))

			




	
	
	
		
 
    field_label = Column(String(1024, convert_unicode=False), nullable=False)

			




	
	
	
		
 
    field_value = Column(String(10000, convert_unicode=False), nullable=False)

			




	
	
	
		
 
    field_desc = Column(String(1024, convert_unicode=False), nullable=False)

			




	
	
	
		
 
    field_key = Column(String(250))

			




	
	
	
		
 
    field_label = Column(String(1024), nullable=False)

			




	
	
	
		
 
    field_value = Column(String(10000), nullable=False)

			




	
	
	
		
 
    field_desc = Column(String(1024), nullable=False)

			




	
	
	
		
 
    field_type = Column(String(255), nullable=False, unique=None)

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    repository = relationship('Repository')

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
		
 
@@ -966,24 +966,24 @@ class Repository(Base, BaseModel):

			




	
	
	
		
 
    STATE_ERROR = 'repo_state_error'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
    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)

			




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

			




	
	
	
		
 
    repo_type = Column(String(255), 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(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)

			




	
	
	
		
 
    _landing_revision = Column("landing_revision", String(255), 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)

			




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

			




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

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User')

			




	
	
		
 
@@ -1741,13 +1741,13 @@ class Permission(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
        'hg.create.none': 0,

			




	
	
	
		
 
        'hg.create.repository': 1

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
    permission_name = Column(String(255), nullable=True, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    def __unicode__(self):

			




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

			




	
	
	
		
 
            self.__class__.__name__, self.permission_id, self.permission_name

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/tests/test.ini
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
#sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea?charset=utf8

			




	
	
	
		
 

			




	
	
	
		
 
# see sqlalchemy docs for others

			




	
	
	
		
 

			




	
	
	
		
 
sqlalchemy.db1.echo = false

			




	
	
	
		
 
sqlalchemy.db1.pool_recycle = 3600

			




	
	
	
		
 
sqlalchemy.db1.convert_unicode = true

			




	
	
	
		
 

			




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

			




	
	
	
		
 
### LOGGING CONFIGURATION   ####

			




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

			




	
	
	
		
 

			




	
	
	
		
 
[loggers]

			




        

    



    


    



    



      

      





    
    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.