]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
revert part of the change of r6510 because "select datetime('now')" in SQLite
authorGaëtan de Menten <gdementen@gmail.com>
Tue, 17 Nov 2009 19:38:09 +0000 (19:38 +0000)
committerGaëtan de Menten <gdementen@gmail.com>
Tue, 17 Nov 2009 19:38:09 +0000 (19:38 +0000)
does not contain microseconds

lib/sqlalchemy/dialects/sqlite/base.py

index 17619d2b54b90d5856244a779a377540a809e1dd..2b929331a81e2500ea2ccd0542398d1b60b51d1a 100644 (file)
@@ -80,7 +80,7 @@ class _DateTimeMixin(object):
         return process
 
 class DATETIME(_DateTimeMixin, sqltypes.DateTime):
-    _reg = re.compile(r"(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)\.(\d+)")
+    _reg = re.compile(r"(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)(?:\.(\d+))?")
     _storage_format = "%04d-%02d-%02d %02d:%02d:%02d.%06d"
   
     def bind_processor(self, dialect):
@@ -126,7 +126,7 @@ class DATE(_DateTimeMixin, sqltypes.Date):
         return self._result_processor(datetime.date)
 
 class TIME(_DateTimeMixin, sqltypes.Time):
-    _reg = re.compile(r"(\d+):(\d+):(\d+)\.(\d+)")
+    _reg = re.compile(r"(\d+):(\d+):(\d+)(?:\.(\d+))?")
     _storage_format = "%02d:%02d:%02d.%06d"
 
     def bind_processor(self, dialect):