kallithea Changeset - 5b72a0dd966d

Changeset - 5b72a0dd966d

Parent rev.

Child rev.

[Not reviewed]

kallithea-2.2.5-rebrand

0 17 0

Bradley M. Kuhn - 11 years ago 2014-07-03 01:08:37
bkuhn@sfconservancy.org

db: introduce DB_PREFIX ... and let it be empty by default

17 files changed with 49 insertions and 50 deletions:

kallithea/__init__.py

kallithea/lib/dbmigrate/schema/db_1_2_0.py

kallithea/lib/dbmigrate/schema/db_1_3_0.py

kallithea/lib/dbmigrate/schema/db_1_4_0.py

kallithea/lib/dbmigrate/schema/db_1_5_0.py

kallithea/lib/dbmigrate/schema/db_1_5_2.py

kallithea/lib/dbmigrate/schema/db_1_6_0.py

kallithea/lib/dbmigrate/schema/db_1_7_0.py

kallithea/lib/dbmigrate/schema/db_1_8_0.py

kallithea/lib/dbmigrate/schema/db_2_0_0.py

kallithea/lib/dbmigrate/schema/db_2_0_1.py

kallithea/lib/dbmigrate/schema/db_2_0_2.py

kallithea/lib/dbmigrate/schema/db_2_1_0.py

kallithea/lib/dbmigrate/schema/db_2_2_0.py

kallithea/lib/dbmigrate/schema/db_2_2_3.py

kallithea/lib/dbmigrate/versions/001_initial_release.py

kallithea/model/db.py

0 comments (0 inline, 0 general)

kallithea/__init__.py

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ BRAND = "kallithea" @@
 try:
     from kallithea.brand import BRAND
 except ImportError:
     pass
 # Prefix for the ui and settings table names
-SETTINGS_PREFIX = BRAND + "_"
+DB_PREFIX = (BRAND + "_") if BRAND != "kallithea" else ""
 try:
     from kallithea.lib import get_current_revision
     _rev = get_current_revision(quiet=True)
     if _rev and len(VERSION) > 3:
         VERSION += ('%s' % _rev[0],)

kallithea/lib/dbmigrate/schema/db_1_2_0.py

➞

Show inline comments

@@ @@ -46,13 +46,13 @@ from kallithea.lib.utils2 import str2boo @@
 from kallithea.lib.exceptions import UserGroupsAssignedException
 from kallithea.lib.compat import json
 from kallithea.model.meta import Base, Session
 from kallithea.lib.caching_query import FromCache
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
@@ @@ -140,13 +140,13 @@ class BaseModel(object): @@
         obj = cls.query().get(id_)
         Session.delete(obj)
         Session.commit()
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (UniqueConstraint('app_settings_name'), {'extend_existing':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=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=''):
@@ @@ -211,13 +211,13 @@ class Setting(Base, BaseModel): @@
             fd.update({row.app_settings_name:row.app_settings_value})
         return fd
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (UniqueConstraint('ui_key'), {'extend_existing':True})
     HOOK_UPDATE = 'changegroup.update'
     HOOK_REPO_SIZE = 'changegroup.repo_size'
     HOOK_PUSH = 'pretxnchangegroup.push_logger'
     HOOK_PULL = 'preoutgoing.pull_logger'

kallithea/lib/dbmigrate/schema/db_1_3_0.py

➞

Show inline comments

@@ @@ -48,13 +48,13 @@ from kallithea.lib.utils2 import str2boo @@
 from kallithea.lib.compat import json
 from kallithea.lib.caching_query import FromCache
 from kallithea.model.meta import Base, Session
 import hashlib
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
@@ @@ -155,13 +155,13 @@ class BaseModel(object): @@
         if hasattr(self, '__unicode__'):
             # python repr needs to return str
             return safe_str(self.__unicode__())
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'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)
@@ @@ -230,13 +230,13 @@ class Setting(Base, BaseModel): @@
             fd.update({row.app_settings_name:row.app_settings_value})
         return fd
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine':'InnoDB',
          'mysql_charset': 'utf8'}
+    )

kallithea/lib/dbmigrate/schema/db_1_4_0.py

➞

Show inline comments

@@ @@ -52,13 +52,13 @@ from kallithea.lib.utils2 import str2boo @@
     safe_unicode, remove_suffix
 from kallithea.lib.compat import json
 from kallithea.lib.caching_query import FromCache
 from kallithea.model.meta import Base, Session
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 URL_SEP = '/'
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
@@ @@ -147,13 +147,13 @@ class BaseModel(object): @@
             # python repr needs to return str
             return safe_str(self.__unicode__())
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'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)
@@ @@ -229,13 +229,13 @@ class Setting(Base, BaseModel): @@
             fd.update({row.app_settings_name: row.app_settings_value})
         return fd
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
+    )

