[SQL-CVS] r2361 - in SQLObject/trunk/sqlobject: . mysql

[<sub...@co...>]

Author: phd
Date: 2007-03-02 07:24:15 -0700 (Fri, 02 Mar 2007)
New Revision: 2361

Modified:
   SQLObject/trunk/sqlobject/col.py
   SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
Log:
Applied the patch 1450570: support for MySQL TIMESTAMP type.


Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py	2007-02-28 16:44:42 UTC (rev 2360)
+++ SQLObject/trunk/sqlobject/col.py	2007-03-02 14:24:15 UTC (rev 2361)
@@ -1063,7 +1063,6 @@
                        % DATETIME_IMPLEMENTATION)
     now = staticmethod(now)
 
-
 if datetime_available:
     class DateValidator(DateTimeValidator):
         def to_python(self, value, state):
@@ -1180,6 +1179,21 @@
     baseClass = SOTimeCol
 
 
+class SOTimestampCol(SODateTimeCol):
+    """
+    Necessary to support MySQL's use of TIMESTAMP versus DATETIME types
+    """
+
+    def __init__(self, **kw):
+        SOCol.__init__(self, **kw)
+
+    def _mysqlType(self):
+        return 'TIMESTAMP'
+
+class TimestampCol(Col):
+    baseClass = SOTimestampCol
+
+
 try:
     from decimal import Decimal
 except ImportError:

Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2007-02-28 16:44:42 UTC (rev 2360)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2007-03-02 14:24:15 UTC (rev 2361)
@@ -236,6 +236,10 @@
                                        'varchar': False}
         elif t.startswith('datetime'):
             return col.DateTimeCol, {}
+        elif t.startswith('date'):
+            return col.DateCol, {}
+        elif t.startswith('timestamp'):
+            return col.TimestampCol, {}
         elif t.startswith('bool'):
             return col.BoolCol, {}
         elif t.startswith('tinyblob'):