Mercurial > kallithea
changeset 5633:83f7b5449860
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.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 05 Jan 2016 16:30:12 +0100 |
| parents | cc8dc30b77f3 |
| children | b9f4b444a172 |
| files | development.ini kallithea/bin/template.ini.mako kallithea/config/deployment.ini_tmpl kallithea/model/db.py kallithea/tests/test.ini |
| diffstat | 5 files changed, 25 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/development.ini Tue Jan 05 16:30:12 2016 +0100 +++ b/development.ini Tue Jan 05 16:30:12 2016 +0100 @@ -499,7 +499,6 @@ sqlalchemy.db1.echo = false sqlalchemy.db1.pool_recycle = 3600 -sqlalchemy.db1.convert_unicode = true ################################ ### LOGGING CONFIGURATION ####
--- a/kallithea/bin/template.ini.mako Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/bin/template.ini.mako Tue Jan 05 16:30:12 2016 +0100 @@ -502,7 +502,6 @@ sqlalchemy.db1.echo = false sqlalchemy.db1.pool_recycle = 3600 -sqlalchemy.db1.convert_unicode = true <%text>################################</%text> <%text>### LOGGING CONFIGURATION ####</%text>
--- a/kallithea/config/deployment.ini_tmpl Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/config/deployment.ini_tmpl Tue Jan 05 16:30:12 2016 +0100 @@ -491,7 +491,6 @@ sqlalchemy.db1.echo = false sqlalchemy.db1.pool_recycle = 3600 -sqlalchemy.db1.convert_unicode = true ################################ ### LOGGING CONFIGURATION ####
--- a/kallithea/model/db.py Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/model/db.py Tue Jan 05 16:30:12 2016 +0100 @@ -181,9 +181,9 @@ 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 @@ -343,9 +343,9 @@ 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=''): @@ -407,17 +407,17 @@ 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 @@ -703,7 +703,7 @@ 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) @@ -728,7 +728,7 @@ 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') @@ -758,7 +758,7 @@ 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') @@ -786,10 +786,10 @@ 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) @@ -924,10 +924,10 @@ 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) @@ -969,8 +969,8 @@ 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) @@ -978,9 +978,9 @@ 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) @@ -1744,7 +1744,7 @@ } 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')>" % (
--- a/kallithea/tests/test.ini Tue Jan 05 16:30:12 2016 +0100 +++ b/kallithea/tests/test.ini Tue Jan 05 16:30:12 2016 +0100 @@ -501,7 +501,6 @@ sqlalchemy.db1.echo = false sqlalchemy.db1.pool_recycle = 3600 -sqlalchemy.db1.convert_unicode = true ################################ ### LOGGING CONFIGURATION ####