diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-08-13 01:18:37 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-08-13 01:18:37 +0000 |
commit | d14299e62caedb746076a95f68abcbc0d4cd50c4 (patch) | |
tree | 6d6d038cf7a4ac21b68e8f2d2d944cf523347d05 | |
parent | 708ccf086a6a4de28b271931a7890b642c9ec1bc (diff) | |
parent | 0623b291ef4eb9357ea502166c55515ebcc99760 (diff) | |
download | keystone-d14299e62caedb746076a95f68abcbc0d4cd50c4.tar.gz keystone-d14299e62caedb746076a95f68abcbc0d4cd50c4.tar.xz keystone-d14299e62caedb746076a95f68abcbc0d4cd50c4.zip |
Merge "Drop extra credential indexes"
-rw-r--r-- | keystone/common/sql/migrate_repo/versions/031_drop_credential_indexes.py | 40 | ||||
-rw-r--r-- | keystone/credential/backends/sql.py | 5 | ||||
-rw-r--r-- | tests/test_sql_upgrade.py | 18 |
3 files changed, 58 insertions, 5 deletions
diff --git a/keystone/common/sql/migrate_repo/versions/031_drop_credential_indexes.py b/keystone/common/sql/migrate_repo/versions/031_drop_credential_indexes.py new file mode 100644 index 00000000..89ca04f0 --- /dev/null +++ b/keystone/common/sql/migrate_repo/versions/031_drop_credential_indexes.py @@ -0,0 +1,40 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2013 OpenStack Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import sqlalchemy + + +def upgrade(migrate_engine): + #This migration is relevant only for mysql because for all other + #migrate engines these indexes were successfully dropped. + if migrate_engine.name != 'mysql': + return + meta = sqlalchemy.MetaData(bind=migrate_engine) + table = sqlalchemy.Table('credential', meta, autoload=True) + for index in table.indexes: + index.drop() + + +def downgrade(migrate_engine): + if migrate_engine.name != 'mysql': + return + meta = sqlalchemy.MetaData(bind=migrate_engine) + table = sqlalchemy.Table('credential', meta, autoload=True) + index = sqlalchemy.Index('user_id', table.c['user_id']) + index.create() + index = sqlalchemy.Index('credential_project_id_fkey', + table.c['project_id']) + index.create() diff --git a/keystone/credential/backends/sql.py b/keystone/credential/backends/sql.py index 8aab3511..eab9dfea 100644 --- a/keystone/credential/backends/sql.py +++ b/keystone/credential/backends/sql.py @@ -30,11 +30,6 @@ class CredentialModel(sql.ModelBase, sql.DictBase): blob = sql.Column(sql.JsonBlob(), nullable=False) type = sql.Column(sql.String(255), nullable=False) extra = sql.Column(sql.JsonBlob()) - #TODO(eezhova):extra indexes should be removed. (23 migration). - __table_args__ = ( - sql.Index('user_id', 'user_id'), - sql.Index('credential_project_id_fkey', 'project_id') - ) class Credential(sql.Base, credential.Driver): diff --git a/tests/test_sql_upgrade.py b/tests/test_sql_upgrade.py index 5975fb9d..9540c4cd 100644 --- a/tests/test_sql_upgrade.py +++ b/tests/test_sql_upgrade.py @@ -1238,6 +1238,24 @@ class SqlUpgradeTests(SqlMigrateBase): self.assertEqual(cred.user_id, ec2_credential['user_id']) + def test_drop_credential_indexes(self): + self.upgrade(31) + table = sqlalchemy.Table('credential', self.metadata, autoload=True) + self.assertEqual(len(table.indexes), 0) + + def test_downgrade_30(self): + self.upgrade(31) + self.downgrade(30) + table = sqlalchemy.Table('credential', self.metadata, autoload=True) + index_data = [(idx.name, idx.columns.keys()) + for idx in table.indexes] + if self.engine.name == 'mysql': + self.assertIn(('user_id', ['user_id']), index_data) + self.assertIn(('credential_project_id_fkey', ['project_id']), + index_data) + else: + self.assertEqual(len(index_data), 0) + def populate_user_table(self, with_pass_enab=False, with_pass_enab_domain=False): # Populate the appropriate fields in the user |