Mercurial > kallithea
changeset 4221:5b72a0dd966d kallithea-2.2.5-rebrand
db: introduce DB_PREFIX ... and let it be empty by default
author | Bradley M. Kuhn <bkuhn@sfconservancy.org> |
---|---|
date | Wed, 02 Jul 2014 19:08:37 -0400 |
parents | 56dadd0e5cf7 |
children | f5c9018a5cf0 |
files | 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 |
diffstat | 17 files changed, 49 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/__init__.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/__init__.py Wed Jul 02 19:08:37 2014 -0400 @@ -59,7 +59,7 @@ 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
--- a/kallithea/lib/dbmigrate/schema/db_1_2_0.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_2_0.py Wed Jul 02 19:08:37 2014 -0400 @@ -49,7 +49,7 @@ 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__) @@ -143,7 +143,7 @@ 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) @@ -214,7 +214,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = (UniqueConstraint('ui_key'), {'extend_existing':True}) HOOK_UPDATE = 'changegroup.update'
--- a/kallithea/lib/dbmigrate/schema/db_1_3_0.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_3_0.py Wed Jul 02 19:08:37 2014 -0400 @@ -51,7 +51,7 @@ from kallithea.model.meta import Base, Session import hashlib -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX log = logging.getLogger(__name__) @@ -158,7 +158,7 @@ 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', @@ -233,7 +233,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine':'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_1_4_0.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_4_0.py Wed Jul 02 19:08:37 2014 -0400 @@ -55,7 +55,7 @@ from kallithea.model.meta import Base, Session -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX URL_SEP = '/' log = logging.getLogger(__name__) @@ -150,7 +150,7 @@ class Setting(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'settings' + __tablename__ = DB_PREFIX + 'settings' __table_args__ = ( UniqueConstraint('app_settings_name'), {'extend_existing': True, 'mysql_engine': 'InnoDB', @@ -232,7 +232,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_1_5_0.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_5_0.py Wed Jul 02 19:08:37 2014 -0400 @@ -54,7 +54,7 @@ from kallithea.model.meta import Base, Session -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX URL_SEP = '/' log = logging.getLogger(__name__) @@ -149,7 +149,7 @@ class Setting(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'settings' + __tablename__ = DB_PREFIX + 'settings' __table_args__ = ( UniqueConstraint('app_settings_name'), {'extend_existing': True, 'mysql_engine': 'InnoDB', @@ -248,7 +248,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_1_5_2.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_5_2.py Wed Jul 02 19:08:37 2014 -0400 @@ -58,7 +58,7 @@ URL_SEP = '/' log = logging.getLogger(__name__) -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX #============================================================================== # BASE CLASSES @@ -150,7 +150,7 @@ class Setting(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'settings' + __tablename__ = DB_PREFIX + 'settings' __table_args__ = ( UniqueConstraint('app_settings_name'), {'extend_existing': True, 'mysql_engine': 'InnoDB', @@ -249,7 +249,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_1_6_0.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_6_0.py Wed Jul 02 19:08:37 2014 -0400 @@ -58,7 +58,7 @@ URL_SEP = '/' log = logging.getLogger(__name__) -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX #============================================================================== # BASE CLASSES @@ -150,7 +150,7 @@ class Setting(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'settings' + __tablename__ = DB_PREFIX + 'settings' __table_args__ = ( UniqueConstraint('app_settings_name'), {'extend_existing': True, 'mysql_engine': 'InnoDB', @@ -249,7 +249,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_1_7_0.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_7_0.py Wed Jul 02 19:08:37 2014 -0400 @@ -58,7 +58,7 @@ URL_SEP = '/' log = logging.getLogger(__name__) -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX #============================================================================== # BASE CLASSES @@ -155,7 +155,7 @@ class Setting(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'settings' + __tablename__ = DB_PREFIX + 'settings' __table_args__ = ( UniqueConstraint('app_settings_name'), {'extend_existing': True, 'mysql_engine': 'InnoDB', @@ -254,7 +254,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_1_8_0.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_8_0.py Wed Jul 02 19:08:37 2014 -0400 @@ -58,7 +58,7 @@ URL_SEP = '/' log = logging.getLogger(__name__) -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX #============================================================================== # BASE CLASSES @@ -155,7 +155,7 @@ class Setting(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'settings' + __tablename__ = DB_PREFIX + 'settings' __table_args__ = ( UniqueConstraint('app_settings_name'), {'extend_existing': True, 'mysql_engine': 'InnoDB', @@ -272,7 +272,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_2_0_0.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_0_0.py Wed Jul 02 19:08:37 2014 -0400 @@ -59,7 +59,7 @@ URL_SEP = '/' log = logging.getLogger(__name__) -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX #============================================================================== # BASE CLASSES @@ -163,7 +163,7 @@ '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', @@ -319,7 +319,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_2_0_1.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_0_1.py Wed Jul 02 19:08:37 2014 -0400 @@ -56,7 +56,7 @@ from kallithea.model.meta import Base, Session -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX URL_SEP = '/' log = logging.getLogger(__name__) @@ -166,7 +166,7 @@ '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', @@ -322,7 +322,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_2_0_2.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_0_2.py Wed Jul 02 19:08:37 2014 -0400 @@ -59,7 +59,7 @@ URL_SEP = '/' log = logging.getLogger(__name__) -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX #============================================================================== # BASE CLASSES @@ -166,7 +166,7 @@ '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', @@ -322,7 +322,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_2_1_0.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_1_0.py Wed Jul 02 19:08:37 2014 -0400 @@ -59,7 +59,7 @@ URL_SEP = '/' log = logging.getLogger(__name__) -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX #============================================================================== # BASE CLASSES @@ -159,7 +159,7 @@ class Setting(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'settings' + __tablename__ = DB_PREFIX + 'settings' __table_args__ = ( UniqueConstraint('app_settings_name'), {'extend_existing': True, 'mysql_engine': 'InnoDB', @@ -325,7 +325,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_2_2_0.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_2_0.py Wed Jul 02 19:08:37 2014 -0400 @@ -60,7 +60,7 @@ URL_SEP = '/' log = logging.getLogger(__name__) -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX #============================================================================== # BASE CLASSES @@ -160,7 +160,7 @@ class Setting(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'settings' + __tablename__ = DB_PREFIX + 'settings' __table_args__ = ( UniqueConstraint('app_settings_name'), {'extend_existing': True, 'mysql_engine': 'InnoDB', @@ -326,7 +326,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/schema/db_2_2_3.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_2_3.py Wed Jul 02 19:08:37 2014 -0400 @@ -60,7 +60,7 @@ URL_SEP = '/' log = logging.getLogger(__name__) -from kallithea import SETTINGS_PREFIX +from kallithea import DB_PREFIX #============================================================================== # BASE CLASSES @@ -160,7 +160,7 @@ class Setting(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'settings' + __tablename__ = DB_PREFIX + 'settings' __table_args__ = ( UniqueConstraint('app_settings_name'), {'extend_existing': True, 'mysql_engine': 'InnoDB', @@ -326,7 +326,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',
--- a/kallithea/lib/dbmigrate/versions/001_initial_release.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/lib/dbmigrate/versions/001_initial_release.py Wed Jul 02 19:08:37 2014 -0400 @@ -12,12 +12,12 @@ 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) @@ -32,7 +32,7 @@ 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)
--- a/kallithea/model/db.py Wed Jul 02 19:08:36 2014 -0400 +++ b/kallithea/model/db.py Wed Jul 02 19:08:37 2014 -0400 @@ -43,6 +43,7 @@ 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 @@ -57,8 +58,6 @@ from kallithea.model.meta import Base, Session -from kallithea import SETTINGS_PREFIX - URL_SEP = '/' log = logging.getLogger(__name__) @@ -160,7 +159,7 @@ class Setting(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'settings' + __tablename__ = DB_PREFIX + 'settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -327,7 +326,7 @@ class Ui(Base, BaseModel): - __tablename__ = SETTINGS_PREFIX + 'ui' + __tablename__ = DB_PREFIX + 'ui' __table_args__ = ( UniqueConstraint('ui_key'), {'extend_existing': True, 'mysql_engine': 'InnoDB',