Changeset 794

Timestamp:

03/05/07 20:57:00 (1 year ago)

Author:

mfenniak

Message:

cont. work on pg8000 including type conversions for int and bool.

Files:

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

pg8000/trunk/pg8000.py

@@ -57 +57 @@
-
-    def execute(self, operation, *params):
-
+
+
+
-
-    def executemany(self, operation, seq):
@@ -64 +66 @@
-    def fetchone(self):
-        row = self.c.getrow()
-
+
+
+
-
-    def fetchmany(self, size=None):
@@ -92 +96 @@
-            self.c = Protocol.Connection(host, port)
-            self.c.connect()
-
-
+
-        except socket.error, e:
-            raise InterfaceError("communication error", e)
@@ -159 +162 @@
-                return klass(data[4:])
-            else:
-Interface
+NotSupported
-        createFromData = staticmethod(createFromData)
-
-        def ok(self, conn, user, **kwargs):
-NotImplemented
+Internal
-
-    class AuthenticationOk(AuthenticationRequest):
@@ -291 +294 @@
-                else:
-                    fields.append(data[:val_len])
- + 1
+
-            return Protocol.DataRow(fields)
-        createFromData = staticmethod(createFromData)
@@ -304 +307 @@
-        def verifyState(self, state):
-            if self.state != state:
-, "connection state must be %s, is %s" % (state, self.state
+("connection state must be %s, is %s" % (state, self.state)
-
-        def _send(self, msg):
@@ -349 +352 @@
-                self.state = "in_query"
-                return msg
+            elif isinstance(msg, Protocol.ErrorResponse):
+                raise ProgrammingError(msg.severity, msg.code, msg.msg)
+            else:
+                raise InternalError("RowDescription expected, other message recv'd")
-
-        def getrow(self):
@@ -371 +378 @@
-        }
-
+class Types(object):
+    def convert(data, description):
+        format = description['format']
+        table = Types.t_formats.get(format)
+        if table == None:
+            raise NotSupportedError("data response format %r not supported" % format)
+        type_oid = description['type_oid']
+        func = table.get(type_oid)
+        if func == None:
+            raise NotSupportedError("data response format %r, type %r not supported" % (format, type_oid))
+        in_func, out_func = func
+        return in_func(data, description)
+    convert = staticmethod(convert)
+
+    def boolin(data, description):
+        return data == 't'
+
+    def boolout(v):
+        if v:
+            return 't'
+        else:
+            return 'f'
+
+    def int4in(data, description):
+        return int(data)
+
+    def int4out(v):
+        return str(v)
+
+    t_formats_text = {
+        16: (boolin, boolout),
+        23: (int4in, int4out),
+    }
+
+    t_formats = {
+        0: t_formats_text,
+    }
+
+

pg8000/trunk/pg8000-test.py

@@ -3 +3 @@
-import pg8000
-
-laotzu
+mfenniak
-cur = db.cursor()
-
-1+1
+5000+1, true, false, '2001-01-01 01:01:01'::timestamp
-res = cur.fetchall()
-print repr(res)