aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Browning <ayleph@thisshitistemp.com>2016-02-22 19:15:40 -0500
committerBoris Bobrov <breton@cynicmansion.ru>2016-02-23 03:32:34 +0300
commit1fe6f5d6d78c4e6f55820614b54be6562265ffa3 (patch)
treefbe9354b373bbcf3f5012858d0826a83319e21a8
parent5aa4ab06158b1375ff7f0c45dd67ad7e7d41d956 (diff)
downloadmediagoblin-1fe6f5d6d78c4e6f55820614b54be6562265ffa3.tar.lz
mediagoblin-1fe6f5d6d78c4e6f55820614b54be6562265ffa3.tar.xz
mediagoblin-1fe6f5d6d78c4e6f55820614b54be6562265ffa3.zip
Fix issue #5411 sqlite connection closes
This update changes migrations to wrap db.execute results in a list to keep the connection from closing for sqlite migrations.
-rw-r--r--mediagoblin/db/migrations/versions/101510e3a713_removes_graveyard_items_from_.py3
-rw-r--r--mediagoblin/db/migrations/versions/8429e33fdf7_remove_the_graveyard_objects_from_.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/mediagoblin/db/migrations/versions/101510e3a713_removes_graveyard_items_from_.py b/mediagoblin/db/migrations/versions/101510e3a713_removes_graveyard_items_from_.py
index 800e0448..723100c5 100644
--- a/mediagoblin/db/migrations/versions/101510e3a713_removes_graveyard_items_from_.py
+++ b/mediagoblin/db/migrations/versions/101510e3a713_removes_graveyard_items_from_.py
@@ -32,7 +32,8 @@ def upgrade():
collection_items_table = inspect_table(metadata, "core__collection_items")
graveyard_table = inspect_table(metadata, "core__graveyard")
- for tombstone in db.execute(graveyard_table.select()):
+ res = list(db.execute(graveyard_table.select()))
+ for tombstone in res:
# Get GMR for tombstone
gmr = db.execute(gmr_table.select().where(and_(
gmr_table.c.obj_pk == tombstone.id,
diff --git a/mediagoblin/db/migrations/versions/8429e33fdf7_remove_the_graveyard_objects_from_.py b/mediagoblin/db/migrations/versions/8429e33fdf7_remove_the_graveyard_objects_from_.py
index 8f222a6a..978260df 100644
--- a/mediagoblin/db/migrations/versions/8429e33fdf7_remove_the_graveyard_objects_from_.py
+++ b/mediagoblin/db/migrations/versions/8429e33fdf7_remove_the_graveyard_objects_from_.py
@@ -28,7 +28,8 @@ def upgrade():
graveyard_table = inspect_table(metadata, "core__graveyard")
gmr_table = inspect_table(metadata, "core__generic_model_reference")
- for tombstone in db.execute(gmr_table.select()):
+ res = list(db.execute(gmr_table.select()))
+ for tombstone in res:
# Look up the gmr for the tombstone8
gmr = db.execute(gmr_table.select().where(and_(
gmr_table.c.obj_pk == tombstone.id,