fixing bug I introduce in convert_time, added coverage tests for change sets recently created

clarkevans · clarkevans · commit ef05715be1c0 · 2011-10-15T15:13:26.000-04:00
diff --git a/pymysql/converters.py b/pymysql/converters.py
@@ -183,15 +183,14 @@ def convert_time(connection, field, obj):
     to be treated as time-of-day and not a time offset, then you can
     use set this function as the converter for FIELD_TYPE.TIME.
     """
-    from math import modf
     try:
         microseconds = 0
         if "." in obj:
             (obj, tail) = obj.split('.')
             microseconds = int(tail)
         hours, minutes, seconds = obj.split(':')
-        return datetime.time(hour=int(hour), minute=int(minute),
-                             second=int(second), microsecond=microseconds)
+        return datetime.time(hour=int(hours), minute=int(minutes),
+                             second=int(seconds), microsecond=microseconds)
     except ValueError:
         return None
 
diff --git a/pymysql/tests/test_basic.py b/pymysql/tests/test_basic.py
@@ -92,6 +92,26 @@ def test_big_blob(self):
             self.assertEqual(data.encode(conn.charset), c.fetchone()[0])
         finally:
             c.execute("drop table test_big_blob")
+    
+    def test_untyped(self):
+        """ test conversion of null, empty string """
+        conn = self.connections[0]
+        c = conn.cursor()
+        c.execute("select null,''")
+        self.assertEqual((None,u''), c.fetchone())
+        c.execute("select '',null")
+        self.assertEqual((u'',None), c.fetchone())
+    
+    def test_datetime(self):
+        """ test conversion of null, empty string """
+        conn = self.connections[0]
+        c = conn.cursor()
+        c.execute("select time('12:30'), time('23:12:59'), time('23:12:59.05100')")
+        self.assertEqual((datetime.timedelta(0, 45000),
+                          datetime.timedelta(0, 83579),
+                          datetime.timedelta(0, 83579, 51000)),
+                         c.fetchone())
+
 
 class TestCursor(base.PyMySQLTestCase):
     # this test case does not work quite right yet, however,
