Merge lp:~dan-prince/nova/db_migrate_014_sqlite_fix into lp:~hudson-openstack/nova/trunk

[Dan Prince]

Create a dictionary of instance_types before executing SQL updates in the instance_type_id migration (014). This should resolve a "cannot commit transaction - SQL statements in progress" error with some versions of sqlite.

Create a dictionary of instance_types before executing SQL updates in the instance_type_id migration (014). This should resolve a "cannot commit transaction - SQL statements in progress" error with some versions of sqlite. In this case an older version of Sqlite on SLES11 SP1.

While it is normally a bad idea to change database migrations after the fact this is a special case since it is just an implementation change. The functional database changes accomplished by this migration are the same.

[termie (termie)]

lgtm

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py'
--- nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py	2011-04-05 17:02:42 +0000
+++ nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py	2011-04-19 21:48:39 +0000
@@ -54,10 +54,12 @@
 
     instances.create_column(c_instance_type_id)
 
+    type_names = {}
     recs = migrate_engine.execute(instance_types.select())
     for row in recs:
-        type_id = row[0]
-        type_name = row[1]
+        type_names[row[0]] = row[1]
+
+    for type_id, type_name in type_names.iteritems():
         migrate_engine.execute(instances.update()\
             .where(instances.c.instance_type == type_name)\
             .values(instance_type_id=type_id))