diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-12 18:46:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-12 18:46:06 +0000 |
| commit | 20181ab78f6fcd0e4ec484aa99a6012a4b58d4c6 (patch) | |
| tree | 6be5eb07d9629defe87f8bbe2560fd9f9a5c361d | |
| parent | e3dc6bbf77912b8971b452d8fa6adc82bbcaf53d (diff) | |
| parent | e1039e0849890c6bd10516004c6dab89db1c9111 (diff) | |
| download | oslo-db-20181ab78f6fcd0e4ec484aa99a6012a4b58d4c6.tar.gz | |
Merge "Don't pass kwargs to connection.execute()"
| -rw-r--r-- | oslo_db/sqlalchemy/provision.py | 10 | ||||
| -rw-r--r-- | oslo_db/sqlalchemy/utils.py | 2 | ||||
| -rw-r--r-- | oslo_db/tests/fixtures.py | 5 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_sqlalchemy.py | 3 |
4 files changed, 9 insertions, 11 deletions
diff --git a/oslo_db/sqlalchemy/provision.py b/oslo_db/sqlalchemy/provision.py index edb2f95..8d38d43 100644 --- a/oslo_db/sqlalchemy/provision.py +++ b/oslo_db/sqlalchemy/provision.py @@ -604,9 +604,11 @@ class PostgresqlBackendImpl(BackendImpl): return bool( engine.scalar( sqlalchemy.text( - "SELECT datname FROM pg_database " - "WHERE datname=:name"), name=ident) + "SELECT datname FROM pg_database WHERE datname=:name" + ), + {'name': ident}, ) + ) def _close_out_database_users(self, conn, ident): """Attempt to guarantee a database can be dropped. @@ -630,7 +632,9 @@ class PostgresqlBackendImpl(BackendImpl): "WHERE usename=current_user AND " "pid != pg_backend_pid() AND " "datname=:dname" - ), dname=ident) + ), + {'dname': ident}, + ) def _random_ident(): diff --git a/oslo_db/sqlalchemy/utils.py b/oslo_db/sqlalchemy/utils.py index 180b07f..90236d5 100644 --- a/oslo_db/sqlalchemy/utils.py +++ b/oslo_db/sqlalchemy/utils.py @@ -1118,7 +1118,7 @@ def get_non_innodb_tables(connectable, skip_tables=('migrate_version', params['database'] = connectable.engine.url.database query = text(query_str) - noninnodb = connectable.execute(query, **params) + noninnodb = connectable.execute(query, params) return [i[0] for i in noninnodb] diff --git a/oslo_db/tests/fixtures.py b/oslo_db/tests/fixtures.py index 561ebc5..ccecccd 100644 --- a/oslo_db/tests/fixtures.py +++ b/oslo_db/tests/fixtures.py @@ -54,11 +54,6 @@ class WarningsFixture(fixtures.Fixture): warnings.filterwarnings( 'once', - message=r'The connection.execute\(\) method in SQLAlchemy 2.0 .*', - category=sqla_exc.SADeprecationWarning) - - warnings.filterwarnings( - 'once', message=r'Calling the mapper\(\) function directly outside .*', category=sqla_exc.SADeprecationWarning) diff --git a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py index 003a49a..45539c5 100644 --- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py +++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py @@ -324,8 +324,7 @@ class MySQLModeTestCase(db_test_base._MySQLOpportunisticTestCase): def _test_string_too_long(self, value): with self.connection.begin(): - self.connection.execute(self.test_table.insert(), - bar=value) + self.connection.execute(self.test_table.insert(), {'bar': value}) result = self.connection.execute(self.test_table.select()) return result.fetchone().bar |