diff options
author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2017-06-17 03:16:41 +0100 |
---|---|---|
committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2017-06-17 03:30:44 +0100 |
commit | 1a97445471492a62e89d8e26cffdb3b640132174 (patch) | |
tree | 5bb1c13e987aea556c818e71288206027d32a6b4 /psycopg | |
parent | d72efd2fa8a4a2f3d1bfe1a998a33f13d45c1f3f (diff) | |
download | psycopg2-1a97445471492a62e89d8e26cffdb3b640132174.tar.gz |
Accept Composable in start_replication_expert()
Close #554
Diffstat (limited to 'psycopg')
-rw-r--r-- | psycopg/cursor.h | 1 | ||||
-rw-r--r-- | psycopg/cursor_int.c | 80 | ||||
-rw-r--r-- | psycopg/cursor_type.c | 85 | ||||
-rw-r--r-- | psycopg/replication_cursor_type.c | 17 |
4 files changed, 97 insertions, 86 deletions
diff --git a/psycopg/cursor.h b/psycopg/cursor.h index 3c94fe3..d89bf21 100644 --- a/psycopg/cursor.h +++ b/psycopg/cursor.h @@ -95,6 +95,7 @@ BORROWED HIDDEN PyObject *curs_get_cast(cursorObject *self, PyObject *oid); HIDDEN void curs_reset(cursorObject *self); HIDDEN int psyco_curs_withhold_set(cursorObject *self, PyObject *pyvalue); HIDDEN int psyco_curs_scrollable_set(cursorObject *self, PyObject *pyvalue); +HIDDEN PyObject *psyco_curs_validate_sql_basic(cursorObject *self, PyObject *sql); /* exception-raising macros */ #define EXC_IF_CURS_CLOSED(self) \ diff --git a/psycopg/cursor_int.c b/psycopg/cursor_int.c index dd4c0d7..bacef77 100644 --- a/psycopg/cursor_int.c +++ b/psycopg/cursor_int.c @@ -80,3 +80,83 @@ curs_reset(cursorObject *self) Py_CLEAR(self->description); Py_CLEAR(self->casts); } + + +/* Return 1 if `obj` is a `psycopg2.sql.Composable` instance, else 0 + * Set an exception and return -1 in case of error. + */ +RAISES_NEG static int +_curs_is_composible(PyObject *obj) +{ + int rv = -1; + PyObject *m = NULL; + PyObject *comp = NULL; + + if (!(m = PyImport_ImportModule("psycopg2.sql"))) { goto exit; } + if (!(comp = PyObject_GetAttrString(m, "Composable"))) { goto exit; } + rv = PyObject_IsInstance(obj, comp); + +exit: + Py_XDECREF(comp); + Py_XDECREF(m); + return rv; + +} + +/* Performs very basic validation on an incoming SQL string. + * Returns a new reference to a str instance on success; NULL on failure, + * after having set an exception. + */ +PyObject * +psyco_curs_validate_sql_basic(cursorObject *self, PyObject *sql) +{ + PyObject *rv = NULL; + PyObject *comp = NULL; + int iscomp; + + if (!sql || !PyObject_IsTrue(sql)) { + psyco_set_error(ProgrammingError, self, + "can't execute an empty query"); + goto exit; + } + + if (Bytes_Check(sql)) { + /* Necessary for ref-count symmetry with the unicode case: */ + Py_INCREF(sql); + rv = sql; + } + else if (PyUnicode_Check(sql)) { + if (!(rv = conn_encode(self->conn, sql))) { goto exit; } + } + else if (0 != (iscomp = _curs_is_composible(sql))) { + if (iscomp < 0) { goto exit; } + if (!(comp = PyObject_CallMethod(sql, "as_string", "O", self->conn))) { + goto exit; + } + + if (Bytes_Check(comp)) { + rv = comp; + comp = NULL; + } + else if (PyUnicode_Check(comp)) { + if (!(rv = conn_encode(self->conn, comp))) { goto exit; } + } + else { + PyErr_Format(PyExc_TypeError, + "as_string() should return a string: got %s instead", + Py_TYPE(comp)->tp_name); + goto exit; + } + } + else { + /* the is not unicode or string, raise an error */ + PyErr_Format(PyExc_TypeError, + "argument 1 must be a string or unicode object: got %s instead", + Py_TYPE(sql)->tp_name); + goto exit; + } + +exit: + Py_XDECREF(comp); + return rv; +} diff --git a/psycopg/cursor_type.c b/psycopg/cursor_type.c index 5031033..a70e9d3 100644 --- a/psycopg/cursor_type.c +++ b/psycopg/cursor_type.c @@ -267,85 +267,6 @@ _mogrify(PyObject *var, PyObject *fmt, cursorObject *curs, PyObject **new) return 0; } -/* Return 1 if `obj` is a `psycopg2.sql.Composable` instance, else 0 - * Set an exception and return -1 in case of error. - */ -RAISES_NEG static int -_curs_is_composible(PyObject *obj) -{ - int rv = -1; - PyObject *m = NULL; - PyObject *comp = NULL; - - if (!(m = PyImport_ImportModule("psycopg2.sql"))) { goto exit; } - if (!(comp = PyObject_GetAttrString(m, "Composable"))) { goto exit; } - rv = PyObject_IsInstance(obj, comp); - -exit: - Py_XDECREF(comp); - Py_XDECREF(m); - return rv; - -} - -static PyObject *_psyco_curs_validate_sql_basic( - cursorObject *self, PyObject *sql - ) -{ - PyObject *rv = NULL; - PyObject *comp = NULL; - int iscomp; - - /* Performs very basic validation on an incoming SQL string. - Returns a new reference to a str instance on success; NULL on failure, - after having set an exception. */ - - if (!sql || !PyObject_IsTrue(sql)) { - psyco_set_error(ProgrammingError, self, - "can't execute an empty query"); - goto exit; - } - - if (Bytes_Check(sql)) { - /* Necessary for ref-count symmetry with the unicode case: */ - Py_INCREF(sql); - rv = sql; - } - else if (PyUnicode_Check(sql)) { - if (!(rv = conn_encode(self->conn, sql))) { goto exit; } - } - else if (0 != (iscomp = _curs_is_composible(sql))) { - if (iscomp < 0) { goto exit; } - if (!(comp = PyObject_CallMethod(sql, "as_string", "O", self->conn))) { - goto exit; - } - - if (Bytes_Check(comp)) { - rv = comp; - comp = NULL; - } - else if (PyUnicode_Check(comp)) { - if (!(rv = conn_encode(self->conn, comp))) { goto exit; } - } - else { - PyErr_Format(PyExc_TypeError, - "as_string() should return a string: got %s instead", - Py_TYPE(comp)->tp_name); - goto exit; - } - } - else { - /* the is not unicode or string, raise an error */ - PyErr_Format(PyExc_TypeError, - "argument 1 must be a string or unicode object: got %s instead", - Py_TYPE(sql)->tp_name); - goto exit; - } - -exit: - Py_XDECREF(comp); - return rv; -} /* Merge together a query string and its arguments. * @@ -425,7 +346,7 @@ _psyco_curs_execute(cursorObject *self, PyObject *fquery, *cvt = NULL; const char *scroll; - operation = _psyco_curs_validate_sql_basic(self, operation); + operation = psyco_curs_validate_sql_basic(self, operation); /* Any failure from here forward should 'goto fail' rather than 'return 0' directly. */ @@ -622,7 +543,7 @@ _psyco_curs_mogrify(cursorObject *self, { PyObject *fquery = NULL, *cvt = NULL; - operation = _psyco_curs_validate_sql_basic(self, operation); + operation = psyco_curs_validate_sql_basic(self, operation); if (operation == NULL) { goto cleanup; } Dprintf("psyco_curs_mogrify: starting mogrify"); @@ -1665,7 +1586,7 @@ psyco_curs_copy_expert(cursorObject *self, PyObject *args, PyObject *kwargs) EXC_IF_GREEN(copy_expert); EXC_IF_TPC_PREPARED(self->conn, copy_expert); - sql = _psyco_curs_validate_sql_basic(self, sql); + sql = psyco_curs_validate_sql_basic(self, sql); /* Any failure from here forward should 'goto exit' rather than 'return NULL' directly. */ diff --git a/psycopg/replication_cursor_type.c b/psycopg/replication_cursor_type.c index d00b31c..0c0578b 100644 --- a/psycopg/replication_cursor_type.c +++ b/psycopg/replication_cursor_type.c @@ -48,11 +48,11 @@ psyco_repl_curs_start_replication_expert(replicationCursorObject *self, cursorObject *curs = &self->cur; connectionObject *conn = self->cur.conn; PyObject *res = NULL; - char *command; + PyObject *command = NULL; long int decode = 0; static char *kwlist[] = {"command", "decode", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|l", kwlist, &command, &decode)) { + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|l", kwlist, &command, &decode)) { return NULL; } @@ -60,9 +60,16 @@ psyco_repl_curs_start_replication_expert(replicationCursorObject *self, EXC_IF_GREEN(start_replication_expert); EXC_IF_TPC_PREPARED(conn, start_replication_expert); - Dprintf("psyco_repl_curs_start_replication_expert: '%s'; decode: %ld", command, decode); + if (!(command = psyco_curs_validate_sql_basic( + (cursorObject *)self, command))) { + goto exit; + } + + Dprintf("psyco_repl_curs_start_replication_expert: '%s'; decode: %ld", + Bytes_AS_STRING(command), decode); - if (pq_execute(curs, command, conn->async, 1 /* no_result */, 1 /* no_begin */) >= 0) { + if (pq_execute(curs, Bytes_AS_STRING(command), conn->async, + 1 /* no_result */, 1 /* no_begin */) >= 0) { res = Py_None; Py_INCREF(res); @@ -70,6 +77,8 @@ psyco_repl_curs_start_replication_expert(replicationCursorObject *self, gettimeofday(&self->last_io, NULL); } +exit: + Py_XDECREF(command); return res; } |