From 26edef4f2483f68d6a527684a6d0aed37554534d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ga=C3=ABtan=20de=20Menten?= Date: Tue, 17 Nov 2009 19:38:09 +0000 Subject: [PATCH] revert part of the change of r6510 because "select datetime('now')" in SQLite does not contain microseconds --- lib/sqlalchemy/dialects/sqlite/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py index 17619d2b54..2b929331a8 100644 --- a/lib/sqlalchemy/dialects/sqlite/base.py +++ b/lib/sqlalchemy/dialects/sqlite/base.py @@ -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): -- 2.47.3