aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-04-26 15:09:03 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-04-26 15:09:03 -0500
commit313b38f895332a700984adf8156ec9b3c4150b09 (patch)
treeeabdcd1824ed846b73ff1882d216888ad5c16d03
parentd6251b29ecc76980010fd4048307ea8159b20cec (diff)
downloadmediagoblin-313b38f895332a700984adf8156ec9b3c4150b09.tar.lz
mediagoblin-313b38f895332a700984adf8156ec9b3c4150b09.tar.xz
mediagoblin-313b38f895332a700984adf8156ec9b3c4150b09.zip
Don't turn on sqlite refcheck stuff during migrations
-rw-r--r--mediagoblin/db/open.py4
-rw-r--r--mediagoblin/gmg_commands/dbupdate.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index 5fd5ed03..4c0694cc 100644
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -71,11 +71,11 @@ def _sqlite_fk_pragma_on_connect(dbapi_con, con_record):
dbapi_con.execute('pragma foreign_keys=on')
-def setup_connection_and_db_from_config(app_config):
+def setup_connection_and_db_from_config(app_config, sqlite_refcheck=True):
engine = create_engine(app_config['sql_engine'])
# Enable foreign key checking for sqlite
- if app_config['sql_engine'].startswith('sqlite://'):
+ if app_config['sql_engine'].startswith('sqlite://') and sqlite_refcheck:
event.listen(engine, 'connect', _sqlite_fk_pragma_on_connect)
# logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py
index 65b3f922..f33d83d5 100644
--- a/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@ -114,7 +114,7 @@ def run_dbupdate(app_config, global_config):
global_config.get('plugins', {}).keys())
# Set up the database
- db = setup_connection_and_db_from_config(app_config)
+ db = setup_connection_and_db_from_config(app_config, sqlite_refcheck=False)
Session = sessionmaker(bind=db.engine)