Fix a exception db closed exception in migrations

Some sqlite migrations were failing due to some problems with sqlite. A
work around has been created for these however it does involve loading lots
of data into memory. If you have a large database you should consider trying
to move to postgres.

diff --git a/mediagoblin/db/migration_tools.py b/mediagoblin/db/migration_tools.py
index fae9864347d0a245a1f17b8d1c0813a0ca3f858c..2a570a053c45578123b7ce13a5ef9f4e6bd4f584 100644 (file)
--- a/mediagoblin/db/migration_tools.py
+++ b/mediagoblin/db/migration_tools.py
@@ -373,3 +373,24 @@ def replace_table_hack(db, old_table, replacement_table):
 
     replacement_table.rename(old_table_name)
     db.commit()
+
+def model_iteration_hack(db, query):
+    """
+    This will return either the query you gave if it's postgres or in the case
+    of sqlite it will return a list with all the results. This is because in
+    migrations it seems sqlite can't deal with concurrent quries so if you're
+    iterating over models and doing a commit inside the loop, you will run into
+    an exception which says you've closed the connection on your iteration
+    query. This fixes it.
+
+    NB: This loads all of the query reuslts into memeory, there isn't a good
+        way around this, we're assuming sqlite users have small databases.
+    """
+    # If it's SQLite just return all the objects
+    if db.bind.url.drivername == "sqlite":
+        return [obj for obj in db.execute(query)]
+    
+    # Postgres return the query as it knows how to deal with it.
+    return db.execute(query)
+
+

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 73807649d8915e7a1fc0ed95b7572872d242093f..672c6fbe455667736a964f0dc93ffabea6892259 100644 (file)
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -36,7 +36,7 @@ from mediagoblin import oauth
 from mediagoblin.tools import crypto
 from mediagoblin.db.extratypes import JSONEncoded, MutationDict
 from mediagoblin.db.migration_tools import (
-    RegisterMigration, inspect_table, replace_table_hack)
+    RegisterMigration, inspect_table, replace_table_hack, model_iteration_hack)
 from mediagoblin.db.models import (MediaEntry, Collection, Comment, User,
                                    Privilege, Generator, LocalUser, Location,
                                    Client, RequestToken, AccessToken)
@@ -1314,9 +1314,8 @@ def migrate_data_foreign_keys(db):
     ai_table = inspect_table(metadata, "core__activity_intermediators")
     gmr_table = inspect_table(metadata, "core__generic_model_reference")
 
-
     # Iterate through all activities doing the migration per activity.
-    for activity in db.execute(activity_table.select()):
+    for activity in model_iteration_hack(db, activity_table.select()):
         # First do the "Activity.object" migration to "Activity.temp_object"
         # I need to get the object from the Activity, I can't use the old
         # Activity.get_object as we're in a migration.
@@ -1372,7 +1371,7 @@ def migrate_data_foreign_keys(db):
         ))
 
         # Commit to the database. We're doing it here rather than outside the
-        # loop because if the server has a lot of data this can cause problems.
+        # loop because if the server has a lot of data this can cause problems
         db.commit()
 
 @RegisterMigration(30, MIGRATIONS)
@@ -1505,7 +1504,7 @@ def federation_user_migrate_data(db):
     user_table = inspect_table(metadata, "core__users")
     local_user_table = inspect_table(metadata, "core__local_users")
 
-    for user in db.execute(user_table.select()):
+    for user in model_iteration_hack(db, user_table.select()):
         db.execute(local_user_table.insert().values(
             id=user.id,
             username=user.username,
@@ -1611,9 +1610,10 @@ def federation_media_entry(db):
         default=datetime.datetime.utcnow,
     )
     updated_column.create(media_entry_table)
+    db.commit()
 
     # Data migration
-    for entry in db.execute(media_entry_table.select()):
+    for entry in model_iteration_hack(db, media_entry_table.select()):
         db.execute(media_entry_table.update().values(
             updated=entry.created,
             remote=False