normalize execute style for events, 2.0

The _execute_20 and exec_driver_sql methods should wrap
up the parameters so that they represent the single list / single
dictionary style of invocation into the legacy methods.  then
the before_ after_ execute event handlers should be receiving
the parameter dictionary as a single dictionary.   this requires
that we break out distill_params to work differently if event
handlers are present.

additionally, add deprecation warnings for old argument passing
styles.

Change-Id: I97cb4d06adfcc6b889f10d01cc7775925cffb116

1 files changed, 12 insertions, 8 deletions

diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 7717a2526..0c58fa9d7 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -2855,7 +2855,11 @@ class PGDialect(default.DefaultDialect):
                 "JOIN pg_namespace n ON n.oid = c.relnamespace "
                 "WHERE n.nspname = :schema AND c.relkind in ('r', 'p')"
             ).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]
 
@@ -2970,7 +2974,7 @@ class PGDialect(default.DefaultDialect):
             .bindparams(sql.bindparam("table_oid", type_=sqltypes.Integer))
             .columns(attname=sqltypes.Unicode, default=sqltypes.Unicode)
         )
-        c = connection.execute(s, table_oid=table_oid)
+        c = connection.execute(s, dict(table_oid=table_oid))
         rows = c.fetchall()
 
         # dictionary with (name, ) if default search path or (schema, name)
@@ -3212,7 +3216,7 @@ class PGDialect(default.DefaultDialect):
                 ORDER BY k.ord
             """
         t = sql.text(PK_SQL).columns(attname=sqltypes.Unicode)
-        c = connection.execute(t, table_oid=table_oid)
+        c = connection.execute(t, dict(table_oid=table_oid))
         cols = [r[0] for r in c.fetchall()]
 
         PK_CONS_SQL = """
@@ -3222,7 +3226,7 @@ class PGDialect(default.DefaultDialect):
            ORDER BY 1
         """
         t = sql.text(PK_CONS_SQL).columns(conname=sqltypes.Unicode)
-        c = connection.execute(t, table_oid=table_oid)
+        c = connection.execute(t, dict(table_oid=table_oid))
         name = c.scalar()
 
         return {"constrained_columns": cols, "name": name}
@@ -3270,7 +3274,7 @@ class PGDialect(default.DefaultDialect):
         t = sql.text(FK_SQL).columns(
             conname=sqltypes.Unicode, condef=sqltypes.Unicode
         )
-        c = connection.execute(t, table=table_oid)
+        c = connection.execute(t, dict(table=table_oid))
         fkeys = []
         for conname, condef, conschema in c.fetchall():
             m = re.search(FK_REGEX, condef).groups()
@@ -3442,7 +3446,7 @@ class PGDialect(default.DefaultDialect):
         t = sql.text(IDX_SQL).columns(
             relname=sqltypes.Unicode, attname=sqltypes.Unicode
         )
-        c = connection.execute(t, table_oid=table_oid)
+        c = connection.execute(t, dict(table_oid=table_oid))
 
         indexes = defaultdict(lambda: defaultdict(dict))
 
@@ -3584,7 +3588,7 @@ class PGDialect(default.DefaultDialect):
         """
 
         t = sql.text(UNIQUE_SQL).columns(col_name=sqltypes.Unicode)
-        c = connection.execute(t, table_oid=table_oid)
+        c = connection.execute(t, dict(table_oid=table_oid))
 
         uniques = defaultdict(lambda: defaultdict(dict))
         for row in c.fetchall():
@@ -3635,7 +3639,7 @@ class PGDialect(default.DefaultDialect):
                 cons.contype = 'c'
         """
 
-        c = connection.execute(sql.text(CHECK_SQL), table_oid=table_oid)
+        c = connection.execute(sql.text(CHECK_SQL), dict(table_oid=table_oid))
 
         ret = []
         for name, src in c: