Changeset 153

Timestamp:

08/28/07 20:28:30

Author:

fumanchu

Message:

Separate adapters for timezone-aware or -naive datetimes for Postgres.

Files:

• trunk/geniusql/providers/postgres.py (modified) (3 diffs)

trunk/geniusql/providers/postgres.py

@@ -33 +33 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    def push(self, value, dbtype):
@@ -41 +53 @@
-                (value.year, value.month, value.day,
-                 value.hour, value.minute, value.second))
+    
+    def pull(self, value, dbtype):
+        if value is None:
+            return None
+        if isinstance(value, datetime.datetime):
+            return value
+        chunks = (value[0:4], value[5:7], value[8:10],
+                  value[11:13], value[14:16], value[17:19])
+        args = map(int, chunks)
+        
+        ms, tz = None, None
+        mstz = value[19:]
+        if mstz:
+            signpos = mstz.find("+")
+            if signpos == -1:
+                signpos = mstz.find("-")
+            
+            if signpos != -1:
+                # We have a timezone. Split it off.
+                ms = mstz[:signpos]
+            else:
+                ms = mstz
+            
+            if ms:
+                ms = int(ms.strip("."))
+        
+        args.append(ms or 0)
+        
+        return datetime.datetime(*args)
+
+
+class datetime_tz_to_PgTIMESTAMPTZ_Adapter(adapters.Adapter):
+    """Adapter for timezone-aware datetime objects.
+    
+    Postgres stores all timestamps as UTC internally, adjusting inbound
+    values based on their timezone component, and offsetting outbound
+    values relative to the Postgres 'timezone' config entry.
+    
+    This adapter assumes you always want to push and pull datetime objects
+    that have a valid tzinfo. Therefore, it always tries to supply a
+    timezone atom when sending datetime data to Postgres. If you push
+    a datetime with a tzinfo of None, "+00" is used for the timezone.
+    When retrieving values, any offset in the database value is used to
+    form a valid tzinfo object for the value (see dbtypes.FixedTimeZone).
+    In both directions, we assume you correctly set the connection's
+    timezone attribute.
+    """
+    
+    def push(self, value, dbtype):
+        if value is None:
+            return 'NULL'
+        
+        if value.tzinfo is None:
+            h, m = 0, 0
+        else:
+            h, m = divmod(value.tzinfo.utcoffset(value), 60)
+        
+        if h < 0:
+            h = abs(h)
+            sign = "-"
+        else:
+            sign = "+"
+        
+        return ("TIMESTAMP WITH TIME ZONE "
+                "'%04d-%02d-%02d %02d:%02d:%02d%s%02d:%02d'" %
+                (value.year, value.month, value.day,
+                 value.hour, value.minute, value.second,
+                 sign, h, m))
-    
-    def pull(self, value, dbtype):
@@ -401 +481 @@
-class TIMESTAMPTZ(dbtypes.SQL92TIMESTAMP):
-    """A date and time."""
-
+datetime_to_
-
-class DATE(dbtypes.SQL92DATE):