kallithea/lib/dbmigrate/schema/db_1_5_0.py

➞

Show inline comments

@@ @@ -51,13 +51,13 @@ from kallithea.lib.utils2 import str2boo @@
     safe_unicode, remove_suffix, remove_prefix
 from kallithea.lib.compat import json
 from kallithea.lib.caching_query import FromCache
 from kallithea.model.meta import Base, Session
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 URL_SEP = '/'
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
@@ @@ -146,13 +146,13 @@ class BaseModel(object): @@
             # python repr needs to return str
             return safe_str(self.__unicode__())
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'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)
@@ @@ -245,13 +245,13 @@ class Setting(Base, BaseModel): @@
             fd.update({key: row.app_settings_value})
         return fd
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
+    )

kallithea/lib/dbmigrate/schema/db_1_5_2.py

➞

Show inline comments

@@ @@ -55,13 +55,13 @@ from kallithea.lib.caching_query import @@
 from kallithea.model.meta import Base, Session
 URL_SEP = '/'
 log = logging.getLogger(__name__)
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
@@ @@ -147,13 +147,13 @@ class BaseModel(object): @@
             # python repr needs to return str
             return safe_str(self.__unicode__())
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'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)
@@ @@ -246,13 +246,13 @@ class Setting(Base, BaseModel): @@
             fd.update({key: row.app_settings_value})
         return fd
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
+    )

kallithea/lib/dbmigrate/schema/db_1_6_0.py

➞

Show inline comments

@@ @@ -55,13 +55,13 @@ from kallithea.lib.caching_query import @@
 from kallithea.model.meta import Base, Session
 URL_SEP = '/'
 log = logging.getLogger(__name__)
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
@@ @@ -147,13 +147,13 @@ class BaseModel(object): @@
             # python repr needs to return str
             return safe_str(self.__unicode__())
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'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)
@@ @@ -246,13 +246,13 @@ class Setting(Base, BaseModel): @@
             fd.update({key: row.app_settings_value})
         return fd
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
+    )

kallithea/lib/dbmigrate/schema/db_1_7_0.py

➞

Show inline comments

@@ @@ -55,13 +55,13 @@ from kallithea.lib.caching_query import @@
 from kallithea.model.meta import Base, Session
 URL_SEP = '/'
 log = logging.getLogger(__name__)
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
@@ @@ -152,13 +152,13 @@ class BaseModel(object): @@
             # python repr needs to return str
             return safe_str(self.__unicode__())
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'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)
@@ @@ -251,13 +251,13 @@ class Setting(Base, BaseModel): @@
             fd.update({key: row.app_settings_value})
         return fd
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
+    )

kallithea/lib/dbmigrate/schema/db_1_8_0.py

➞

Show inline comments

@@ @@ -55,13 +55,13 @@ from kallithea.lib.caching_query import @@
 from kallithea.model.meta import Base, Session
 URL_SEP = '/'
 log = logging.getLogger(__name__)
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
@@ @@ -152,13 +152,13 @@ class BaseModel(object): @@
             # python repr needs to return str
             return safe_str(self.__unicode__())
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX +  'settings'
+    __tablename__ = DB_PREFIX +  'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
     app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ @@ -269,13 +269,13 @@ class Setting(Base, BaseModel): @@
             'kallithea_version': kallithea.__version__
+        }
         return info
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )

kallithea/lib/dbmigrate/schema/db_2_0_0.py

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ from kallithea.lib.caching_query import @@
 from kallithea.model.meta import Base, Session
 URL_SEP = '/'
 log = logging.getLogger(__name__)
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
@@ @@ -160,13 +160,13 @@ class Setting(Base, BaseModel): @@
         'str': safe_str,
         'int': safe_int,
         'unicode': safe_unicode,
         'bool': str2bool,
         'list': functools.partial(aslist, sep=',')
+    }
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
     app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ @@ -316,13 +316,13 @@ class Setting(Base, BaseModel): @@
             'git_path': kallithea.CONFIG.get('git_path')
+        }
         return info
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )

kallithea/lib/dbmigrate/schema/db_2_0_1.py

➞

Show inline comments

@@ @@ -53,13 +53,13 @@ from kallithea.lib.utils2 import str2boo @@
     safe_unicode, remove_prefix, time_to_datetime, aslist, Optional, safe_int
 from kallithea.lib.compat import json
 from kallithea.lib.caching_query import FromCache
 from kallithea.model.meta import Base, Session
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 URL_SEP = '/'
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
@@ @@ -163,13 +163,13 @@ class Setting(Base, BaseModel): @@
         'str': safe_str,
         'int': safe_int,
         'unicode': safe_unicode,
         'bool': str2bool,
         'list': functools.partial(aslist, sep=',')
