Changeset 798

Timestamp:

03/07/07 17:46:35 (2 years ago)

Author:

mfenniak

Message:

begin working on extended query backend protocol usage

Files:

• pg8000/trunk/pg8000.py (modified) (7 diffs)
• pg8000/trunk/pg8000-test.py (modified) (1 diff)

pg8000/trunk/pg8000.py

@@ -132 +132 @@
-            raise InterfaceError("communication error", e)
-
-, **kwargs
+
-        pass
-
-
-
+
+
+
-
-    def _fetch(self):
@@ -142 +143 @@
-        if row == None:
-            return None
-convert
+py_value
-
-    ##
@@ -217 +218 @@
-            return val
-
+    class Parse(object):
+        def __init__(self, ps, qs, types):
+            self.ps = ps
+            self.qs = qs
+            self.types = [Types.pg_type_id(x) for x in types]
+
+        def serialize(self):
+            val = self.ps + "\x00" + self.qs + "\x00"
+            val = val + struct.pack("!h", len(self.types))
+            for oid in self.types:
+                val = val + struct.pack("!i", oid)
+            val = struct.pack("!i", len(val) + 4) + val
+            val = "P" + val
+            return val
+
+    class Bind(object):
+        def __init__(self, portal, ps, in_fc, params, out_fc):
+            self.portal = portal
+            self.ps = ps
+            self.in_fc = in_fc
+            self.params = []
+            for i in range(len(params)):
+                if len(self.in_fc) == 0:
+                    fc = 0
+                elif len(self.in_fc) == 1:
+                    fc = self.in_fc[0]
+                else:
+                    fc = self.in_fc[i]
+                self.params.append(Types.pg_value(params[i], fc))
+            self.out_fc = out_fc
+
+        def serialize(self):
+            val = self.portal + "\x00" + self.ps + "\x00"
+            val = val + struct.pack("!h", len(self.in_fc))
+            for fc in self.in_fc:
+                val = val + struct.pack("!h", fc)
+            val = val + struct.pack("!h", len(self.params))
+            for param in self.params:
+                val = val + struct.pack("!i", len(param)) + param
+            val = val + struct.pack("!h", len(self.out_fc))
+            for fc in self.out_fc:
+                val = val + struct.pack("!h", fc)
+            val = struct.pack("!i", len(val) + 4) + val
+            val = "B" + val
+            return val
+
+    class Describe(object):
+        def __init__(self, typ, name):
+            if len(typ) != 1:
+                raise InternalError("Describe typ must be 1 char")
+            self.typ = typ
+            self.name = name
+
+        def serialize(self):
+            val = self.typ + self.name + "\x00"
+            val = struct.pack("!i", len(val) + 4) + val
+            val = "D" + val
+            return val
+
+    class DescribePortal(Describe):
+        def __init__(self, name):
+            Protocol.Describe.__init__(self, "P", name)
+
+    class DescribePreparedStatement(Describe):
+        def __init__(self, name):
+            Protocol.Describe.__init__(self, "S", name)
+
+    class Flush(object):
+        def serialize(self):
+            return 'H\x00\x00\x00\x04'
+
-    class PasswordMessage(object):
-        def __init__(self, pwd):
@@ -293 +365 @@
-        createFromData = staticmethod(createFromData)
-
+    class ParseComplete(object):
+        def createFromData(data):
+            return Protocol.ParseComplete()
+        createFromData = staticmethod(createFromData)
+
+    class BindComplete(object):
+        def createFromData(data):
+            return Protocol.BindComplete()
+        createFromData = staticmethod(createFromData)
+
-    class ReadyForQuery(object):
-        def __init__(self, status):
@@ -425 +507 @@
-                    raise msg.createException()
-
+        def extended_query(self, portal, statement, qs, params):
+            self.verifyState("ready")
+            self._send(Protocol.Parse(statement, qs, [type(x) for x in params]))
+            self._send(Protocol.Bind(portal, statement, (1,), params, (1,)))
+            self._send(Protocol.DescribePortal(portal))
+            self._send(Protocol.Flush())
+            while 1:
+                msg = self._read_message()
+                if isinstance(msg, Protocol.ParseComplete):
+                    # ok, good.
+                    pass
+                elif isinstance(msg, Protocol.BindComplete):
+                    # good news everybody!
+                    pass
+                elif isinstance(msg, Protocol.RowDescription):
+                    return msg
+                elif isinstance(msg, Protocol.ErrorResponse):
+                    raise msg.createException()
+                else:
+                    raise InternalError("Unexpected response msg %r" % (msg))
+
-        def query(self, qs):
-            self.verifyState("ready")
@@ -456 +559 @@
-        "D": DataRow,
-        "C": CommandComplete,
+        "1": ParseComplete,
+        "2": BindComplete,
-        }
-
-class Types(object):
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        format = description['format']
-
-
-
-
-
+
+
+
+
-        if func == None:
-            raise NotSupportedError("data response format %r, type %r not supported" % (format, type_oid))
-
-
-
+
+
-
-    def boolin(data, description):
-        return data == 't'
-
-    def boolout(v):
-        # imp req.
-        pass
-
-    def int4in(data, description):
-        return int(data)
-
-
-
-
+
+
-
-    def timestamp_in(data, description):
@@ -495 +617 @@
-        return datetime.datetime(year, month, day, hour, minute, sec)
-
-
-
-
-
-
-
-
-
+
+
-    }
-
-
-
+
+
+
+
-    }
-

pg8000/trunk/pg8000-test.py

@@ -3 +3 @@
-import pg8000
-
-joy.fenniak.net', user='Mathieu Fenniak', password='hello', database='software
+localhost', user='mfenniak
-db.iterate_dicts = True
-
-print "begin query..."
-"
+, $1", 55
-for row in db:
-    print repr(row)