psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-13 12:36:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

callproc: now more compliant with local coding standards.

Browse Source
This commit is contained in:
mrmilosz 2014-05-29 04:31:43 -04:00
parent e9bb4a86f9
commit 3948e909e4
1 changed files with 102 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
psycopg/cursor_type.c
View File

@ -1024,17 +1024,18 @@ psyco_curs_callproc(cursorObject *self, PyObject *args)
PyObject *parameters = Py_None; PyObject *parameters = Py_None;
PyObject *operation = NULL; PyObject *operation = NULL;
PyObject *res = NULL; PyObject *res = NULL;
PyObject *parameter_name = NULL;
PyObject *parameter_name_bytes = NULL;
char *parameter_name_cstr = NULL;
char *parameter_name_cstr_sanitized = NULL;
char **parameter_name_cstr_sanitized_CACHE = NULL;
PyObject *parameter_names = NULL;
if (!PyArg_ParseTuple(args, "s#|O", int using_dict;
&procname, &procname_len, &parameters PyObject *pname = NULL;
)) PyObject *bpname = NULL;
{ goto exit; } PyObject *pnames = NULL;
char *cpname = NULL;
char **scpnames = NULL;
if (!PyArg_ParseTuple(args, "s#|O", &procname, &procname_len,
&parameters)) {
goto exit;
}
EXC_IF_CURS_CLOSED(self); EXC_IF_CURS_CLOSED(self);
EXC_IF_ASYNC_IN_PROGRESS(self, callproc); EXC_IF_ASYNC_IN_PROGRESS(self, callproc);
@ -1042,7 +1043,7 @@ psyco_curs_callproc(cursorObject *self, PyObject *args)
if (self->name != NULL) { if (self->name != NULL) {
psyco_set_error(ProgrammingError, self, psyco_set_error(ProgrammingError, self,
"can't call .callproc() on named cursors"); "can't call .callproc() on named cursors");
goto exit; goto exit;
} }
@ -1050,106 +1051,117 @@ psyco_curs_callproc(cursorObject *self, PyObject *args)
if (-1 == (nparameters = PyObject_Length(parameters))) { goto exit; } if (-1 == (nparameters = PyObject_Length(parameters))) { goto exit; }
} }
/* allocate some memory, build the SQL and create a PyString from it */ using_dict = nparameters > 0 && PyDict_Check(parameters);
/* a dict requires special handling: we put the parameter names into the SQL */ /* A Dict is complicated. The parameter names go into the query */
if (nparameters > 0 && PyDict_Check(parameters)) { if (using_dict) {
if (!(pnames = PyDict_Keys(parameters))) {
parameter_names = PyDict_Keys(parameters); PyErr_SetString(PyExc_RuntimeError,
"built-in 'keys' failed on a Dict!");
/* first we need to ensure the dict's keys are text */ goto exit;
for(i=0; i<nparameters; i++) {
if (!Text_Check(PyList_GetItem(parameter_names, i))) {
PyErr_SetString(PyExc_TypeError, "argument 2 must have only string keys if Dict");
Py_DECREF(parameter_names);
goto exit;
} }
}
/* we need one extra pass to determine the amount of memory to allocate for the SQL */ sl = procname_len + 17 + nparameters * 5 - (nparameters ? 1 : 0);
sl = procname_len + 17 + nparameters*5 - (nparameters ? 1 : 0);
/* we will throw the sanitized C strings into a cache to not redo the work later */ if (!(scpnames = PyMem_New(char *, nparameters))) {
parameter_name_cstr_sanitized_CACHE = PyMem_New(char *, nparameters); PyErr_NoMemory();
goto exit;
if (parameter_name_cstr_sanitized_CACHE == NULL) {
PyErr_NoMemory();
PyMem_Del(parameter_name_cstr_sanitized_CACHE);
Py_DECREF(parameter_names);
goto exit;
}
for(i=0; i<nparameters; i++) {
parameter_name = PyList_GetItem(parameter_names, i);
Py_INCREF(parameter_name);
parameter_name_bytes = psycopg_ensure_bytes(parameter_name);
parameter_name_cstr = Bytes_AsString(parameter_name_bytes);
parameter_name_cstr_sanitized = PQescapeIdentifier(self->conn->pgconn, parameter_name_cstr, strlen(parameter_name_cstr));
Py_DECREF(parameter_name);
/* must add the length of the sanitized string to the length of the SQL string */
sl += strlen(parameter_name_cstr_sanitized);
parameter_name_cstr_sanitized_CACHE[i] = parameter_name_cstr_sanitized;
}
Py_DECREF(parameter_names);
sql = (char*)PyMem_Malloc(sl);
if (sql == NULL) {
PyErr_NoMemory();
for(i=0; i<nparameters; i++) {
PQfreemem(parameter_name_cstr_sanitized_CACHE[i]);
} }
PyMem_Del(parameter_name_cstr_sanitized_CACHE);
goto exit;
}
sprintf(sql, "SELECT * FROM %s(", procname); memset(scpnames, 0, sizeof(char *) * nparameters);
for(i=0; i<nparameters; i++) {
parameter_name_cstr_sanitized = parameter_name_cstr_sanitized_CACHE[i];
/* like procname, param names are not sanitized. don't SQL inject yourself. */
strcat(sql, parameter_name_cstr_sanitized);
strcat(sql, ":=%s,");
PQfreemem(parameter_name_cstr_sanitized); /* Each parameter has to be processed. It's a few steps. */
} for (i = 0; i < nparameters; i++) {
PyMem_Del(parameter_name_cstr_sanitized_CACHE); if (!(pname = PyList_GetItem(pnames, i))) {
sql[sl-2] = ')'; PyErr_SetString(PyExc_RuntimeError,
sql[sl-1] = '\0'; "built-in 'values' did not return List!");
goto exit;
}
/* now that we have the query string we can discard the keys and proceed normally */ if (!(bpname = psycopg_ensure_bytes(pname))) {
parameters = PyDict_Values(parameters); PyErr_SetString(PyExc_TypeError,
"argument 2 must have only string keys if Dict");
goto exit;
}
if (!(cpname = Bytes_AsString(bpname))) {
PyErr_SetString(PyExc_RuntimeError,
"failed to get Bytes from String!");
goto exit;
}
if (!(scpnames[i] = PQescapeIdentifier(self->conn->pgconn, cpname,
strlen(cpname)))) {
PyErr_SetString(PyExc_RuntimeError,
"libpq failed to escape identifier!");
goto exit;
}
sl += strlen(scpnames[i]);
}
sql = (char*)PyMem_Malloc(sl);
if (sql == NULL) {
PyErr_NoMemory();
goto exit;
}
sprintf(sql, "SELECT * FROM %s(", procname);
for (i = 0; i < nparameters; i++) {
strcat(sql, scpnames[i]);
strcat(sql, ":=%s,");
}
sql[sl-2] = ')';
sql[sl-1] = '\0';
if (!(parameters = PyDict_Values(parameters))) {
PyErr_SetString(PyExc_RuntimeError,
"built-in 'values' failed on a Dict!");
goto exit;
}
} }
/* a list (or None) is a little bit simpler */ /* a list (or None, or empty data structure) is a little bit simpler */
else { else {
sl = procname_len + 17 + nparameters*3 - (nparameters ? 1 : 0); sl = procname_len + 17 + nparameters * 3 - (nparameters ? 1 : 0);
sql = (char*)PyMem_Malloc(sl); sql = (char*)PyMem_Malloc(sl);
if (sql == NULL) { if (sql == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
goto exit; goto exit;
} }
sprintf(sql, "SELECT * FROM %s(", procname); sprintf(sql, "SELECT * FROM %s(", procname);
for(i=0; i<nparameters; i++) { for (i = 0; i < nparameters; i++) {
strcat(sql, "%s,"); strcat(sql, "%s,");
} }
sql[sl-2] = ')'; sql[sl-2] = ')';
sql[sl-1] = '\0'; sql[sl-1] = '\0';
} }
if (!(operation = Bytes_FromString(sql))) { goto exit; } if (!(operation = Bytes_FromString(sql))) {
goto exit;
}
if (0 <= _psyco_curs_execute(self, operation, parameters, if (0 <= _psyco_curs_execute(self, operation, parameters,
self->conn->async, 0)) { self->conn->async, 0)) {
Py_INCREF(parameters); /* In the dict case, the parameters are already a new reference */
if (!using_dict) {
Py_INCREF(parameters);
}
res = parameters; res = parameters;
} }
exit: exit:
if (scpnames != NULL) {
for (i = 0; i < nparameters; i++) {
if (scpnames[i] != NULL) {
PQfreemem(scpnames[i]);
}
}
}
PyMem_Del(scpnames);
Py_XDECREF(pnames);
Py_XDECREF(operation); Py_XDECREF(operation);
PyMem_Free((void*)sql); PyMem_Free((void*)sql);
return res; return res;