diff options
| author | Stephen Finucane <stephenfin@redhat.com> | 2021-07-16 18:59:45 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2021-08-10 16:53:47 +0100 |
| commit | 6dc4b1c415bba34c875ad69dd5c01f804ae6f223 (patch) | |
| tree | 8bd68b8192f8b1696ff593485b280b506624dd63 | |
| parent | d949861094d078eaf2d10d72483ac28310d6ec22 (diff) | |
| download | oslo-db-6dc4b1c415bba34c875ad69dd5c01f804ae6f223.tar.gz | |
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>
| -rw-r--r-- | oslo_db/tests/fixtures.py | 5 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_exc_filters.py | 20 |
2 files changed, 10 insertions, 15 deletions
diff --git a/oslo_db/tests/fixtures.py b/oslo_db/tests/fixtures.py index 6b6cad4..528322a 100644 --- a/oslo_db/tests/fixtures.py +++ b/oslo_db/tests/fixtures.py @@ -59,11 +59,6 @@ class WarningsFixture(fixtures.Fixture): 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 .*', category=sqla_exc.SADeprecationWarning) diff --git a/oslo_db/tests/sqlalchemy/test_exc_filters.py b/oslo_db/tests/sqlalchemy/test_exc_filters.py index 97f85e6..3dd0022 100644 --- a/oslo_db/tests/sqlalchemy/test_exc_filters.py +++ b/oslo_db/tests/sqlalchemy/test_exc_filters.py @@ -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, |