summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Harris <rconradharris@gmail.com>2013-02-27 23:04:40 +0000
committerRick Harris <rconradharris@gmail.com>2013-02-27 23:14:50 +0000
commit09a3566a46bf2d19bc30065f31a2cc3ad15a33b1 (patch)
tree28a63efa2bde587da85e05979d207cac2eba7e89
parent2c0065ff86f81bd9c9f9d455ca10ad46e2aed73d (diff)
BM Migration 004: Actually drop column
SQLAlchemy-migrate appears to support passing in a Column or a column-name string into `drop_column`. In practice though, only the column-name form actually works. Change-Id: I1bcc28511d652df44f7168fb84c8be7dacd60cfd
-rw-r--r--nova/tests/test_migrations.py4
-rw-r--r--nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py4
2 files changed, 5 insertions, 3 deletions
diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py
index e090044cc..054128634 100644
--- a/nova/tests/test_migrations.py
+++ b/nova/tests/test_migrations.py
@@ -971,3 +971,7 @@ class TestBaremetalMigrations(BaseMigrationTestCase, CommonTestsMixIn):
def _check_002(self, engine, data):
self.assertRaises(sqlalchemy.exc.NoSuchTableError,
get_table, engine, 'bm_deployments')
+
+ def _post_downgrade_004(self, engine):
+ bm_nodes = get_table(engine, 'bm_nodes')
+ self.assertNotIn(u'instance_name', [c.name for c in bm_nodes.columns])
diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py
index 68fbe0960..6f85b9cec 100644
--- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py
+++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py
@@ -32,6 +32,4 @@ def downgrade(migrate_engine):
meta.bind = migrate_engine
t = Table('bm_nodes', meta, autoload=True)
- name_col = Column('instance_name', String(length=255))
-
- t.drop_column(name_col)
+ t.drop_column('instance_name')