mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

gh-89022: Improve sqlite3 exceptions related to binding params and API misuse (#91572)

Browse source 
* Map SQLITE_MISUSE to sqlite3.InterfaceError

SQLITE_MISUSE implies misuse of the SQLite C API, which, if it happens,
is _not_ a user error; it is an sqlite3 extension module error.

* Raise better errors when binding parameters fail.

Instead of always raising InterfaceError, guessing what went wrong,
raise accurate exceptions with more accurate error messages.
This commit is contained in:
Erlend Egeberg Aasland 2022-05-04 07:16:01 -06:00 • committed by GitHub
parent d716a0dfe2
commit 090819ec5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Modules/_sqlite/cursor.c
View file

@ -527,7 +527,8 @@ stmt_step(sqlite3_stmt *statement)
}
static int
bind_param(pysqlite_Statement *self, int pos, PyObject *parameter)
bind_param(pysqlite_state *state, pysqlite_Statement *self, int pos,
PyObject *parameter)
{
int rc = SQLITE_OK;
const char *string;
@ -603,6 +604,9 @@ bind_param(pysqlite_Statement *self, int pos, PyObject *parameter)
break;
}
case TYPE_UNKNOWN:
PyErr_Format(state->ProgrammingError,
"Error binding parameter %d: type '%s' is not supported",
pos, Py_TYPE(parameter)->tp_name);
rc = -1;
}
@ -688,15 +692,15 @@ bind_parameters(pysqlite_state *state, pysqlite_Statement *self,
}
}
rc = bind_param(self, i + 1, adapted);
rc = bind_param(state, self, i + 1, adapted);
Py_DECREF(adapted);
if (rc != SQLITE_OK) {
if (!PyErr_Occurred()) {
PyErr_Format(state->InterfaceError,
"Error binding parameter %d - "
"probably unsupported type.", i);
}
PyObject *exc, *val, *tb;
PyErr_Fetch(&exc, &val, &tb);
sqlite3 *db = sqlite3_db_handle(self->st);
_pysqlite_seterror(state, db);
_PyErr_ChainExceptions(exc, val, tb);
return;
}
}
@ -748,20 +752,21 @@ bind_parameters(pysqlite_state *state, pysqlite_Statement *self,
}
}
rc = bind_param(self, i, adapted);
rc = bind_param(state, self, i, adapted);
Py_DECREF(adapted);
if (rc != SQLITE_OK) {
if (!PyErr_Occurred()) {
PyErr_Format(state->InterfaceError,
"Error binding parameter :%s - "
"probably unsupported type.", binding_name);
}
PyObject *exc, *val, *tb;
PyErr_Fetch(&exc, &val, &tb);
sqlite3 *db = sqlite3_db_handle(self->st);
_pysqlite_seterror(state, db);
_PyErr_ChainExceptions(exc, val, tb);
return;
}
}
} else {
PyErr_SetString(PyExc_ValueError, "parameters are of unsupported type");
PyErr_SetString(state->ProgrammingError,
"parameters are of unsupported type");
}
}

1
Modules/_sqlite/util.c
View file

@ -59,7 +59,6 @@ get_exception_class(pysqlite_state *state, int errorcode)
case SQLITE_MISMATCH:
return state->IntegrityError;
case SQLITE_MISUSE:
return state->ProgrammingError;
case SQLITE_RANGE:
return state->InterfaceError;
default: