fix(paramstyle): resolve issue with pyformat

Author: Brooke-white

redshift_connector/core.py

@@ -148,7 +148,7 @@
 # in order to be identified by database
 # example: INSERT INTO book (title) VALUES (:title) -> INSERT INTO book (title) VALUES ($1)
 # also return the function: make_args()
-def convert_paramstyle(style: str, query, args) -> typing.Tuple[str, typing.Any]:
+def convert_paramstyle(style: str, query) -> typing.Tuple[str, typing.Any]:
     # I don't see any way to avoid scanning the query string char by char,
     # so we might as well take that careful approach and create a
     # state-based scanner.  We'll use int variables for the state.
@@ -274,11 +274,16 @@ def convert_paramstyle(style: str, query, args) -> typing.Tuple[str, typing.Any]
         prev_c = c
 
     if style in ("numeric", "qmark", "format"):
-        vals = args
+
+        def make_args(vals):
+            return vals
+
     else:
-        vals = tuple(args[p] for p in placeholders)
 
-    return "".join(output_query), vals
+        def make_args(vals):
+            return tuple(vals[p] for p in placeholders)
+
+    return "".join(output_query), make_args
 
 
 # Message codes
@@ -1110,11 +1115,9 @@ def execute(self: "Connection", cursor: Cursor, operation: str, vals) -> None:
         try:
             statement, make_args = cache["statement"][operation]
         except KeyError:
-            statement, make_args = cache["statement"][operation] = convert_paramstyle(
-                cursor.paramstyle, operation, vals
-            )
+            statement, make_args = cache["statement"][operation] = convert_paramstyle(cursor.paramstyle, operation)
 
-        args = vals
+        args = make_args(vals)
         # change the args to the format that the DB will identify
         # take reference from self.py_types
         params = self.make_params(args)

redshift_connector/cursor.py

@@ -245,7 +245,8 @@ def callproc(self, procname, parameters=None):
         from redshift_connector.core import convert_paramstyle
 
         try:
-            statement, vals = convert_paramstyle("format", operation, args)
+            statement, make_args = convert_paramstyle("format", operation)
+            vals = make_args(args)
             self.execute(statement, vals)
 
         except AttributeError as e: