Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: don't reset attributes of non-Spanner connections #222

Merged
merged 2 commits into from
Jun 20, 2022
Merged

fix: don't reset attributes of non-Spanner connections #222

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b1bd83
fix: don't reset attributes of non-Spanner connections
IlyaFaer Jun 17, 2022
6ad0acf
Merge branch 'main' into connections_reset
IlyaFaer Jun 17, 2022
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
10 changes: 5 additions & 5 deletions google/cloud/sqlalchemy_spanner/sqlalchemy_spanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@
@listens_for(Pool, "reset")
def reset_connection(dbapi_conn, connection_record):
"""An event of returning a connection back to a pool."""
if dbapi_conn.connection.inside_transaction:
dbapi_conn.connection.rollback()
if isinstance(dbapi_conn.connection, spanner_dbapi.Connection):
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Resetting attributes only in case it's a Spanner connection. Otherwise doing rollback(), which is the default behavior of the resetting method.

if dbapi_conn.connection.inside_transaction:
dbapi_conn.connection.rollback()

if getattr(dbapi_conn.connection, "staleness", None) is not None:
dbapi_conn.connection.staleness = None

if getattr(dbapi_conn.connection, "read_only", None) is not None:
dbapi_conn.connection.read_only = False
else:
dbapi_conn.connection.rollback()


# register a method to get a single value of a JSON object
Expand Down