Skip to content

Commit

Permalink
gh-118928: sqlite3: disallow sequences of params with named placehold…
Browse files Browse the repository at this point in the history
…ers (#118929)

Follow-up of gh-101693. The previous DeprecationWarning is replaced with 
raising sqlite3.ProgrammingError.

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
  • Loading branch information
erlend-aasland and hugovk committed May 14, 2024
1 parent 7a97ee5 commit d8e0e00
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
5 changes: 5 additions & 0 deletions Doc/whatsnew/3.14.rst
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ sqlite3
* Remove :data:`!version` and :data:`!version_info` from :mod:`sqlite3`.
(Contributed by Hugo van Kemenade in :gh:`118924`.)

* Disallow using a sequence of parameters with named placeholders.
This had previously raised a :exc:`DeprecationWarning` since Python 3.12;
it will now raise a :exc:`sqlite3.ProgrammingError`.
(Contributed by Erlend E. Aasland in :gh:`118928` and :gh:`101693`.)

typing
------

Expand Down
3 changes: 1 addition & 2 deletions Lib/test/test_sqlite3/test_dbapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -878,9 +878,8 @@ def test_execute_named_param_and_sequence(self):
msg = "Binding.*is a named parameter"
for query, params in dataset:
with self.subTest(query=query, params=params):
with self.assertWarnsRegex(DeprecationWarning, msg) as cm:
with self.assertRaisesRegex(sqlite.ProgrammingError, msg) as cm:
self.cu.execute(query, params)
self.assertEqual(cm.filename, __file__)

def test_execute_indexed_nameless_params(self):
# See gh-117995: "'?1' is considered a named placeholder"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Disallow using a sequence of parameters with named placeholders in
:mod:`sqlite3` queries. Patch by Erlend E. Aasland.
8 changes: 2 additions & 6 deletions Modules/_sqlite/cursor.c
Original file line number Diff line number Diff line change
Expand Up @@ -670,15 +670,11 @@ bind_parameters(pysqlite_state *state, pysqlite_Statement *self,
for (i = 0; i < num_params; i++) {
const char *name = sqlite3_bind_parameter_name(self->st, i+1);
if (name != NULL && name[0] != '?') {
int ret = PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
PyErr_Format(state->ProgrammingError,
"Binding %d ('%s') is a named parameter, but you "
"supplied a sequence which requires nameless (qmark) "
"placeholders. Starting with Python 3.14 an "
"sqlite3.ProgrammingError will be raised.",
"placeholders.",
i+1, name);
if (ret < 0) {
return;
}
}

if (PyTuple_CheckExact(parameters)) {
Expand Down

0 comments on commit d8e0e00

Please sign in to comment.