Changeset 840

Timestamp:

03/13/07 09:42:35 (1 year ago)

Author:

mfenniak

Message:

Fix bugs in NULL parameter send. Finish adding bytea type.

Files:

• pg8000/trunk/pg8000.py (modified) (6 diffs)

pg8000/trunk/pg8000.py

@@ -713 +713 @@
-            val = val + struct.pack("!h", len(self.type_oids))
-            for oid in self.type_oids:
+                # Parse message doesn't seem to handle the -1 type_oid for NULL
+                # values that other messages handle.  So we'll provide type_oid 705,
+                # the PG "unknown" type.
+                if oid == -1: oid = 705
-                val = val + struct.pack("!i", oid)
-            val = struct.pack("!i", len(val) + 4) + val
@@ -1280 +1284 @@
-        }
-
+class Bytea(str):
+    pass
+
-class Types(object):
+
-    def pg_type_info(typ):
-        data = Types.py_types.get(typ)
@@ -1288 +1296 @@
-        if type_oid == None:
-            raise InternalError("type %r has no type_oid" % typ)
+        elif type_oid == -1:
+            # special case: NULL values
+            return type_oid, 0
-        prefer = data.get("prefer")
-        if prefer != None:
@@ -1477 +1488 @@
-            return datetime.timedelta(0)
-
+    def byteasend(v, **kwargs):
+        return str(v)
+
-    def bytearecv(data, **kwargs):
-        return Bytea(data)
@@ -1491 +1505 @@
-        float: {"tid": 701, "bin_out": float8send},
-        decimal.Decimal: {"tid": 1700, "txt_out": numeric_out},
+        Bytea: {"tid": 17, "bin_out": byteasend},
-        type(None): {"tid": -1},
-    }
@@ -1512 +1527 @@
-        #1184: (timestamptz_in, None), # timestamp w/ tz
-
-
-
-
-
+
+