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

_psyco_curs_execute() simplified

Browse Source 
Dropped code duplications, more regular increc/decref pattern.

Check the return value of formatting named cursor: would have segfaulted
in case of error.
This commit is contained in:
Daniele Varrazzo 2019-01-02 11:51:54 +01:00
parent 594df09a63
commit c77615adc9
1 changed files with 42 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
psycopg/cursor_type.c
View File

@ -372,20 +372,17 @@ _psyco_curs_merge_query_args(cursorObject *self,
RAISES_NEG static int
_psyco_curs_execute(cursorObject *self,
PyObject *operation, PyObject *vars,
PyObject *query, PyObject *vars,
long int async, int no_result)
{
int res = -1;
int tmp;
PyObject *fquery, *cvt = NULL;
const char *scroll;
PyObject *fquery = NULL, *cvt = NULL;
operation = psyco_curs_validate_sql_basic(self, operation);
/* Any failure from here forward should 'goto fail' rather than 'return 0'
directly. */
if (operation == NULL) { goto exit; }
/* query becomes NULL or refcount +1, so good to XDECREF at the end */
if (!(query = psyco_curs_validate_sql_basic(self, query))) {
goto exit;
}
CLEARPGRES(self->pgres);
Py_CLEAR(self->query);
@ -394,12 +391,24 @@ _psyco_curs_execute(cursorObject *self,
/* here we are, and we have a sequence or a dictionary filled with
objects to be substituted (bound variables). we try to be smart and do
the right thing (i.e., what the user expects) */
if (vars && vars != Py_None)
{
if (0 > _mogrify(vars, operation, self, &cvt)) { goto exit; }
if (0 > _mogrify(vars, query, self, &cvt)) { goto exit; }
}
/* Merge the query to the arguments if needed */
if (cvt) {
if (!(fquery = _psyco_curs_merge_query_args(self, query, cvt))) {
goto exit;
}
}
else {
Py_INCREF(query);
fquery = query;
}
if (self->qname != NULL) {
const char *scroll;
switch (self->scrollable) {
case -1:
scroll = "";
@ -415,44 +424,23 @@ _psyco_curs_execute(cursorObject *self,
goto exit;
}
if (vars && cvt) {
if (!(fquery = _psyco_curs_merge_query_args(self, operation, cvt))) {
if (!(self->query = Bytes_FromFormat(
"DECLARE %s %sCURSOR %s HOLD FOR %s",
self->qname,
scroll,
self->withhold ? "WITH" : "WITHOUT",
Bytes_AS_STRING(fquery)))) {
goto exit;
}
if (self->qname != NULL) {
self->query = Bytes_FromFormat(
"DECLARE %s %sCURSOR %s HOLD FOR %s",
self->qname,
scroll,
self->withhold ? "WITH" : "WITHOUT",
Bytes_AS_STRING(fquery));
Py_DECREF(fquery);
if (!self->query) { goto exit; }
}
else {
/* Transfer ownership */
Py_INCREF(fquery);
self->query = fquery;
}
}
else {
if (self->qname != NULL) {
self->query = Bytes_FromFormat(
"DECLARE %s %sCURSOR %s HOLD FOR %s",
self->qname,
scroll,
self->withhold ? "WITH" : "WITHOUT",
Bytes_AS_STRING(operation));
}
else {
/* Transfer reference ownership of the str in operation to
self->query, clearing the local variable to prevent cleanup from
DECREFing it */
self->query = operation;
operation = NULL;
}
}
/* At this point, the SQL statement must be str, not unicode */
tmp = pq_execute(self, Bytes_AS_STRING(self->query), async, no_result, 0);
Dprintf("psyco_curs_execute: res = %d, pgres = %p", tmp, self->pgres);
if (tmp < 0) { goto exit; }
@ -460,10 +448,8 @@ _psyco_curs_execute(cursorObject *self,
res = 0; /* Success */
exit:
/* Py_XDECREF(operation) is safe because the original reference passed
by the caller was overwritten with either NULL or a new
reference */
Py_XDECREF(operation);
Py_XDECREF(query);
Py_XDECREF(fquery);
Py_XDECREF(cvt);
return res;