From 8b945148e3f98b9c6c51bfaa830e779979713b82 Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Sat, 23 Feb 2013 19:05:09 +0100
Subject: [PATCH] Issue #14720: sqlite3: Convert datetime microseconds
 correctly

Patch by Lowe Thiderman
---
 Lib/sqlite3/dbapi2.py          |  2 +-
 Lib/sqlite3/test/regression.py | 19 ++++++++++++++++++-
 Misc/ACKS                      |  1 +
 Misc/NEWS                      |  3 +++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Lib/sqlite3/dbapi2.py b/Lib/sqlite3/dbapi2.py
index 6c121a5c06d..1048992402d 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 c7551e35a1b..87d2cce3ec3 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")
diff --git a/Misc/ACKS b/Misc/ACKS
index 205f81327d0..bdb39f29e0e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1068,6 +1068,7 @@ Anatoly Techtonik
 Mikhail Terekhov
 Richard M. Tew
 Tobias Thelen
+Lowe Thiderman
 Nicolas M. Thiéry
 James Thomas
 Robin Thomas
diff --git a/Misc/NEWS b/Misc/NEWS
index 4f14dcdb9ee..e5c37fae9e7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.