Skip to content

bpo-45243: Add support for setting/getting sqlite3 connection limits #28463

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

Merged
pablogsal merged 16 commits into from
Nov 1, 2021
Merged

bpo-45243: Add support for setting/getting sqlite3 connection limits #28463

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
39d69ce
bpo-45243: Add support for setting/getting sqlite3 connection limits
Sep 19, 2021
6fd1c74
Add docs
Sep 19, 2021
3514179
Add NEWS
Sep 19, 2021
c5abeb0
Add What's New
Sep 19, 2021
76d2c2b
SQLITE_LIMIT_WORKER_THREADS appeared in SQLite 3.8.7
Sep 19, 2021
2373a95
Merge branch 'main' into sqlite-limits
Oct 6, 2021
a51f286
Remove debug print
Oct 7, 2021
e093a99
Raise ProgrammingError if limit is out of bounds
Oct 7, 2021
fced0ce
SQLITE_LIMIT_WORKER_THREADS is defined in SQLite 3.8.7, not 3.8.3
Oct 7, 2021
4f7c2c0
SQLite version is found in sqlite3.sqlite_version_info, not sqlite3.v…
Oct 7, 2021
5e2ae97
Improve argument spec
Oct 8, 2021
1c36d95
Drop 'Non-standard' from docstring
Oct 8, 2021
eb6c233
Expand test suite
Oct 21, 2021
c1d828f
Merge branch 'main' into sqlite-limits
Oct 21, 2021
28b514a
Merge branch 'main' into sqlite-limits
Oct 31, 2021
872f1ef
Merge branch 'main' into sqlite-limits
Nov 1, 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
Prev Previous commit
Next Next commit
Merge branch 'main' into sqlite-limits
  • Loading branch information
Erlend E. Aasland
Erlend E. Aasland committed Oct 31, 2021
commit 28b514a3cb5d71bcce930e2f21d95ae72fa88bc5
27 changes: 14 additions & 13 deletions Modules/_sqlite/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,21 +397,22 @@ add_integer_constants(PyObject *module) {
ADD_INT(SQLITE_RECURSIVE);
#endif
// Run-time limit categories
Comment thread
erlend-aasland marked this conversation as resolved.
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_LENGTH);
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_SQL_LENGTH);
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_COLUMN);
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_EXPR_DEPTH);
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_COMPOUND_SELECT);
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_VDBE_OP);
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_FUNCTION_ARG);
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_ATTACHED);
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_LIKE_PATTERN_LENGTH);
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_VARIABLE_NUMBER);
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_TRIGGER_DEPTH);
ADD_INT(SQLITE_LIMIT_LENGTH);
ADD_INT(SQLITE_LIMIT_SQL_LENGTH);
ADD_INT(SQLITE_LIMIT_COLUMN);
ADD_INT(SQLITE_LIMIT_EXPR_DEPTH);
ADD_INT(SQLITE_LIMIT_COMPOUND_SELECT);
ADD_INT(SQLITE_LIMIT_VDBE_OP);
ADD_INT(SQLITE_LIMIT_FUNCTION_ARG);
ADD_INT(SQLITE_LIMIT_ATTACHED);
ADD_INT(SQLITE_LIMIT_LIKE_PATTERN_LENGTH);
ADD_INT(SQLITE_LIMIT_VARIABLE_NUMBER);
ADD_INT(SQLITE_LIMIT_TRIGGER_DEPTH);
#if SQLITE_VERSION_NUMBER >= 3008007
ret += PyModule_AddIntMacro(module, SQLITE_LIMIT_WORKER_THREADS);
ADD_INT(SQLITE_LIMIT_WORKER_THREADS);
#endif
return ret;
#undef ADD_INT
return 0;
}

struct PyModuleDef _sqlite3module = {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.