Fix provider_location column add for PSQL

Migration 006 (commit 690cae58e6bbac5758ea2f7b60774c797d28fba5)
didn't work properly for postgres,
this patch corrects the upgrade by ensuring the execute
is performed and the value is initialized to None.

Since we haven't released a milestone etc with this migration in the
code it should be safe to just fix it here and submit.

Change-Id: I10a09aed3470c35c8ebbe22f29aa511592167c35

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py b/cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py
index 3c2dae9071a9355bb4238435bcd433cdb6c3767c..ddd86d32282188b9a78c64e12ad2394fe164866e 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/006_snapshots_add_provider_location.py
@@ -24,6 +24,7 @@ def upgrade(migrate_engine):
     snapshots = Table('snapshots', meta, autoload=True)
     provider_location = Column('provider_location', String(255))
     snapshots.create_column(provider_location)
+    snapshots.update().values(provider_location=None).execute()
 
 
 def downgrade(migrate_engine):
@@ -32,4 +33,4 @@ def downgrade(migrate_engine):
 
     snapshots = Table('snapshots', meta, autoload=True)
     provider_location = snapshots.columns.provider_location
-    provider_location.drop()
+    snapshots.drop_column(provider_location)