FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(db_api): update parse_util output for homogeneous statements by HemangChothani · Pull Request #233 · googleapis/python-spanner · GitHub

This repository was archived by the owner on Jun 8, 2026. It is now read-only.
/ python-spanner Public archive

fix(db_api): update parse_util output for homogeneous statements #233

Merged
larkee merged 1 commit into from
Feb 18, 2021
Conversation 6 Commits 1 Checks 0 Files changed
Merged

fix(db_api): update parse_util output for homogeneous statements #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
16 changes: 6 additions & 10 deletions google/cloud/spanner_dbapi/parse_utils.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -306,19 +306,15 @@ 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 {"sql_params_list": sql_params_list}
return {
"homogenous": True,
"table": match.group("table_name"),
"columns": columns,
"values": rows_list,
}

larkee Feb 15, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Is this a breaking change?

HemangChothani Feb 15, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Nope i think.

larkee Feb 15, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Oh, I see. The docstring correctly documents this behavior. In that case, I don't think this is a breaking change since it is fixing it to match the documented behavior.

# Case d)
# insert_sql is of the form:
Expand Down
19 changes: 19 additions & 0 deletions tests/unit/spanner_dbapi/test_connection.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,25 @@ def test_run_statement_dont_remember_retried_statements(self):

self.assertEqual(len(connection._statements), 0)

def test_run_statement_w_homogeneous_insert_statements(self):
"""Check that Connection executed homogeneous insert statements."""
from google.cloud.spanner_dbapi.checksum import ResultsChecksum
from google.cloud.spanner_dbapi.cursor import Statement

sql = "INSERT INTO T (f1, f2) VALUES (%s, %s), (%s, %s)"
params = ["a", "b", "c", "d"]
param_types = {"f1": str, "f2": str}

connection = self._make_connection()

statement = Statement(sql, params, param_types, ResultsChecksum(), True)
with mock.patch(
"google.cloud.spanner_dbapi.connection.Connection.transaction_checkout"
):
connection.run_statement(statement, retried=True)

self.assertEqual(len(connection._statements), 0)

def test_clear_statements_on_commit(self):
"""
Check that all the saved statements are
Expand Down
48 changes: 17 additions & 31 deletions tests/unit/spanner_dbapi/test_parse_utils.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -72,32 +72,20 @@ def test_parse_insert(self):
"INSERT INTO django_migrations (app, name, applied) VALUES (%s, %s, %s)",
[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),
),
]
"homogenous": True,
"table": "django_migrations",
"columns": ["app", "name", "applied"],
"values": [(1, 2, 3), (4, 5, 6)],
},
),
(
"INSERT INTO django_migrations(app, name, applied) VALUES (%s, %s, %s)",
[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),
),
]
"homogenous": True,
"table": "django_migrations",
"columns": ["app", "name", "applied"],
"values": [(1, 2, 3), (4, 5, 6)],
},
),
(
Expand All @@ -118,25 +106,23 @@ 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),
{
"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)),
]
"homogenous": True,
"table": "ap",
"columns": ["n", "ct", "cn"],
"values": [(1, 2, 3), (4, 5, 6), (7, 8, 9)],
},
),
(
"INSERT INTO `no` (`yes`) VALUES (%s)",
(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,)),
]
"homogenous": True,
"table": "`no`",
"columns": ["yes"],
"values": [(1,), (4,), (5,)],
},
),
(
Expand Down
Back | FazBrowse Home | New Git URL