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

Fixed COPY FROM to deal with decoded files.

Browse Source
This commit is contained in:
Daniele Varrazzo 2010-12-30 01:14:42 +01:00
parent bc28cc8b00
commit 73917c15e1
1 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
psycopg/pqpath.c
View File

@ -1065,18 +1065,49 @@ _pq_copy_in_v3(cursorObject *curs)
} }
while (1) { while (1) {
o = PyObject_CallFunctionObjArgs(func, size, NULL); if (!(o = PyObject_CallFunctionObjArgs(func, size, NULL))) {
if (!(o && Bytes_Check(o) && (length = Bytes_GET_SIZE(o)) != -1)) { Dprintf("_pq_copy_in_v3: read() failed");
error = 1; error = 1;
break;
}
/* a file may return unicode in Py3: encode in client encoding. */
#if PY_MAJOR_VERSION > 2
if (PyUnicode_Check(o)) {
PyObject *tmp;
if (!(tmp = PyUnicode_AsEncodedString(o, curs->conn->codec, NULL))) {
Dprintf("_pq_copy_in_v3: encoding() failed");
error = 1;
break;
}
Py_DECREF(o);
o = tmp;
}
#endif
if (!Bytes_Check(o)) {
Dprintf("_pq_copy_in_v3: got %s instead of bytes",
Py_TYPE(o)->tp_name);
error = 1;
break;
}
if (0 == (length = Bytes_GET_SIZE(o))) {
break;
}
if (length > INT_MAX) {
Dprintf("_pq_copy_in_v3: bad length: " FORMAT_CODE_PY_SSIZE_T,
length);
error = 1;
break;
} }
if (length == 0 || length > INT_MAX || error == 1) break;
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
res = PQputCopyData(curs->conn->pgconn, Bytes_AS_STRING(o), res = PQputCopyData(curs->conn->pgconn, Bytes_AS_STRING(o),
/* Py_ssize_t->int cast was validated above */ /* Py_ssize_t->int cast was validated above */
(int) length); (int) length);
Dprintf("_pq_copy_in_v3: sent %d bytes of data; res = %d", Dprintf("_pq_copy_in_v3: sent " FORMAT_CODE_PY_SSIZE_T " bytes of data; res = %d",
(int) length, res); length, res);
if (res == 0) { if (res == 0) {
/* FIXME: in theory this should not happen but adding a check /* FIXME: in theory this should not happen but adding a check
@ -1105,6 +1136,7 @@ _pq_copy_in_v3(cursorObject *curs)
else if (error == 2) else if (error == 2)
res = PQputCopyEnd(curs->conn->pgconn, "error in PQputCopyData() call"); res = PQputCopyEnd(curs->conn->pgconn, "error in PQputCopyData() call");
else else
/* XXX would be nice to propagate the exeption */
res = PQputCopyEnd(curs->conn->pgconn, "error in .read() call"); res = PQputCopyEnd(curs->conn->pgconn, "error in .read() call");
IFCLEARPGRES(curs->pgres); IFCLEARPGRES(curs->pgres);