switch from class to instance fro fields

tests/test_inheritance_concrete.py

@@ -193,8 +193,8 @@ def test_field_redefining_in_concrete_models():
         created_date: str = ormar.String(max_length=200, name="creation_date")
 
     changed_field = RedefinedField.Meta.model_fields["created_date"]
-    assert changed_field.default is None
-    assert changed_field.alias == "creation_date"
+    assert changed_field.ormar_default is None
+    assert changed_field.get_alias() == "creation_date"
     assert any(x.name == "creation_date" for x in RedefinedField.Meta.table.columns)
     assert isinstance(
         RedefinedField.Meta.table.columns["creation_date"].type, sa.sql.sqltypes.String,

tests/test_inheritance_mixins.py

@@ -64,8 +64,10 @@ def test_field_redefining():
         id: int = ormar.Integer(primary_key=True)
         created_date: datetime.datetime = ormar.DateTime(name="creation_date")
 
-    assert RedefinedField.Meta.model_fields["created_date"].default is None
-    assert RedefinedField.Meta.model_fields["created_date"].alias == "creation_date"
+    assert RedefinedField.Meta.model_fields["created_date"].ormar_default is None
+    assert (
+        RedefinedField.Meta.model_fields["created_date"].get_alias() == "creation_date"
+    )
     assert any(x.name == "creation_date" for x in RedefinedField.Meta.table.columns)
 
 
@@ -87,8 +89,10 @@ def test_field_redefining_in_second_raises_error():
         id: int = ormar.Integer(primary_key=True)
         created_date: str = ormar.String(max_length=200, name="creation_date")
 
-    assert RedefinedField2.Meta.model_fields["created_date"].default is None
-    assert RedefinedField2.Meta.model_fields["created_date"].alias == "creation_date"
+    assert RedefinedField2.Meta.model_fields["created_date"].ormar_default is None
+    assert (
+        RedefinedField2.Meta.model_fields["created_date"].get_alias() == "creation_date"
+    )
     assert any(x.name == "creation_date" for x in RedefinedField2.Meta.table.columns)
     assert isinstance(
         RedefinedField2.Meta.table.columns["creation_date"].type,

tests/test_model_definition.py

@@ -29,7 +29,7 @@ class ExampleModel(Model):
     test_string: str = ormar.String(max_length=250)
     test_text: str = ormar.Text(default="")
     test_bool: bool = ormar.Boolean(nullable=False)
-    test_float: ormar.Float() = None  # type: ignore
+    test_float = ormar.Float(nullable=True)
     test_datetime = ormar.DateTime(default=datetime.datetime.now)
     test_date = ormar.Date(default=datetime.date.today)
     test_time = ormar.Time(default=datetime.time)

tests/test_models.py

@@ -120,9 +120,9 @@ async def create_test_database():
 
 def test_model_class():
     assert list(User.Meta.model_fields.keys()) == ["id", "name"]
-    assert issubclass(User.Meta.model_fields["id"], pydantic.fields.FieldInfo)
+    assert issubclass(User.Meta.model_fields["id"].__class__, pydantic.fields.FieldInfo)
     assert User.Meta.model_fields["id"].primary_key is True
-    assert issubclass(User.Meta.model_fields["name"], pydantic.fields.FieldInfo)
+    assert isinstance(User.Meta.model_fields["name"], pydantic.fields.FieldInfo)
     assert User.Meta.model_fields["name"].max_length == 100
     assert isinstance(User.Meta.table, sqlalchemy.Table)