+    }
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
     app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ @@ -319,13 +319,13 @@ class Setting(Base, BaseModel): @@
             'git_path': kallithea.CONFIG.get('git_path')
+        }
         return info
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )

kallithea/lib/dbmigrate/schema/db_2_0_2.py

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ from kallithea.lib.caching_query import @@
 from kallithea.model.meta import Base, Session
 URL_SEP = '/'
 log = logging.getLogger(__name__)
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
@@ @@ -163,13 +163,13 @@ class Setting(Base, BaseModel): @@
         'str': safe_str,
         'int': safe_int,
         'unicode': safe_unicode,
         'bool': str2bool,
         'list': functools.partial(aslist, sep=',')
+    }
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
     app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ @@ -319,13 +319,13 @@ class Setting(Base, BaseModel): @@
             'git_path': kallithea.CONFIG.get('git_path')
+        }
         return info
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )

kallithea/lib/dbmigrate/schema/db_2_1_0.py

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ from kallithea.lib.caching_query import @@
 from kallithea.model.meta import Base, Session
 URL_SEP = '/'
 log = logging.getLogger(__name__)
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
@@ @@ -156,13 +156,13 @@ class BaseModel(object): @@
             except UnicodeDecodeError:
                 pass
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
@@ @@ -322,13 +322,13 @@ class Setting(Base, BaseModel): @@
             'git_path': kallithea.CONFIG.get('git_path')
+        }
         return info
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )

kallithea/lib/dbmigrate/schema/db_2_2_0.py

➞

Show inline comments

@@ @@ -57,13 +57,13 @@ from kallithea.lib.caching_query import @@
 from kallithea.model.meta import Base, Session
 URL_SEP = '/'
 log = logging.getLogger(__name__)
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
@@ @@ -157,13 +157,13 @@ class BaseModel(object): @@
             except UnicodeDecodeError:
                 pass
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
@@ @@ -323,13 +323,13 @@ class Setting(Base, BaseModel): @@
             'git_path': kallithea.CONFIG.get('git_path')
+        }
         return info
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )

kallithea/lib/dbmigrate/schema/db_2_2_3.py

➞

Show inline comments

@@ @@ -57,13 +57,13 @@ from kallithea.lib.caching_query import @@
 from kallithea.model.meta import Base, Session
 URL_SEP = '/'
 log = logging.getLogger(__name__)
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
@@ @@ -157,13 +157,13 @@ class BaseModel(object): @@
             except UnicodeDecodeError:
                 pass
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
@@ @@ -323,13 +323,13 @@ class Setting(Base, BaseModel): @@
             'git_path': kallithea.CONFIG.get('git_path')
+        }
         return info
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )

kallithea/lib/dbmigrate/versions/001_initial_release.py

➞

Show inline comments

@@ @@ -9,18 +9,18 @@ from sqlalchemy.exc import DatabaseError @@
 from sqlalchemy.orm import relation, backref, class_mapper
 from sqlalchemy.orm.session import Session
 from kallithea.model.meta import Base
 from kallithea.lib.dbmigrate.migrate import *
-from kallithea import SETTINGS_PREFIX
+from kallithea import DB_PREFIX
 log = logging.getLogger(__name__)
 class Setting(Base):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + '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)
     def __init__(self, k, v):
@@ @@ -29,13 +29,13 @@ class Setting(Base): @@
     def __repr__(self):
         return "<Setting('%s:%s')>" % (self.app_settings_name,
                                                 self.app_settings_value)
 class Ui(Base):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + '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)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -40,12 +40,13 @@ from sqlalchemy.orm import relationship, @@
 from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea import DB_PREFIX
 from kallithea.lib.vcs import get_backend
 from kallithea.lib.vcs.utils.helpers import get_scm
 from kallithea.lib.vcs.exceptions import VCSError
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.lib.vcs.backends.base import EmptyChangeset
@@ @@ -54,14 +55,12 @@ from kallithea.lib.utils2 import str2boo @@
     get_clone_url
 from kallithea.lib.compat import json
 from kallithea.lib.caching_query import FromCache
 from kallithea.model.meta import Base, Session
 from kallithea import SETTINGS_PREFIX
 URL_SEP = '/'
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
@@ @@ -157,13 +156,13 @@ class BaseModel(object): @@
             except UnicodeDecodeError:
                 pass
         return '<DB:%s>' % (self.__class__.__name__)
 class Setting(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'settings'
+    __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
@@ @@ -324,13 +323,13 @@ class Setting(Base, BaseModel): @@
             'git_path': kallithea.CONFIG.get('git_path')
+        }
         return info
 class Ui(Base, BaseModel):
-    __tablename__ = SETTINGS_PREFIX + 'ui'
+    __tablename__ = DB_PREFIX + 'ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )

0 comments (0 inline, 0 general)