Merge "Drop extra credential indexes"

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()

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):

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