From 8da4c192f391cb95236a0058fef13b63dd514065 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Thu, 27 Aug 2020 19:00:06 +0200
Subject: [PATCH] finish of refactor

---
 .coverage                 | Bin 53248 -> 53248 bytes
 ormar/models/metaclass.py |  20 +++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.coverage b/.coverage
index 49b8d33146f27bdd7effa92b008068da74826857..8bc7b2be8d68b6d20984670311964d8ea3b06641 100644
GIT binary patch
delta 123
zcmV->0EGX5paX!Q1F$GB2RJ%4IXW{rvo9~#P&Tpv5BU%358e;c56BO=51<cs4{r}l
z4=xWT4+swE4$Tg&4wnvq4tNe~4mb`Q4fYM-4a*I(vk?$>4YRY2d;uOD3j_fPIt%)~
d<UjM{Uq1f%fBEOn%T9O3b91)M0<%nyv_K0@F311?

delta 122
zcmV-=0EPd6paX!Q1F$GB2QfM_I65>lvo9~#P&Tsw5BU%358e;c56BO=51<cs4{r}l
z4=)cV4+#$G4$cm)4ww#s4tWl14ml1S4fhS<4a^O*vk?$?4YRV1d;uLB3j_fPI1Bo|
c<UjM{Uq1f%fBAo2cDgg3o3m{evrLb)K*;GV{Qv*}

diff --git a/ormar/models/metaclass.py b/ormar/models/metaclass.py
index 8d1e5e7..761833e 100644
--- a/ormar/models/metaclass.py
+++ b/ormar/models/metaclass.py
@@ -87,19 +87,25 @@ def sqlalchemy_columns_from_model_fields(
 
     return pkname, columns
 
-def populate_default
+
+def populate_default_field_value(
+    type_: Type[BaseField], field: str, attrs: dict
+) -> dict:
+    def_value = type_.default_value()
+    curr_def_value = attrs.get(field, "NONE")
+    if curr_def_value == "NONE" and isinstance(def_value, FieldInfo):
+        attrs[field] = def_value
+    elif curr_def_value == "NONE" and type_.nullable:
+        attrs[field] = FieldInfo(default=None)
+    return attrs
+
 
 def populate_pydantic_default_values(attrs: Dict) -> Dict:
     for field, type_ in attrs["__annotations__"].items():
         if issubclass(type_, BaseField):
             if type_.name is None:
                 type_.name = field
-            def_value = type_.default_value()
-            curr_def_value = attrs.get(field, "NONE")
-            if curr_def_value == "NONE" and isinstance(def_value, FieldInfo):
-                attrs[field] = def_value
-            elif curr_def_value == "NONE" and type_.nullable:
-                attrs[field] = FieldInfo(default=None)
+            attrs = populate_default_field_value(type_, field, attrs)
     return attrs