python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-15 11:10:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Check for module initialization failure (extremely rare)

Browse Source 
* The MySQL FIELD_TYPE converter can now be a sequence of 2-tuples.
   Item 0 is a bit mask (using FLAG.*) which must be matched. This should
   be an integer. Item 1 is the conversion function. If item 0 is not an
   integer, then this function is considered the default converter for
   this FIELD_TYPE. Note that these tuples are considered when the query
   has been executed and the result is available, so it doesn't add a
   per-row overhead.

 * As a result of the above, BINARY BLOB fields are now returned as
   character arrays using the array.array class. Non-BINARY BLOB fields
   (i.e. TEXT) are returned as strings. If unicode is enabled, they are
   returned as unicode strings.

 * Bump version to 0.9.3b3.
This commit is contained in:
adustman
2003-12-30 01:30:36 +00:00
parent 37481774b1
commit 59913d32f4
5 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
MySQLdb/_mysql.c
View File

@ -1,4 +1,4 @@
#define version_info "(0,9,3,'beta',2)"
#define version_info "(0,9,3,'beta',3)"
#define __version__ "0.9.3"
/*
This program is free software; you can redistribute it and/or modify
@ -362,6 +362,38 @@ _mysql_ResultObject_Initialize(
fun = Py_None;
Py_INCREF(Py_None);
}
if (PySequence_Check(fun)) {
int j, n2=PySequence_Size(fun);
PyObject *fun2=NULL;
for (j=0; j<n2; j++) {
PyObject *t = PySequence_GetItem(fun, j);
if (!t) continue;
if (!PyTuple_Check(t)) goto cleanup;
if (PyTuple_GET_SIZE(t) == 2) {
long mask;
PyObject *pmask=NULL;
pmask = PyTuple_GET_ITEM(t, 0);
fun2 = PyTuple_GET_ITEM(t, 1);
if (PyInt_Check(pmask)) {
mask = PyInt_AS_LONG(pmask);
if (mask & fields[i].flags) {
break;
}
else {
continue;
}
} else {
break;
}
}
cleanup:
Py_DECREF(t);
}
if (!fun2) fun2 = Py_None;
Py_INCREF(fun2);
Py_DECREF(fun);
fun = fun2;
}
PyTuple_SET_ITEM(self->converter, i, fun);
}
return 0;
@ -2370,7 +2402,7 @@ init_mysql(void)
PyObject *dict, *module, *emod, *edict;
module = Py_InitModule4("_mysql", _mysql_methods, _mysql___doc__,
(PyObject *)NULL, PYTHON_API_VERSION);
if (!module) return; /* this really should never happen */
_mysql_ConnectionObject_Type.ob_type = &PyType_Type;
_mysql_ResultObject_Type.ob_type = &PyType_Type;
#if PY_VERSION_HEX >= 0x02020000