Skip to content
This repository was archived by the owner on Jun 8, 2026. It is now read-only.

feat(db_api): raise exception with message for executemany() #595

Merged
IlyaFaer merged 11 commits into from
Nov 16, 2021
Merged

feat(db_api): raise exception with message for executemany() #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3f5c37d
feat(db_api): raise exception with message for executemany()
Sep 28, 2021
962cc47
one more place
Sep 28, 2021
9529b08
fix unit test
Sep 28, 2021
7327bfb
Merge branch 'main' into error_msg
Oct 14, 2021
9625f3a
Merge branch 'main' into error_msg
larkee Oct 14, 2021
08d9e94
Merge branch 'main' into error_msg
Oct 22, 2021
9978c68
Merge branch 'main' into error_msg
Oct 25, 2021
4c84752
Merge branch 'main' into error_msg
Oct 26, 2021
4f86253
Merge branch 'main' into error_msg
Nov 2, 2021
02f30f5
Merge branch 'main' into error_msg
Nov 15, 2021
be73376
Merge branch 'main' into error_msg
larkee Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions google/cloud/spanner_dbapi/cursor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ def _do_batch_update(self, transaction, statements, many_result_set):
many_result_set.add_iter(res)

if status.code == ABORTED:
raise Aborted(status.details)
raise Aborted(status.message)
elif status.code != OK:
raise OperationalError(status.details)
raise OperationalError(status.message)

def execute(self, sql, args=None):
"""Prepares and executes a Spanner database operation.
Expand Down Expand Up @@ -302,9 +302,9 @@ def executemany(self, operation, seq_of_params):

if status.code == ABORTED:
self.connection._transaction = None
raise Aborted(status.details)
raise Aborted(status.message)
elif status.code != OK:
raise OperationalError(status.details)
raise OperationalError(status.message)
break
except Aborted:
self.connection.retry_transaction()
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/spanner_dbapi/test_cursor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ def test_executemany_insert_batch_failed(self):

transaction = mock.Mock(committed=False, rolled_back=False)
transaction.batch_update = mock.Mock(
return_value=(mock.Mock(code=UNKNOWN, details=err_details), [])
return_value=(mock.Mock(code=UNKNOWN, message=err_details), [])
)

with mock.patch(
Expand Down