Merge "db: Don't use legacy 'Row()' methods"
This commit is contained in:
commit
4a359d576d
|
@ -600,7 +600,7 @@ def _compute_node_fetchall(context, filters=None, limit=None, marker=None):
|
|||
results = conn.execute(select).fetchall()
|
||||
|
||||
# Callers expect dict-like objects, not SQLAlchemy RowProxy objects...
|
||||
results = [dict(r) for r in results]
|
||||
results = [dict(r._mapping) for r in results]
|
||||
conn.close()
|
||||
return results
|
||||
|
||||
|
|
|
@ -865,18 +865,6 @@ class WarningsFixture(fixtures.Fixture):
|
|||
message=r'The Column.copy\(\) method is deprecated .*',
|
||||
category=sqla_exc.SADeprecationWarning)
|
||||
|
||||
warnings.filterwarnings(
|
||||
'ignore',
|
||||
module='nova',
|
||||
message=r'The Row.keys\(\) method is considered legacy .*',
|
||||
category=sqla_exc.SADeprecationWarning)
|
||||
|
||||
warnings.filterwarnings(
|
||||
'ignore',
|
||||
module='nova',
|
||||
message=r'Using non-integer/slice indices on Row is deprecated .*',
|
||||
category=sqla_exc.SADeprecationWarning)
|
||||
|
||||
warnings.filterwarnings(
|
||||
'ignore',
|
||||
module='nova',
|
||||
|
|
Loading…
Reference in New Issue