Changeset 807

Timestamp:

03/07/07 23:06:10 (2 years ago)

Author:

mfenniak

Message:

add some types. It is necessary soon to define types as 'demand binary', 'demand text', etc, as that will help implement time related types.

Files:

• pg8000/trunk/pg8000.py (modified) (6 diffs)
• pg8000/trunk/pg8000-test.py (modified) (2 diffs)

pg8000/trunk/pg8000.py

@@ -34 +34 @@
-import datetime
-import md5
+import decimal
-
-class Warning(StandardError):
@@ -770 +771 @@
-        return struct.unpack("!h", data)[0]
-
+    def int2in(data, description):
+        return int(data)
+
-    def int4recv(data, description):
-        return struct.unpack("!i", data)[0]
@@ -775 +779 @@
-    def int4in(data, description):
-        return int(data)
+
+    def int8in(data, description):
+        return int(data)
+
+    def float4in(data, description):
+        return float(data)
+
+    def float8in(data, description):
+        return float(data)
-
-    def timestamp_recv(data, description):
@@ -786 +799 @@
-        hour = int(data[11:13])
-        minute = int(data[14:16])
-int(data[17:19
-sec
+decimal.Decimal(data[17:
+int(sec), int((sec - int(sec)) * 1000000)
-
-    def numeric_in(data, description):
@@ -793 +806 @@
-            return int(data)
-        else:
-
+.Decimal
-
-    def numeric_out(v, ce):
@@ -801 +814 @@
-        return unicode(data, "utf-8")
-
-varchar
+text
-        return v.encode(ce)
+
+    def timestamptz_in(data, description):
+        year = int(data[0:4])
+        month = int(data[5:7])
+        day = int(data[8:10])
+        hour = int(data[11:13])
+        minute = int(data[14:16])
+        tz_sep = data.rfind("-")
+        sec = decimal.Decimal(data[17:tz_sep])
+        tz = data[tz_sep:]
+        print repr(data), repr(description)
+        print repr(tz)
+        return datetime.datetime(year, month, day, hour, minute, int(sec), int((sec - int(sec)) * 1000000), Types.FixedOffsetTz(tz))
+
+    class FixedOffsetTz(datetime.tzinfo):
+        def __init__(self, hrs):
+            self.hrs = int(hrs)
+            self.name = hrs
+
+        def utcoffset(self, dt):
+            return datetime.timedelta(hours=1) * self.hrs
+
+        def tzname(self, dt):
+            return self.name
+
+        def dst(self, dt):
+            return datetime.timedelta(0)
+
+    # interval req. new patch for binary-output format prefered.
+    #def interval_in(data, description):
+    #    print repr(data), repr(description)
-
-    py_types = {
-        int: (1700, numeric_out, None),
-1043, varchar
-1043, varchar
+25, text
+25, text
-    }
-
-    pg_types = {
-        16: (boolin, boolrecv),
-
+
+
+
-        23: (int4in, int4recv),
-
+
+
+
+
+
-        1114: (timestamp_in, timestamp_recv),
+        1184: (timestamptz_in, None), # timestamp w/ tz
+        1186: (interval_in, None),
-        1700: (numeric_in, None),
-    }
-
-

pg8000/trunk/pg8000-test.py

@@ -1 +1 @@
-#!/usr/bin/env python
+
+import datetime
+import decimal
-
-import pg8000
@@ -27 +30 @@
-print "end query..."
-
-
-
-
-
-
+
-
+cur1.execute("SELECT 5000::smallint")
+assert tuple(cur1) == ({"int2": 5000},)
+
+cur1.execute("SELECT 5000::integer")
+assert tuple(cur1) == ({"int4": 5000},)
+
+cur1.execute("SELECT 50000000000000::bigint")
+assert tuple(cur1) == ({"int8": 50000000000000},)
+
+cur1.execute("SELECT 5000.023232::decimal")
+assert tuple(cur1) == ({"numeric": decimal.Decimal("5000.023232")},)
+
+cur1.execute("SELECT 1.1::real")
+assert tuple(cur1) == ({"float4": 1.1000000000000001},)
+
+cur1.execute("SELECT 1.1::double precision")
+assert tuple(cur1) == ({"float8": 1.1000000000000001},)
+
+cur1.execute("SELECT 'hello'::varchar(50)")
+assert tuple(cur1) == ({"varchar": u"hello"},)
+
+cur1.execute("SELECT 'hello'::char(20)")
+assert tuple(cur1) == ({"bpchar": u"hello               "},)
+
+cur1.execute("SELECT 'hello'::text")
+assert tuple(cur1) == ({"text": u"hello"},)
+
+#cur1.execute("SELECT 'hell\007o'::bytea")
+#assert tuple(cur1) == ({"bytea": "hello"},)
+
+cur1.execute("SELECT '2001-02-03 04:05:06.17'::timestamp")
+assert tuple(cur1) == ({'timestamp': datetime.datetime(2001, 2, 3, 4, 5, 6, 170000)},)
+
+#cur1.execute("SELECT '2001-02-03 04:05:06.17'::timestamp with time zone")
+#assert tuple(cur1) == ({'timestamp': datetime.datetime(2001, 2, 3, 4, 5, 6, 170000, pg8000.Types.FixedOffsetTz("-07"))},)
+
+cur1.execute("SELECT '1 day'::interval")
+print repr(tuple(cur1))
+
+
+print "Type checks complete."
+