db: Pass case.whens as positionals, not a list

Resolve the following RemovedIn20Warning warnings: The "whens" argument to case(), when referring to a sequence of items, is now passed as a series of positional elements, rather than as a list. Change-Id: I4df3a52333d71809d6ff305a786ba6ae03a230ca Signed-off-by: Stephen Finucane <[email protected]>
wwjiang007 · Jul 24, 2023 · e5a8918 · e5a8918
1 parent c70349d
commit e5a8918
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/glance/db/sqlalchemy/api.py b/glance/db/sqlalchemy/api.py
@@ -412,17 +412,17 @@ def _paginate_query(query, model, limit, sort_keys, marker=None,
                 model_attr = getattr(model, sort_keys[j])
                 default = _get_default_column_value(
                     model_attr.property.columns[0].type)
-                attr = sa_sql.expression.case([(model_attr != None,
-                                              model_attr), ],
-                                              else_=default)
+                attr = sa_sql.expression.case(
+                    (model_attr != None, model_attr),
+                    else_=default)
                 crit_attrs.append((attr == marker_values[j]))
 
             model_attr = getattr(model, sort_keys[i])
             default = _get_default_column_value(
                 model_attr.property.columns[0].type)
-            attr = sa_sql.expression.case([(model_attr != None,
-                                          model_attr), ],
-                                          else_=default)
+            attr = sa_sql.expression.case(
+                (model_attr != None, model_attr),
+                else_=default)
             if sort_dirs[i] == 'desc':
                 crit_attrs.append((attr < marker_values[i]))
             elif sort_dirs[i] == 'asc':

diff --git a/glance/tests/unit/fixtures.py b/glance/tests/unit/fixtures.py
@@ -192,13 +192,6 @@ def setUp(self):
             message='The ``aliased`` and ``from_joinpoint`` keyword ',
         )
 
-        warnings.filterwarnings(
-            'ignore',
-            module='glance',
-            category=sqla_exc.SADeprecationWarning,
-            message=r'The "whens" argument to case\(\), ',
-        )
-
         warnings.filterwarnings(
             'ignore',
             module='glance',