From b4bdd8e20b82f8016030037712094f257af9221f Mon Sep 17 00:00:00 2001 From: john-griffith Date: Fri, 1 Feb 2013 19:21:18 -0700 Subject: [PATCH] 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 --- .../versions/006_snapshots_add_provider_location.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 3c2dae907..ddd86d322 100644 --- 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) -- 2.45.2