8000 bpo-45138: Expand traced SQL statements in `sqlite3` trace callback by erlend-aasland · Pull Request #28240 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content
< 8000 div id="partial-discussion-header" class="gh-header mb-3 js-details-container Details js-socket-channel js-updatable-content pull request js-pull-header-details" data-channel="eyJjIjoicHVsbF9yZXF1ZXN0OjcyOTY5NTEzNiIsInQiOjE3NTI1MzkwNTd9--8b3d785a08ecd481e71b7e44dbedc9f5e441c88b48478cfce29bf7bb177a0f6d" data-url="/python/cpython/pull/28240/partials/title?sticky=false" data-channel-event-name="title_updated" data-pull-is-open="false" data-gid="MDExOlB1bGxSZXF1ZXN0NzI5Njk1MTM2">

bpo-45138: Expand traced SQL statements in sqlite3 trace callback #28240

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.

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

Merged
merged 28 commits into from
Mar 9, 2022
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a018384
Use expanded SQL when tracing using v2 API
Sep 1, 2021
0d59fd9
Fall back to unexpanded sql if expanded sql is too long
Sep 8, 2021
654b89f
Remove unneeded indent
Sep 8, 2021
d7dcbd4
Add NEWS
Sep 8, 2021
bc71d99
Revert spurious print traceback change
Sep 8, 2021
e22f58d
Merge branch 'main' into sqlite-bound-trace
Sep 14, 2021
d603841
Merge branch 'main' into sqlite-bound-trace
Sep 15, 2021
b3c7cd7
Merge branch 'main' into sqlite-bound-trace
Oct 6, 2021
b91fc81
Chain exceptions if multiple exceptions happen
Oct 6, 2021
3fa1dfa
Merge branch 'main' into sqlite-bound-trace
Oct 19, 2021
bc1ac3a
Merge branch 'main' into sqlite-bound-trace
Nov 1, 2021
5683a9a
Merge branch 'main' into sqlite-bound-trace
Nov 2, 2021
7e8d2be
Merge branch 'main' into sqlite-bound-trace
Nov 3, 2021
ec19cf7
Improve coverage
Nov 3, 2021
b3940df
Merge branch 'main' into sqlite-bound-trace
Nov 10, 2021
f773a85
Expand test
Nov 10, 2021
a83a945
We can't rely on sqlite_schema being present
Nov 10, 2021
fae8d98
Merge branch 'main' into sqlite-bound-trace
Nov 29, 2021
b016c0c
Adapt tests to new decorator
Nov 29, 2021
391c698
Address review
Nov 29, 2021
8c5faad
Merge branch 'main' into sqlite-bound-trace
Jan 4, 2022
a1c1424
Merge branch 'main' into sqlite-bound-trace
Jan 18, 2022
6ea2605
Merge branch 'main' into sqlite-bound-trace
Jan 20, 2022
24ef8a9
Merge branch 'main' into sqlite-bound-trace
Jan 22, 2022
4d9c9ec
Merge branch 'main' into sqlite-bound-trace
Feb 26, 2022
beff1d5
Update Lib/test/test_sqlite3/test_hooks.py
Mar 3, 2022
9920131
PEP 8
Mar 3, 2022
f086604
Address review: clean up namespace
Mar 3, 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
Prev Previous commit
Address review: clean up namespace
  • Loading branch information
Erlend E. Aasland committed Mar 3, 2022
commit f086604a0f2c12f91877fc9f8e1ca11e57c5577c
27 changes: 13 additions & 14 deletions Lib/test/test_sqlite3/test_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,6 @@
from test.test_sqlite3.test_userfunctions import with_tracebacks


@contextlib.contextmanager
def check_stmt_trace(self, cx, expected):
try:
traced = []
cx.set_trace_callback(traced.append)
yield
finally:
self.assertEqual(traced, expected)
cx.set_trace_callback(None)


class CollationTests(unittest.TestCase):
def test_create_collation_not_string(self):
con = sqlite.connect(":memory:")
Expand Down Expand Up @@ -239,6 +228,16 @@ def bad_progress():


class TraceCallbackTests(unittest.TestCase):
@contextlib.contextmanager
def check_stmt_trace(self, cx, expected):
try:
traced = []
cx.set_trace_callback(lambda stmt: traced.append(stmt))
yield
finally:
self.assertEqual(traced, expected)
cx.set_trace_callback(None)

def test_trace_callback_used(self):
"""
Test that the trace callback is invoked once it is set.
Expand Down Expand Up @@ -315,7 +314,7 @@ def test_trace_expanded_sql(self):
"insert into t values(2)",
"COMMIT",
]
with memory_database() as cx, check_stmt_trace(self, cx, expected):
with memory_database() as cx, self.check_stmt_trace(cx, expected):
with cx:
cx.execute("create table t(t)")
cx.executemany("insert into t values(?)", ((v,) for v in range(3)))
Expand All @@ -336,11 +335,11 @@ def test_trace_too_much_expanded_sql(self):
bad_param = "a" * (nextra + 1)

unexpanded_query = template + "?"
with check_stmt_trace(self, cx, [unexpanded_query]):
with self.check_stmt_trace(cx, [unexpanded_query]):
cx.execute(unexpanded_query, (bad_param,))

expanded_query = f"{template}'{ok_param}'"
with check_stmt_trace(self, cx, [expanded_query]):
with self.check_stmt_trace(cx, [expanded_query]):
cx.execute(unexpanded_query, (ok_param,))

@with_tracebacks(ZeroDivisionError, regex="division by zero")
Expand Down
0