VladPolskiy/mariadb-connector-python
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-python.git synced 2025-07-24 09:59:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle dicts in check_text_params

Browse Source
This commit is contained in:
Georg Richter
2023-04-17 10:26:33 +02:00
parent b0366fa108
commit 9aedf1c0f8
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mariadb/cursors.py
View File

@ -296,7 +296,7 @@ class Cursor(mariadb._mariadb.cursor):
# if one of the provided parameters has byte or datetime value, # if one of the provided parameters has byte or datetime value,
# we don't use text protocol # we don't use text protocol
if self._check_text_types() == True: if data and self._check_text_types() == True:
self._text = False self._text = False
if self._text: if self._text:

32
mariadb/mariadb_cursor.c
View File

@ -653,18 +653,20 @@ PyObject *MrdbCursor_InitResultSet(MrdbCursor *self)
self->result= NULL; self->result= NULL;
} }
if (Mrdb_GetFieldInfo(self))
return NULL;
if (!(self->values= (PyObject**)PyMem_RawCalloc(self->field_count, sizeof(PyObject *))))
return NULL;
if (!self->parseinfo.is_text)
mysql_stmt_attr_set(self->stmt, STMT_ATTR_CB_RESULT, field_fetch_callback);
if (self->field_count) if (self->field_count)
{ {
self->row_count= CURSOR_NUM_ROWS(self); if (Mrdb_GetFieldInfo(self))
self->affected_rows= 0; {
return NULL;
}
if (!(self->values= (PyObject**)PyMem_RawCalloc(self->field_count, sizeof(PyObject *))))
return NULL;
if (!self->parseinfo.is_text)
mysql_stmt_attr_set(self->stmt, STMT_ATTR_CB_RESULT, field_fetch_callback);
self->row_count= CURSOR_NUM_ROWS(self);
self->affected_rows= 0;
} else { } else {
self->row_count= self->affected_rows= CURSOR_AFFECTED_ROWS(self); self->row_count= self->affected_rows= CURSOR_AFFECTED_ROWS(self);
} }
@ -1284,6 +1286,7 @@ static PyObject *
MrdbCursor_check_text_types(MrdbCursor *self) MrdbCursor_check_text_types(MrdbCursor *self)
{ {
PyDateTime_IMPORT; PyDateTime_IMPORT;
Py_ssize_t ofs= 0;
if (!self || !self->data || !self->parseinfo.paramcount) if (!self || !self->data || !self->parseinfo.paramcount)
{ {
@ -1292,7 +1295,14 @@ MrdbCursor_check_text_types(MrdbCursor *self)
for (uint32_t i= 0; i < self->parseinfo.paramcount; i++) for (uint32_t i= 0; i < self->parseinfo.paramcount; i++)
{ {
PyObject *obj= ListOrTuple_GetItem(self->data, i); PyObject *obj;
if (PyDict_Check(self->data))
{
PyDict_Next(self->data, &ofs, NULL, &obj);
}
else
obj= ListOrTuple_GetItem(self->data, i);
if (PyBytes_Check(obj) || if (PyBytes_Check(obj) ||
PyByteArray_Check(obj) || PyByteArray_Check(obj) ||
PyDate_Check(obj)) PyDate_Check(obj))