Skip to content

bpo-44859: Raise more accurate exceptions in sqlite3 #27695

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
JelleZijlstra merged 16 commits into from
Mar 17, 2022
Merged

bpo-44859: Raise more accurate exceptions in sqlite3 #27695

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0c8a88d
bpo-44859: Raise InterfaceError iso. ProgrammingError for SQLITE_MISUSE
Aug 9, 2021
aa755d2
Don't overwrite BufferErrors when converting to BLOB
Aug 9, 2021
e51d6c1
Raise ProgrammingError if user tries to execute() more than one state…
Aug 9, 2021
452ce40
Raise DataError if query contains null chars
Aug 9, 2021
f9a5dc6
Add NEWS
Aug 9, 2021
b08d507
Merge branch 'main' into sqlite-errors
Aug 30, 2021
ddcab47
Merge branch 'main' into sqlite-errors
Sep 14, 2021
6d5361c
Merge branch 'main' into sqlite-errors
Sep 20, 2021
f2300bd
_pysqlite_set_result() MUST set an exception if it returns -1
Sep 20, 2021
84af2b9
Merge branch 'main' into sqlite-errors
Nov 1, 2021
d06b769
Merge branch 'main' into sqlite-errors
Nov 10, 2021
8eb783e
Merge branch 'main' into sqlite-errors
Feb 26, 2022
d3186be
Adapt GH-27642 tests
Feb 26, 2022
b4a95bd
Address review: add tests for PyObject_GetBuffer failures
Feb 26, 2022
3792cf0
Address reviews
Mar 8, 2022
99c9040
Merge branch 'main' into sqlite-errors
Mar 8, 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
Next Next commit
Don't overwrite BufferErrors when converting to BLOB
  • Loading branch information
Erlend E. Aasland committed Aug 9, 2021
commit aa755d23e3516e842ab99de08db36af4b267a168
2 changes: 0 additions & 2 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,6 @@ _pysqlite_set_result(sqlite3_context* context, PyObject* py_val)
} else if (PyObject_CheckBuffer(py_val)) {
Py_buffer view;
if (PyObject_GetBuffer(py_val, &view, PyBUF_SIMPLE) != 0) {
PyErr_SetString(PyExc_ValueError,
Comment thread
erlend-aasland marked this conversation as resolved.
"could not convert BLOB to buffer");
return -1;
}
if (view.len > INT_MAX) {
Expand Down
1 change: 0 additions & 1 deletion Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObjec
case TYPE_BUFFER: {
Py_buffer view;
if (PyObject_GetBuffer(parameter, &view, PyBUF_SIMPLE) != 0) {
PyErr_SetString(PyExc_ValueError, "could not convert BLOB to buffer");
return -1;
}
if (view.len > INT_MAX) {
Expand Down