Merge "db: Replace use of legacy select() calling style"

glance/db/sqlalchemy/alembic_migrations/data_migrations/ocata_migrate01_community_images.py

@@ -31,7 +31,7 @@ def has_migrations(engine):
     meta = MetaData(engine)
     images = Table('images', meta, autoload=True)
 
-    rows_with_null_visibility = (select([images.c.id])
+    rows_with_null_visibility = (select(images.c.id)
                                  .where(images.c.visibility == None)
                                  .limit(1)
                                  .execute())
@@ -40,11 +40,11 @@ def has_migrations(engine):
         return True
 
     image_members = Table('image_members', meta, autoload=True)
-    rows_with_pending_shared = (select([images.c.id])
+    rows_with_pending_shared = (select(images.c.id)
                                 .where(and_(
                                     images.c.visibility == 'private',
                                     images.c.id.in_(
-                                        select([image_members.c.image_id])
+                                        select(image_members.c.image_id)
                                         .distinct()
                                         .where(not_(image_members.c.deleted))))
                                        )
@@ -78,7 +78,7 @@ def _mark_all_private_images_with_members_as_shared_visibility(images,
                      .update().values(visibility='shared')
                      .where(and_(images.c.visibility == 'private',
                                  images.c.id.in_(
-                                     select([image_members.c.image_id])
+                                     select(image_members.c.image_id)
                                      .distinct()
                                      .where(not_(image_members.c.deleted)))))
                      .execute())

glance/db/sqlalchemy/api.py

@@ -1512,7 +1512,7 @@ def purge_deleted_rows(context, age_in_days, max_rows, session=None):
     ti = Table("task_info", metadata, autoload=True)
     joined_rec = ti.join(t, t.c.id == ti.c.task_id)
     deleted_task_info = sql.\
-        select([ti.c.task_id], t.c.deleted_at < deleted_age).\
+        select(ti.c.task_id).where(t.c.deleted_at < deleted_age).\
         select_from(joined_rec).\
         order_by(t.c.deleted_at)
     if max_rows != -1:
@@ -1560,7 +1560,8 @@ def purge_deleted_rows(context, age_in_days, max_rows, session=None):
         column = tab.c.id
         deleted_at_column = tab.c.deleted_at
 
-        query_delete = sql.select([column], deleted_at_column < deleted_age).\
+        query_delete = sql.select(column).\
+            where(deleted_at_column < deleted_age).\
             order_by(deleted_at_column)
         if max_rows != -1:
             query_delete = query_delete.limit(max_rows)
@@ -1606,7 +1607,8 @@ def purge_deleted_rows_from_images(context, age_in_days, max_rows,
     deleted_at_column = tab.c.deleted_at
 
     query_delete = sql.\
-        select([column], deleted_at_column < deleted_age).\
+        select(column).\
+        where(deleted_at_column < deleted_age).\
         order_by(deleted_at_column)
     if max_rows != -1:
         query_delete = query_delete.limit(max_rows)

glance/db/sqlalchemy/metadata.py

@@ -93,7 +93,7 @@ def get_metadef_tags_table(meta):
 def _get_resource_type_id(meta, name):
     rt_table = get_metadef_resource_types_table(meta)
     resource_type = (
-        select([rt_table.c.id]).
+        select(rt_table.c.id).
         where(rt_table.c.name == name).
         select_from(rt_table).
         execute().fetchone())
@@ -156,7 +156,7 @@ def _get_tags(meta, namespace_id):
 
 def _get_resource_id(table, namespace_id, resource_name):
     resource = (
-        select([table.c.id]).
+        select(table.c.id).
         where(and_(table.c.namespace_id == namespace_id,
                    table.c.name == resource_name)).
         select_from(table).
@@ -242,7 +242,7 @@ def _populate_metadata(meta, metadata_path=None, merge=False,
         }
 
         db_namespace = select(
-            [namespaces_table.c.id]
+            namespaces_table.c.id
         ).where(
             namespaces_table.c.namespace == values['namespace']
         ).select_from(
@@ -259,7 +259,7 @@ def _populate_metadata(meta, metadata_path=None, merge=False,
             _insert_data_to_db(namespaces_table, values)
 
             db_namespace = select(
-                [namespaces_table.c.id]
+                namespaces_table.c.id
             ).where(
                 namespaces_table.c.namespace == values['namespace']
             ).select_from(

glance/tests/unit/fixtures.py

@@ -262,13 +262,6 @@ class WarningsFixture(pyfixtures.Fixture):
             message=r'The ``bind`` argument for schema methods ',
         )
 
-        warnings.filterwarnings(
-            'ignore',
-            module='glance',
-            category=sqla_exc.SADeprecationWarning,
-            message=r'The legacy calling style of select\(\) ',
-        )
-
         warnings.filterwarnings(
             'ignore',
             module='glance',