openstack
/
oslo.db
Code Issues Proposed changes

Replace use of insert.values parameter 

Resolve the following RemovedIn20Warning warning:

  The insert.values parameter will be removed in SQLAlchemy 2.0.  Please
  refer to the Insert.values() method.

Change-Id: I52ff0c44039d8d1ee09210d9a990d0e40bbfa411
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2021-07-16 18:59:45 +01:00
parent d949861094
commit 6dc4b1c415
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oslo_db/tests/fixtures.py
View File

@ -57,11 +57,6 @@ class WarningsFixture(fixtures.Fixture):
message=r'Using non-integer/slice indices on Row is deprecated .*',
category=sqla_exc.SADeprecationWarning)
warnings.filterwarnings(
'once',
message=r'The insert.values parameter will be removed .*',
category=sqla_exc.SADeprecationWarning)
warnings.filterwarnings(
'once',
message=r'The update.values parameter will be removed .*',

20
oslo_db/tests/sqlalchemy/test_exc_filters.py
View File

@ -493,7 +493,7 @@ class TestReferenceErrorSQLite(
matched = self.assertRaises(
exception.DBReferenceError,
self.engine.execute,
self.table_2.insert({'id': 1, 'foo_id': 2})
self.table_2.insert().values(id=1, foo_id=2)
)
self.assertInnerException(
@ -513,8 +513,8 @@ class TestReferenceErrorSQLite(
self.engine.execute(sql.text("PRAGMA foreign_keys = ON"))
with self.engine.connect() as conn:
conn.execute(self.table_1.insert({"id": 1234, "foo": 42}))
conn.execute(self.table_2.insert({"id": 4321, "foo_id": 1234}))
conn.execute(self.table_1.insert().values(id=1234, foo=42))
conn.execute(self.table_2.insert().values(id=4321, foo_id=1234))
matched = self.assertRaises(
exception.DBReferenceError,
self.engine.execute,
@ -543,7 +543,7 @@ class TestReferenceErrorPostgreSQL(
matched = self.assertRaises(
exception.DBReferenceError,
self.engine.execute,
self.table_2.insert(params)
self.table_2.insert().values(**params)
)
self.assertInnerException(
matched,
@ -563,8 +563,8 @@ class TestReferenceErrorPostgreSQL(
def test_raise_delete(self):
with self.engine.connect() as conn:
conn.execute(self.table_1.insert({"id": 1234, "foo": 42}))
conn.execute(self.table_2.insert({"id": 4321, "foo_id": 1234}))
conn.execute(self.table_1.insert().values(id=1234, foo=42))
conn.execute(self.table_2.insert().values(id=4321, foo_id=1234))
matched = self.assertRaises(
exception.DBReferenceError,
self.engine.execute,
@ -595,7 +595,7 @@ class TestReferenceErrorMySQL(
matched = self.assertRaises(
exception.DBReferenceError,
self.engine.execute,
self.table_2.insert({'id': 1, 'foo_id': 2})
self.table_2.insert().values(id=1, foo_id=2)
)
# NOTE(jd) Cannot check precisely with assertInnerException since MySQL
@ -618,7 +618,7 @@ class TestReferenceErrorMySQL(
matched = self.assertRaises(
exception.DBReferenceError,
conn.execute,
self.table_2.insert({'id': 1, 'foo_id': 2})
self.table_2.insert().values(id=1, foo_id=2)
)
# NOTE(jd) Cannot check precisely with assertInnerException since MySQL
@ -633,8 +633,8 @@ class TestReferenceErrorMySQL(
def test_raise_delete(self):
with self.engine.connect() as conn:
conn.execute(self.table_1.insert({"id": 1234, "foo": 42}))
conn.execute(self.table_2.insert({"id": 4321, "foo_id": 1234}))
conn.execute(self.table_1.insert().values(id=1234, foo=42))
conn.execute(self.table_2.insert().values(id=4321, foo_id=1234))
matched = self.assertRaises(
exception.DBReferenceError,
self.engine.execute,