update execute() arg formats in modules and tests

continuing with producing a SQLAlchemy 1.4.0b2 that internally
does not emit any of its own 2.0 deprecation warnings,
migrate the *args and **kwargs passed to execute() methods
that now must be a single list or dictionary.

Alembic 1.5 is again waiting on this internal consistency to
be present so that it can pass all tests with no 2.0
deprecation warnings.

Change-Id: If6b792e57c8c5dff205419644ab68e631575a2fa

2 files changed, 12 insertions, 4 deletions

diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 735990a20..7a898cb8a 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -3335,7 +3335,11 @@ class PGDialect(default.DefaultDialect):
                 "WHERE n.nspname = :schema AND c.relkind IN (%s)"
                 % (", ".join("'%s'" % elem for elem in kinds))
             ).columns(relname=sqltypes.Unicode),
-            schema=schema if schema is not None else self.default_schema_name,
+            dict(
+                schema=schema
+                if schema is not None
+                else self.default_schema_name
+            ),
         )
         return [name for name, in result]
 
@@ -3367,8 +3371,12 @@ class PGDialect(default.DefaultDialect):
                 "WHERE n.nspname = :schema AND c.relname = :view_name "
                 "AND c.relkind IN ('v', 'm')"
             ).columns(view_def=sqltypes.Unicode),
-            schema=schema if schema is not None else self.default_schema_name,
-            view_name=view_name,
+            dict(
+                schema=schema
+                if schema is not None
+                else self.default_schema_name,
+                view_name=view_name,
+            ),
         )
         return view_def
 
diff --git a/lib/sqlalchemy/dialects/postgresql/provision.py b/lib/sqlalchemy/dialects/postgresql/provision.py
index 70c390800..9196337ba 100644
--- a/lib/sqlalchemy/dialects/postgresql/provision.py
+++ b/lib/sqlalchemy/dialects/postgresql/provision.py
@@ -62,7 +62,7 @@ def _pg_drop_db(cfg, eng, ident):
                     "where usename=current_user and pid != pg_backend_pid() "
                     "and datname=:dname"
                 ),
-                dname=ident,
+                dict(dname=ident),
             )
             conn.exec_driver_sql("DROP DATABASE %s" % ident)