diff options
| author | Ann Kamyshnikova <akamyshnikova@mirantis.com> | 2014-09-11 15:03:40 +0400 |
|---|---|---|
| committer | Ann Kamyshnikova <akamyshnikova@mirantis.com> | 2014-09-15 15:48:09 +0400 |
| commit | 436dfdc737cdd1f0d330eac7b3c61b739bf75016 (patch) | |
| tree | 0b79e9daaccc01a7f8961e1030ba00d221fd6a7e | |
| parent | cc7ae9fecc705924c4dc1d8d104338afc0e2437e (diff) | |
| download | oslo-db-436dfdc737cdd1f0d330eac7b3c61b739bf75016.tar.gz | |
ModelsMigrationsSync:add correct server_default check for Enum
If Column which type is Enum has server_default it is compared
incorrectly for PostgreSQL.
For example, Column('test', sa.Enum('one', 'two', name='enum'),
server_default='one').
In model it has DefaultClause('one', for_update=False)) alembic
finds it different from server variant "'one'::enum".
Change-Id: Id30858f9c4c7a2bfb7f9313d47930845fe354a70
| -rw-r--r-- | oslo/db/sqlalchemy/test_migrations.py | 6 | ||||
| -rw-r--r-- | tests/sqlalchemy/test_migrations.py | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/oslo/db/sqlalchemy/test_migrations.py b/oslo/db/sqlalchemy/test_migrations.py index 176e0dd..333cd31 100644 --- a/oslo/db/sqlalchemy/test_migrations.py +++ b/oslo/db/sqlalchemy/test_migrations.py @@ -395,7 +395,11 @@ class ModelsMigrationsSync(object): @_compare_server_default.dispatch_for('postgresql') def _compare_server_default(bind, meta_col, insp_def, meta_def): - if isinstance(meta_col.type, sqlalchemy.String): + if isinstance(meta_col.type, sqlalchemy.Enum): + if meta_def is None or insp_def is None: + return meta_def != insp_def + return insp_def != "'%s'::%s" % (meta_def.arg, meta_col.type.name) + elif isinstance(meta_col.type, sqlalchemy.String): if meta_def is None or insp_def is None: return meta_def != insp_def return insp_def != "'%s'::character varying" % meta_def.arg diff --git a/tests/sqlalchemy/test_migrations.py b/tests/sqlalchemy/test_migrations.py index df331d4..abb5f8a 100644 --- a/tests/sqlalchemy/test_migrations.py +++ b/tests/sqlalchemy/test_migrations.py @@ -191,6 +191,9 @@ class ModelsMigrationSyncMixin(test.BaseTestCase): sa.Column('defaulttest', sa.Integer, server_default='5'), sa.Column('defaulttest2', sa.String(8), server_default=''), sa.Column('defaulttest3', sa.String(5), server_default="test"), + sa.Column('defaulttest4', sa.Enum('first', 'second', + name='testenum'), + server_default="first"), sa.UniqueConstraint('spam', 'eggs', name='uniq_cons'), ) @@ -214,6 +217,9 @@ class ModelsMigrationSyncMixin(test.BaseTestCase): server_default='') defaulttest3 = sa.Column('defaulttest3', sa.String(5), server_default="test") + defaulttest4 = sa.Column('defaulttest4', sa.Enum('first', 'second', + name='testenum'), + server_default="first") bar = sa.Column('bar', sa.Numeric(10, 5)) class ModelThatShouldNotBeCompared(BASE): @@ -248,6 +254,9 @@ class ModelsMigrationSyncMixin(test.BaseTestCase): sa.Column('defaulttest', sa.Integer, server_default='7'), sa.Column('defaulttest2', sa.String(8), server_default=''), sa.Column('defaulttest3', sa.String(5), server_default="fake"), + sa.Column('defaulttest4', + sa.Enum('first', 'second', name='testenum'), + server_default="first"), sa.UniqueConstraint('spam', 'foo', name='uniq_cons'), ) |