PHOENIX-4664 Time Python driver tests failing

python-phoenixdb/phoenixdb/tests/test_types.py

@@ -142,7 +142,6 @@ def test_boolean(self):
             self.assertEqual(cursor.description[1].type_code, phoenixdb.BOOLEAN)
             self.assertEqual(cursor.fetchall(), [[1, True], [2, False], [3, None], [4, True], [5, False], [6, None]])
 
-    @unittest.skip("https://issues.apache.org/jira/browse/PHOENIX-4664")
     def test_time(self):
         self.createTable("phoenixdb_test_tbl1", "CREATE TABLE {table} (id integer primary key, val time)")
         with self.conn.cursor() as cursor:
@@ -172,7 +171,6 @@ def test_time_full(self):
                 [2, datetime.datetime(2015, 7, 12, 13, 1, 2, 123000)],
             ])
 
-    @unittest.skip("https://issues.apache.org/jira/browse/PHOENIX-4664")
     def test_date(self):
         self.createTable("phoenixdb_test_tbl1", "CREATE TABLE {table} (id integer primary key, val date)")
         with self.conn.cursor() as cursor:
@@ -194,8 +192,8 @@ def test_date_full(self):
             cursor.execute("UPSERT INTO phoenixdb_test_tbl1 VALUES (2, ?)", [datetime.datetime(2015, 7, 12, 13, 1, 2, 123000)])
             cursor.execute("SELECT id, val FROM phoenixdb_test_tbl1 ORDER BY id")
             self.assertEqual(cursor.fetchall(), [
-                [1, datetime.datetime(2015, 7, 12, 13, 1, 2, 123000)],
-                [2, datetime.datetime(2015, 7, 12, 13, 1, 2, 123000)],
+                [1, datetime.datetime(2015, 7, 12)],
+                [2, datetime.datetime(2015, 7, 12)],
             ])
 
     def test_date_null(self):
@@ -209,7 +207,6 @@ def test_date_null(self):
                 [2, None],
             ])
 
-    @unittest.skip("https://issues.apache.org/jira/browse/PHOENIX-4664")
     def test_timestamp(self):
         self.createTable("phoenixdb_test_tbl1", "CREATE TABLE {table} (id integer primary key, val timestamp)")
         with self.conn.cursor() as cursor:

python-phoenixdb/phoenixdb/types.py

@@ -84,12 +84,11 @@ def date_to_java_sql_date(d):
 
 
 def datetime_from_java_sql_timestamp(n):
-    return datetime.datetime(1970, 1, 1) + datetime.timedelta(milliseconds=n)
+    return datetime.datetime.utcfromtimestamp(n/1000.0)
 
 
 def datetime_to_java_sql_timestamp(d):
-    td = d - datetime.datetime(1970, 1, 1)
-    return td.microseconds // 1000 + (td.seconds + td.days * 24 * 3600) * 1000
+    return int(d.replace(tzinfo=datetime.timezone.utc).timestamp()*1000)
 
 
 # FIXME This doesn't seem to be used anywhere in the code