diff options
| author | Boris Pavlovic <boris@pavlovic.me> | 2012-12-24 15:19:28 +0400 |
|---|---|---|
| committer | Boris Pavlovic <boris@pavlovic.me> | 2013-01-23 17:18:10 +0400 |
| commit | 28191baa2b1a65fb86bbbbfc0974495059db6d42 (patch) | |
| tree | d1d023297660920e693fe99d39f8499cab1c85cd /nova/tests | |
| parent | bb108c6bd359e788e0f4cfc53f5933d134fc7cc4 (diff) | |
Provide creating real unique constraints for columns
Main issue is that we can't create unique constraint for columns, because
we are using soft deletion of entries (set `deleted` column to True).
The main idea is to use `deleted` columns to create unique constraint for
columns. For example (`col1`, `deleted`).
To make (`col1`, `deleted`) unique after entry deletion, we should assign the
value of `id` to `deleted` column.
Change type of `deleted` column from Boolean to table.id.type for all tables.
Change models.soft_delete() method to assign table.id instead of True to
`deleted` column.
Change query.soft_delete() method to assign literal_column("id") instead of True
Change in db.models all occurrences of Table.deleted == False =>
Table.deleted == correct_type (0 or "")
Value of `deleted` property of entries is used in public nova api. To keep API
as is, we should change XMLDictSerializer by converting the type of
`deleted` property to string representation of boolean.
Change db.api.model_query() method to make it work with different types
of `deleted` column.
If we are using as model that is not subclass of NovaBase we should set
parameter base_model as subclass of NovaBase that corresponds to model.
Change in db.api all occurrences of using model_query with model that is not
subclass of NovaBase.
blueprint db-unique-keys
Change-Id: Ie1f67f49a5d085e6371efb63fc23a1c8b25d9464
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_migrations.py | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py index a6c150971..8634e7aaa 100644 --- a/nova/tests/test_migrations.py +++ b/nova/tests/test_migrations.py @@ -490,3 +490,77 @@ class TestMigrations(test.TestCase): migration_api.downgrade(engine, TestMigrations.REPOSITORY, 146) _146_check() + + def test_migration_152(self): + host1 = 'compute-host1' + host2 = 'compute-host2' + + def _151_check(services, volumes): + service = services.select(services.c.id == 1).execute().first() + self.assertEqual(False, service.deleted) + service = services.select(services.c.id == 2).execute().first() + self.assertEqual(True, service.deleted) + + volume = volumes.select(volumes.c.id == "first").execute().first() + self.assertEqual(False, volume.deleted) + volume = volumes.select(volumes.c.id == "second").execute().first() + self.assertEqual(True, volume.deleted) + + for key, engine in self.engines.items(): + migration_api.version_control(engine, TestMigrations.REPOSITORY, + migration.INIT_VERSION) + migration_api.upgrade(engine, TestMigrations.REPOSITORY, 151) + metadata = sqlalchemy.schema.MetaData() + metadata.bind = engine + + # NOTE(boris-42): It is enough to test one table with type of `id` + # column Integer and one with type String. + services = sqlalchemy.Table('services', metadata, autoload=True) + volumes = sqlalchemy.Table('volumes', metadata, autoload=True) + + engine.execute( + services.insert(), + [ + {'id': 1, 'host': host1, 'binary': 'nova-compute', + 'report_count': 0, 'topic': 'compute', 'deleted': False}, + {'id': 2, 'host': host1, 'binary': 'nova-compute', + 'report_count': 0, 'topic': 'compute', 'deleted': True} + ] + ) + + engine.execute( + volumes.insert(), + [ + {'id': 'first', 'host': host1, 'deleted': False}, + {'id': 'second', 'host': host2, 'deleted': True} + ] + ) + + _151_check(services, volumes) + + migration_api.upgrade(engine, TestMigrations.REPOSITORY, 152) + # NOTE(boris-42): One more time get from DB info about tables. + metadata2 = sqlalchemy.schema.MetaData() + metadata2.bind = engine + + services = sqlalchemy.Table('services', metadata2, autoload=True) + + service = services.select(services.c.id == 1).execute().first() + self.assertEqual(0, service.deleted) + service = services.select(services.c.id == 2).execute().first() + self.assertEqual(service.id, service.deleted) + + volumes = sqlalchemy.Table('volumes', metadata2, autoload=True) + volume = volumes.select(volumes.c.id == "first").execute().first() + self.assertEqual("", volume.deleted) + volume = volumes.select(volumes.c.id == "second").execute().first() + self.assertEqual(volume.id, volume.deleted) + + migration_api.downgrade(engine, TestMigrations.REPOSITORY, 151) + # NOTE(boris-42): One more time get from DB info about tables. + metadata = sqlalchemy.schema.MetaData() + metadata.bind = engine + services = sqlalchemy.Table('services', metadata, autoload=True) + volumes = sqlalchemy.Table('volumes', metadata, autoload=True) + + _151_check(services, volumes) |
