fix: revert googleapis#233

MaxxleLLC · Mar 22, 2021 · 21a82cb · 21a82cb
1 parent e990ff7
commit 21a82cb
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 23 deletions.
diff --git a/google/cloud/spanner_dbapi/parse_utils.py b/google/cloud/spanner_dbapi/parse_utils.py
@@ -306,15 +306,19 @@ def parse_insert(insert_sql, params):
         # Case c)
 
         columns = [mi.strip(" `") for mi in match.group("columns").split(",")]
+        sql_params_list = []
+        insert_sql_preamble = "INSERT INTO %s (%s) VALUES %s" % (
+            match.group("table_name"),
+            match.group("columns"),
+            values.argv[0],
+        )
         values_pyformat = [str(arg) for arg in values.argv]
         rows_list = rows_for_insert_or_update(columns, params, values_pyformat)
+        insert_sql_preamble = sanitize_literals_for_upload(insert_sql_preamble)
+        for row in rows_list:
+            sql_params_list.append((insert_sql_preamble, row))
 
-        return {
-            "homogenous": True,
-            "table": match.group("table_name"),
-            "columns": columns,
-            "values": rows_list,
-        }
+        return {"sql_params_list": sql_params_list}
 
     # Case d)
     # insert_sql is of the form:

diff --git a/tests/unit/spanner_dbapi/test_parse_utils.py b/tests/unit/spanner_dbapi/test_parse_utils.py
@@ -72,20 +72,32 @@ def test_parse_insert(self):
                 "INSERT INTO django_migrations (app, name, applied) VALUES (%s, %s, %s)",
                 [1, 2, 3, 4, 5, 6],
                 {
-                    "homogenous": True,
-                    "table": "django_migrations",
-                    "columns": ["app", "name", "applied"],
-                    "values": [(1, 2, 3), (4, 5, 6)],
+                    "sql_params_list": [
+                        (
+                            "INSERT INTO django_migrations (app, name, applied) VALUES (%s, %s, %s)",
+                            (1, 2, 3),
+                        ),
+                        (
+                            "INSERT INTO django_migrations (app, name, applied) VALUES (%s, %s, %s)",
+                            (4, 5, 6),
+                        ),
+                    ]
                 },
             ),
             (
                 "INSERT INTO django_migrations(app, name, applied) VALUES (%s, %s, %s)",
                 [1, 2, 3, 4, 5, 6],
                 {
-                    "homogenous": True,
-                    "table": "django_migrations",
-                    "columns": ["app", "name", "applied"],
-                    "values": [(1, 2, 3), (4, 5, 6)],
+                    "sql_params_list": [
+                        (
+                            "INSERT INTO django_migrations (app, name, applied) VALUES (%s, %s, %s)",
+                            (1, 2, 3),
+                        ),
+                        (
+                            "INSERT INTO django_migrations (app, name, applied) VALUES (%s, %s, %s)",
+                            (4, 5, 6),
+                        ),
+                    ]
                 },
             ),
             (
@@ -106,23 +118,25 @@ def test_parse_insert(self):
             ),
             (
                 "INSERT INTO ap (n, ct, cn) "
-                "VALUES (%s, %s, %s), (%s, %s, %s), (%s, %s, %s),(%s,%s, %s)",
+                "VALUES (%s, %s, %s), (%s, %s, %s), (%s, %s, %s),(%s,      %s, %s)",
                 (1, 2, 3, 4, 5, 6, 7, 8, 9),
                 {
-                    "homogenous": True,
-                    "table": "ap",
-                    "columns": ["n", "ct", "cn"],
-                    "values": [(1, 2, 3), (4, 5, 6), (7, 8, 9)],
+                    "sql_params_list": [
+                        ("INSERT INTO ap (n, ct, cn) VALUES (%s, %s, %s)", (1, 2, 3)),
+                        ("INSERT INTO ap (n, ct, cn) VALUES (%s, %s, %s)", (4, 5, 6)),
+                        ("INSERT INTO ap (n, ct, cn) VALUES (%s, %s, %s)", (7, 8, 9)),
+                    ]
                 },
             ),
             (
                 "INSERT INTO `no` (`yes`) VALUES (%s)",
                 (1, 4, 5),
                 {
-                    "homogenous": True,
-                    "table": "`no`",
-                    "columns": ["yes"],
-                    "values": [(1,), (4,), (5,)],
+                    "sql_params_list": [
+                        ("INSERT INTO `no` (`yes`) VALUES (%s)", (1,)),
+                        ("INSERT INTO `no` (`yes`) VALUES (%s)", (4,)),
+                        ("INSERT INTO `no` (`yes`) VALUES (%s)", (5,)),
+                    ]
                 },
             ),
             (