Changeset 842

Timestamp:

03/13/07 11:55:07 (2 years ago)

Author:

mfenniak

Message:

Complete DB-API implementation.

Files:

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

pg8000/trunk/pg8000.py

@@ -36 +36 @@
-import decimal
-import threading
+import time
-
-class Warning(StandardError):
@@ -367 +368 @@
-    connect = staticmethod(connect)
-
+    def Date(year, month, day):
+        return datetime.date(year, month, day)
+    Date = staticmethod(Date)
+
+    def Time(hour, minute, second):
+        return datetime.time(hour, minute, second)
+    Time = staticmethod(Time)
+
+    def Timestamp(year, month, day, hour, minute, second):
+        return datetime.datetime(year, month, day, hour, minute, second)
+    Timestamp = staticmethod(Timestamp)
+
+    def DateFromTicks(ticks):
+        return DBAPI.Date(*time.localtime(ticks)[:3])
+    DateFromTicks = staticmethod(DateFromTicks)
+
+    def TimeFromTicks(ticks):
+        return DBAPI.Time(*time.localtime(ticks)[3:6])
+    TimeFromTicks = staticmethod(TimeFromTicks)
+
+    def TimestampFromTicks(ticks):
+        return DBAPI.Timestamp(*time.localtime(ticks)[:6])
+    TimestampFromTicks = staticmethod(TimestampFromTicks)
+
+    def Binary(value):
+        return Bytea(value)
+    Binary = staticmethod(Binary)
+
+    # I have no idea what this would be used for by a client app.  Should it be
+    # TEXT, VARCHAR, CHAR?  It will only compare against row_description's
+    # type_code if it is this one type.  It is the TEXT type_oid for now.
+    STRING = 25
+
+    # bytea type_oid
+    BINARY = 17
+
+    # numeric type_oid
+    NUMBER = 1700
+
+    # timestamp type_oid
+    DATETIME = 1114
+
+    # oid type_oid
+    ROWID = 26
+
-
-##

pg8000/trunk/pg8000-test.py

@@ -215 +215 @@
-            dbapi.paramstyle = orig_paramstyle
-
+    def TestArraysize(self):
+        c1 = db2.cursor()
+        c1.arraysize = 3
+        c1.execute("SELECT * FROM t1")
+        retval = c1.fetchmany()
+        self.assert_(len(retval) == c1.arraysize,
+                "fetchmany returned wrong number of rows")
+
+    def TestDate(self):
+        val = dbapi.Date(2001, 2, 3)
+        self.assert_(val == datetime.date(2001, 2, 3),
+                "Date constructor value match failed")
+
+    def TestTime(self):
+        val = dbapi.Time(4, 5, 6)
+        self.assert_(val == datetime.time(4, 5, 6),
+                "Time constructor value match failed")
+
+    def TestTimestamp(self):
+        val = dbapi.Timestamp(2001, 2, 3, 4, 5, 6)
+        self.assert_(val == datetime.datetime(2001, 2, 3, 4, 5, 6),
+                "Timestamp constructor value match failed")
+
+    def TestDateFromTicks(self):
+        val = dbapi.DateFromTicks(1173804319)
+        self.assert_(val == datetime.date(2007, 3, 13),
+                "DateFromTicks constructor value match failed")
+
+    def TestTimeFromTicks(self):
+        val = dbapi.TimeFromTicks(1173804319)
+        self.assert_(val == datetime.time(10, 45, 19),
+                "TimeFromTicks constructor value match failed")
+
+    def TestTimestampFromTicks(self):
+        val = dbapi.TimestampFromTicks(1173804319)
+        self.assert_(val == datetime.datetime(2007, 3, 13, 10, 45, 19),
+                "TimestampFromTicks constructor value match failed")
+
+    def TestBinary(self):
+        v = dbapi.Binary("\x00\x01\x02\x03\x02\x01\x00")
+        self.assert_(v == "\x00\x01\x02\x03\x02\x01\x00",
+                "Binary value match failed")
+        self.assert_(isinstance(v, pg8000.Bytea),
+                "Binary type match failed")
+
+
-# Tests relating to type conversion.
-class TypeTests(unittest.TestCase):