[SQL-CVS] r559 - trunk/SQLObject/sqlobject

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

Author: phd
Date: 2005-01-31 06:39:21 +0000 (Mon, 31 Jan 2005)
New Revision: 559

Modified:
   trunk/SQLObject/sqlobject/col.py
Log:
Fixed a bug in date/time validators: allow sqlbuilder.SQLExpression.

Modified: trunk/SQLObject/sqlobject/col.py
===================================================================
--- trunk/SQLObject/sqlobject/col.py	2005-01-28 21:01:13 UTC (rev 558)
+++ trunk/SQLObject/sqlobject/col.py	2005-01-31 06:39:21 UTC (rev 559)
@@ -717,7 +717,7 @@
         def fromPython(self, value, state):
             if value is None:
                 return None
-            if isinstance(value, (datetime.date, datetime.datetime)):
+            if isinstance(value, (datetime.date, datetime.datetime, sqlbuilder.SQLExpression)):
                 return value
             if hasattr(value, "strftime"):
                 return value.strftime(self.format)
@@ -727,7 +727,7 @@
         def toPython(self, value, state):
             if value is None:
                 return None
-            if isinstance(value, (datetime.date, datetime.datetime)):
+            if isinstance(value, (datetime.date, datetime.datetime, sqlbuilder.SQLExpression)):
                 return value
             if mxdatetime_available and isinstance(value, DateTimeType):
                 # convert mxDateTime instance to datetime
@@ -749,7 +749,7 @@
         def fromPython(self, value, state):
             if value is None:
                 return None
-            if isinstance(value, DateTimeType):
+            if isinstance(value, (DateTimeType, sqlbuilder.SQLExpression)):
                 return value
             if hasattr(value, "strftime"):
                 return value.strftime(self.format)
@@ -759,7 +759,7 @@
         def toPython(self, value, state):
             if value is None:
                 return None
-            if isinstance(value, DateTimeType):
+            if isinstance(value, (DateTimeType, sqlbuilder.SQLExpression)):
                 return value
             if datetime_available: # convert datetime instance to mxDateTime
                 if isinstance(value, datetime.datetime):