8000 Fix `run_in_transaction` return value docs · wchargin/google-cloud-python@b3b238e · GitHub
[go: up one dir, main page]

Skip to content

Commit b3b238e

Browse files
committed
Fix run_in_transaction return value docs
Summary: These docs used to be correct, but `Session.run_in_transaction` was changed from returning the commit timestamp to returning the function value in googleapis#3753, and the upstream docs were not updated. The docs for `run_in_transaction` are now identical across `Database` and `Session`. The tests for `run_in_transaction` (in `test_database.py`) are wrong, as they mock out the session object instead of using a real session, and they also were not updated in googleapis#3753. This change does not fix them. Test Plan: ``` $ virtualenv -q -p python3.6 ./ve $ . ./ve/bin/activate (ve) $ pip install -q google-cloud-spanner==1.10.0 (ve) $ pip freeze | grep google-cloud-spanner google-cloud-spanner==1.10.0 (ve) $ cat test.py; echo from google.cloud import spanner_v1 client = spanner_v1.Client() instance = client.instance("my-instance-name") database = instance.database("my-database-name") result = database.run_in_transaction(lambda txn: "ahoy") print(result) (ve) $ python test.py ahoy ``` wchargin-branch: run-in-transaction-rval
1 parent 9023477 commit b3b238e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

spanner/google/cloud/spanner_v1/database.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,11 @@ def run_in_transaction(self, func, *args, **kw):
420420
If passed, "timeout_secs" will be removed and used to
421421
override the default timeout.
422422
423-
:rtype: :class:`datetime.datetime`
424-
:returns: timestamp of committed transaction
423+
:rtype: Any
424+
:returns: The return value of ``func``.
425+
426+
:raises Exception:
427+
reraises any non-ABORT execptions raised by ``func``.
425428
"""
426429
# Sanity check: Is there a transaction already running?
427430
# If there is, then raise a red flag. Otherwise, mark that this one

0 commit comments

Comments
 (0)
0