dbapi2 patching: do respect with statement on cursor objects #17
Conversation
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
Some database backends (including already-supported `django` and not-yet-supported `psycopg2`) implement non-standard ability to use cursor in `with` statement like this:
conn = get_db_connection()
with conn.cursor() as cur:
cur.execute('MY QUERY')
This syntax will automatically close cursor when leaving `with` statement.
The problem is that `Cursor.__enter__` returns `self`, thus dropping our `XRayTracedCursor` wrapper.
This PR aims to fix that issue by wrapping `__enter__` as well. If connection's `__enter__` returned itself then we return wrapper instead, else we return what cursor returned for compatibility.
Probably something similar should also be implemented for `Connection.__enter__` because some backends support it as well (including `sqlite3`).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some database backends (including already-supported
djangoand not-yet-supportedpsycopg2) implement non-standard ability to use cursor inwithstatement like this:This syntax will automatically close cursor when leaving
withstatement.The problem is that
Cursor.__enter__returnsself, thus dropping ourXRayTracedCursorwrapper.This PR aims to fix that issue by wrapping
__enter__as well. If connection's__enter__returned itself then we return wrapper instead, else we return what cursor returned for compatibility.Probably something similar should also be implemented for
Connection.__enter__because some backends support it as well (includingsqlite3).