Merge "SQL: only create tables in scheduler"
This commit is contained in:
commit
3c73474c07
|
@ -187,7 +187,6 @@ class SQLConnection(BaseConnection):
|
||||||
self.dburi,
|
self.dburi,
|
||||||
poolclass=sqlalchemy.pool.QueuePool,
|
poolclass=sqlalchemy.pool.QueuePool,
|
||||||
pool_recycle=self.connection_config.get('pool_recycle', 1))
|
pool_recycle=self.connection_config.get('pool_recycle', 1))
|
||||||
self._migrate()
|
|
||||||
|
|
||||||
# If we want the objects returned from query() to be
|
# If we want the objects returned from query() to be
|
||||||
# usable outside of the session, we need to expunge them
|
# usable outside of the session, we need to expunge them
|
||||||
|
@ -200,7 +199,6 @@ class SQLConnection(BaseConnection):
|
||||||
autoflush=False)
|
autoflush=False)
|
||||||
self.session = orm.scoped_session(self.session_factory)
|
self.session = orm.scoped_session(self.session_factory)
|
||||||
|
|
||||||
self.tables_established = True
|
|
||||||
except sa.exc.NoSuchModuleError:
|
except sa.exc.NoSuchModuleError:
|
||||||
self.log.exception(
|
self.log.exception(
|
||||||
"The required module for the dburi dialect isn't available. "
|
"The required module for the dburi dialect isn't available. "
|
||||||
|
@ -231,6 +229,20 @@ class SQLConnection(BaseConnection):
|
||||||
tag = {'table_prefix': self.table_prefix}
|
tag = {'table_prefix': self.table_prefix}
|
||||||
alembic.command.upgrade(config, 'head', tag=tag)
|
alembic.command.upgrade(config, 'head', tag=tag)
|
||||||
|
|
||||||
|
def onLoad(self):
|
||||||
|
try:
|
||||||
|
self._migrate()
|
||||||
|
self.tables_established = True
|
||||||
|
except sa.exc.NoSuchModuleError:
|
||||||
|
self.log.exception(
|
||||||
|
"The required module for the dburi dialect isn't available. "
|
||||||
|
"SQL connection %s will be unavailable." %
|
||||||
|
self.connection_name)
|
||||||
|
except sa.exc.OperationalError:
|
||||||
|
self.log.exception(
|
||||||
|
"Unable to connect to the database or establish the required "
|
||||||
|
"tables. Connection %s is disabled" % self)
|
||||||
|
|
||||||
def _setup_models(self):
|
def _setup_models(self):
|
||||||
Base = declarative_base(metadata=sa.MetaData())
|
Base = declarative_base(metadata=sa.MetaData())
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue