diff options
| author | Gaëtan de Menten <gdementen@gmail.com> | 2009-11-17 19:38:09 +0000 |
|---|---|---|
| committer | Gaëtan de Menten <gdementen@gmail.com> | 2009-11-17 19:38:09 +0000 |
| commit | 26edef4f2483f68d6a527684a6d0aed37554534d (patch) | |
| tree | b4f0c4c7aaf7193b419e53ce2f5241eaae84f77d /lib/sqlalchemy/dialects/sqlite | |
| parent | 1bca0c42a3f4626f0273e61cf1b59ece37c3bd26 (diff) | |
| download | sqlalchemy-26edef4f2483f68d6a527684a6d0aed37554534d.tar.gz | |
revert part of the change of r6510 because "select datetime('now')" in SQLite
does not contain microseconds
Diffstat (limited to 'lib/sqlalchemy/dialects/sqlite')
| -rw-r--r-- | lib/sqlalchemy/dialects/sqlite/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py index 17619d2b5..2b929331a 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): |