Fixed temporal hydration

Author: technige

neo4j/__init__.py

@@ -665,7 +665,7 @@ def _run_transaction(self, access_mode, unit_of_work, *args, **kwargs):
                 tx = self._transaction
                 try:
                     result = unit_of_work(tx, *args, **kwargs)
-                except:
+                except Exception:
                     if tx.success is None:
                         tx.success = False
                     raise

neo4j/types/temporal.py

@@ -35,6 +35,7 @@
 
 
 UNIX_EPOCH_DATE = Date(1970, 1, 1)
+UNIX_EPOCH_DATE_ORDINAL = UNIX_EPOCH_DATE.to_ordinal()
 UNIX_EPOCH_DATETIME_UTC = DateTime(1970, 1, 1, 0, 0, 0, utc)
 
 
@@ -44,7 +45,7 @@ def hydrate_date(days):
     :param days:
     :return: Date
     """
-    return UNIX_EPOCH_DATE + Duration(days=days)
+    return Date.from_ordinal(UNIX_EPOCH_DATE_ORDINAL + days)
 
 
 def dehydrate_date(value):
@@ -108,7 +109,7 @@ def hydrate_datetime(seconds, nanoseconds, tz=None):
     hours, minutes = map(int, divmod(minutes, 60))
     days, hours = map(int, divmod(hours, 24))
     seconds = (1000000000 * seconds + nanoseconds) / 1000000000
-    t = DateTime.combine(UNIX_EPOCH_DATE + Duration(days=days), Time(hours, minutes, seconds))
+    t = DateTime.combine(Date.from_ordinal(UNIX_EPOCH_DATE_ORDINAL + days), Time(hours, minutes, seconds))
     if tz is None:
         return t
     if isinstance(tz, int):

test/unit/test_types.py

@@ -188,3 +188,19 @@ def test_can_hydrate_in_dict(self):
         self.assertEqual(alice.labels, {"Person"})
         self.assertEqual(set(alice.keys()), {"name"})
         self.assertEqual(alice.get("name"), "Alice")
+
+
+class TemporalHydrationTestCase(TestCase):
+
+    def setUp(self):
+        self.hydrant = PackStreamHydrator(2)
+
+    def test_can_hydrate_date_time_structure(self):
+        struct = Structure(b'd', 1539344261, 474716862)
+        dt, = self.hydrant.hydrate([struct])
+        self.assertEqual(dt.year, 2018)
+        self.assertEqual(dt.month, 10)
+        self.assertEqual(dt.day, 12)
+        self.assertEqual(dt.hour, 11)
+        self.assertEqual(dt.minute, 37)
+        self.assertEqual(dt.second, 41.474716862)