Type casting fixes

abondar · abondar · commit b79c720258d7 · 2018-06-26T14:05:26.000+03:00
diff --git a/examples/basic.py b/examples/basic.py
@@ -14,6 +14,7 @@
 class Event(Model):
     id = fields.IntField(pk=True)
     name = fields.TextField()
+    datetime = fields.DatetimeField(null=True)
 
     class Meta:
         table = 'event'
diff --git a/tortoise/__init__.py b/tortoise/__init__.py
@@ -127,4 +127,4 @@ def init(cls, global_client=None, db_routing=None):
         cls._inited = True
 
 
-__version__ = "0.8.0"
+__version__ = "0.8.2"
diff --git a/tortoise/backends/asyncpg/fields.py b/tortoise/backends/asyncpg/fields.py
@@ -17,7 +17,11 @@ def __init__(self, encoder=None, decoder=None, *args, **kwargs):
             self.decoder = decoder
 
     def to_db_value(self, value):
+        if value is None:
+            return value
         return self.encoder(value)
 
     def to_python_value(self, value):
+        if value is None:
+            return value
         return self.decoder(value)
diff --git a/tortoise/fields.py b/tortoise/fields.py
@@ -26,9 +26,13 @@ def __init__(self, type=None, source_field=None, generated=False, pk=False,
         self.unique = unique
 
     def to_db_value(self, value):
+        if value is None or isinstance(value, self.type):
+            return value
         return self.type(value)
 
     def to_python_value(self, value):
+        if value is None or isinstance(value, self.type):
+            return value
         return self.type(value)
 
 

Original file line number	Diff line number	Diff line change
`@@ -127,4 +127,4 @@ def init(cls, global_client=None, db_routing=None):`
`127`	`127`	`cls._inited = True`
`128`	`128`
`129`	`129`
`130`		`-__version__ = "0.8.0"`
	`130`	`+__version__ = "0.8.2"`