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

Fixed patch from #119.

Browse Source
This commit is contained in:
Federico Di Gregorio 2006-09-01 12:36:38 +00:00
parent b3fdd80452
commit 9f9af5f907
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
psycopg/adapter_binary.c
View File

@ -137,10 +137,8 @@ binary_quote(binaryObject *self)
int buffer_len; int buffer_len;
size_t len = 0; size_t len = 0;
if (self->buffer == NULL)
self->buffer = PyString_FromString("");
/* if we got a plain string or a buffer we escape it and save the buffer */ /* if we got a plain string or a buffer we escape it and save the buffer */
else if (PyString_Check(self->wrapped) || PyBuffer_Check(self->wrapped)) { if (PyString_Check(self->wrapped) || PyBuffer_Check(self->wrapped)) {
/* escape and build quoted buffer */ /* escape and build quoted buffer */
PyObject_AsCharBuffer(self->wrapped, &buffer, &buffer_len); PyObject_AsCharBuffer(self->wrapped, &buffer, &buffer_len);
@ -151,8 +149,14 @@ binary_quote(binaryObject *self)
return NULL; return NULL;
} }
self->buffer = PyString_FromFormat("'%s'", to); if (len > 0) {
PQfreemem(to); self->buffer = PyString_FromFormat("'%s'", to);
PQfreemem(to);
}
else {
self->buffer = PyString_FromString("''");
PQfreemem(to);
}
} }
/* if the wrapped object is not a string or a buffer, this is an error */ /* if the wrapped object is not a string or a buffer, this is an error */

4
tests/types_basic.py
View File

@ -62,9 +62,9 @@ class TypesBasicTests(TestCase):
b = psycopg2.Binary(s) b = psycopg2.Binary(s)
r = str(self.execute("SELECT %s::bytea AS foo", (b,))) r = str(self.execute("SELECT %s::bytea AS foo", (b,)))
self.failUnless(r == s, "wrong binary quoting") self.failUnless(r == s, "wrong binary quoting")
# test to make sure an empty Binary is converted to an empty string
b = psycopg2.Binary('') b = psycopg2.Binary('')
self.assertEqual(str(b), '') self.assertEqual(str(b), "''")
def testArray(self): def testArray(self):
s = self.execute("SELECT %s AS foo", ([[1,2],[3,4]],)) s = self.execute("SELECT %s AS foo", ([[1,2],[3,4]],))