diff options
| -rw-r--r-- | Lib/sqlite3/dbapi2.py | 2 | ||||
| -rw-r--r-- | Lib/sqlite3/test/regression.py | 19 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 23 insertions, 2 deletions
diff --git a/Lib/sqlite3/dbapi2.py b/Lib/sqlite3/dbapi2.py index 6c121a5..1048992 100644 --- a/Lib/sqlite3/dbapi2.py +++ b/Lib/sqlite3/dbapi2.py @@ -67,7 +67,7 @@ def register_adapters_and_converters(): timepart_full = timepart.split(b".") hours, minutes, seconds = map(int, timepart_full[0].split(b":")) if len(timepart_full) == 2: - microseconds = int(timepart_full[1]) + microseconds = int('{:0<6}'.format(timepart_full[1].decode())) else: microseconds = 0 diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py index c7551e3..87d2cce 100644 --- a/Lib/sqlite3/test/regression.py +++ b/Lib/sqlite3/test/regression.py @@ -1,4 +1,4 @@ -#-*- coding: ISO-8859-1 -*- +#-*- coding: iso-8859-1 -*- # pysqlite2/test/regression.py: pysqlite regression tests # # Copyright (C) 2006-2010 Gerhard Häring <gh@ghaering.de> @@ -302,6 +302,23 @@ class RegressionTests(unittest.TestCase): cur.executemany("insert into b (baz) values (?)", ((i,) for i in foo())) + def CheckConvertTimestampMicrosecondPadding(self): + """ + http://bugs.python.org/issue14720 + + The microsecond parsing of convert_timestamp() should pad with zeros, + since the microsecond string "456" actually represents "456000". + """ + + con = sqlite.connect(":memory:", detect_types=sqlite.PARSE_DECLTYPES) + cur = con.cursor() + cur.execute("CREATE TABLE t (x TIMESTAMP)") + cur.execute("INSERT INTO t (x) VALUES ('2012-04-04 15:06:00.456')") + cur.execute("SELECT * FROM t") + date = cur.fetchall()[0][0] + + self.assertEqual(date, datetime.datetime(2012, 4, 4, 15, 6, 0, 456000)) + def suite(): regression_suite = unittest.makeSuite(RegressionTests, "Check") @@ -1068,6 +1068,7 @@ Anatoly Techtonik Mikhail Terekhov Richard M. Tew Tobias Thelen +Lowe Thiderman Nicolas M. Thiéry James Thomas Robin Thomas @@ -227,6 +227,9 @@ Core and Builtins Library ------- +- Issue #14720: sqlite3: Convert datetime microseconds correctly. + Patch by Lowe Thiderman. + - Issue #17225: JSON decoder now counts columns in the first line starting with 1, as in other lines. |