Add test

neomodel/__init__.py

@@ -25,6 +25,7 @@
     BooleanProperty,
     DateProperty,
     DateTimeFormatProperty,
+    DateTimeNeo4jFormatProperty,
     DateTimeProperty,
     EmailProperty,
     FloatProperty,

neomodel/properties.py

@@ -4,7 +4,6 @@
 import sys
 import uuid
 from datetime import date, datetime
-import neo4j.time
 
 import neo4j.time
 import pytz
@@ -448,25 +447,26 @@ def deflate(self, value):
         return float((value - epoch_date).total_seconds())
 
 
-class DateTimeFormatNeo4j(Property):
+class DateTimeNeo4jFormatProperty(Property):
     """
     Store a datetime by native neo4j format
-    
+
     :param default_now: If ``True``, the creation time (Local) will be used as default.
                         Defaults to ``False``.
 
     :type default_now:  :class:`bool`
     """
-    form_field_class = 'DateTimeFormatFieldNeo4j'
+
+    form_field_class = "DateTimeNeo4jFormatField"
 
     def __init__(self, default_now=False, **kwargs):
         if default_now:
-            if 'default' in kwargs:
-                raise ValueError('too many defaults')
-            kwargs['default'] = lambda: datetime.now()
+            if "default" in kwargs:
+                raise ValueError("too many defaults")
+            kwargs["default"] = datetime.now()
 
         self.format = format
-        super(DateTimeFormatNeo4j, self).__init__(**kwargs)
+        super(DateTimeNeo4jFormatProperty, self).__init__(**kwargs)
 
     @validator
     def inflate(self, value):
@@ -475,11 +475,10 @@ def inflate(self, value):
     @validator
     def deflate(self, value):
         if not isinstance(value, datetime):
-            raise ValueError('datetime object expected, got {0}.'.format(type(value)))
+            raise ValueError("datetime object expected, got {0}.".format(type(value)))
         return neo4j.time.DateTime.from_native(value)
 
-
-
+
 class JSONProperty(Property):
     """
     Store a data structure as a JSON string.

neomodel/scripts/neomodel_generate_diagram.py

@@ -42,6 +42,7 @@
     BooleanProperty,
     DateProperty,
     DateTimeFormatProperty,
+    DateTimeNeo4jFormatProperty,
     DateTimeProperty,
     FloatProperty,
     IntegerProperty,
@@ -107,8 +108,10 @@ def transform_property_type(prop_definition):
         return "bool"
     elif isinstance(prop_definition, DateProperty):
         return "date"
-    elif isinstance(prop_definition, DateTimeProperty) or isinstance(
-        prop_definition, DateTimeFormatProperty
+    elif (
+        isinstance(prop_definition, DateTimeProperty)
+        or isinstance(prop_definition, DateTimeFormatProperty)
+        or isinstance(prop_definition, DateTimeNeo4jFormatProperty)
     ):
         return "datetime"
     elif isinstance(prop_definition, IntegerProperty):

test/async_/test_properties.py

@@ -1,6 +1,7 @@
 from datetime import date, datetime
 from test._async_compat import mark_async_test
 
+from neo4j import time
 from pytest import mark, raises
 from pytz import timezone
 
@@ -16,6 +17,7 @@
     ArrayProperty,
     DateProperty,
     DateTimeFormatProperty,
+    DateTimeNeo4jFormatProperty,
     DateTimeProperty,
     EmailProperty,
     IntegerProperty,
@@ -132,6 +134,18 @@ def test_datetime_format():
     assert prop.inflate("2019-03-19 15:36:25") == some_datetime
 
 
+def test_datetime_neo4j_format():
+    prop = DateTimeNeo4jFormatProperty()
+    prop.name = "foo"
+    prop.owner = FooBar
+    some_datetime = datetime(2022, 12, 10, 14, 00, 00)
+    assert prop.deflate(some_datetime) == time.DateTime(2022, 12, 10, 14, 00, 00)
+    assert prop.inflate(time.DateTime(2022, 12, 10, 14, 00, 00)) == some_datetime
+
+    with raises(ValueError, match=r"datetime object expected, got.*"):
+        prop.deflate(1234)
+
+
 def test_datetime_exceptions():
     prop = DateTimeProperty()
     prop.name = "created"

test/sync_/test_properties.py

@@ -1,6 +1,7 @@
 from datetime import date, datetime
 from test._async_compat import mark_sync_test
 
+from neo4j import time
 from pytest import mark, raises
 from pytz import timezone
 
@@ -16,6 +17,7 @@
     ArrayProperty,
     DateProperty,
     DateTimeFormatProperty,
+    DateTimeNeo4jFormatProperty,
     DateTimeProperty,
     EmailProperty,
     IntegerProperty,
@@ -132,6 +134,18 @@ def test_datetime_format():
     assert prop.inflate("2019-03-19 15:36:25") == some_datetime
 
 
+def test_datetime_neo4j_format():
+    prop = DateTimeNeo4jFormatProperty()
+    prop.name = "foo"
+    prop.owner = FooBar
+    some_datetime = datetime(2022, 12, 10, 14, 00, 00)
+    assert prop.deflate(some_datetime) == time.DateTime(2022, 12, 10, 14, 00, 00)
+    assert prop.inflate(time.DateTime(2022, 12, 10, 14, 00, 00)) == some_datetime
+
+    with raises(ValueError, match=r"datetime object expected, got.*"):
+        prop.deflate(1234)
+
+
 def test_datetime_exceptions():
     prop = DateTimeProperty()
     prop.name = "created"