mostly working

tests/test_model_definition.py

@@ -1,4 +1,5 @@
 import datetime
+import decimal
 
 import pydantic
 import pytest
@@ -12,19 +13,21 @@ metadata = sqlalchemy.MetaData()
 
 
 class ExampleModel(Model):
-    __tablename__ = "example"
-    __metadata__ = metadata
-    test = fields.Integer(primary_key=True)
-    test_string = fields.String(length=250)
-    test_text = fields.Text(default="")
-    test_bool = fields.Boolean(nullable=False)
-    test_float = fields.Float()
-    test_datetime = fields.DateTime(default=datetime.datetime.now)
-    test_date = fields.Date(default=datetime.date.today)
-    test_time = fields.Time(default=datetime.time)
-    test_json = fields.JSON(default={})
-    test_bigint = fields.BigInteger(default=0)
-    test_decimal = fields.Decimal(length=10, precision=2)
+    class Meta:
+        tablename = "example"
+        metadata = metadata
+
+    test: fields.Integer(primary_key=True)
+    test_string: fields.String(max_length=250)
+    test_text: fields.Text(default="")
+    test_bool: fields.Boolean(nullable=False)
+    test_float: fields.Float() = None
+    test_datetime: fields.DateTime(default=datetime.datetime.now)
+    test_date: fields.Date(default=datetime.date.today)
+    test_time: fields.Time(default=datetime.time)
+    test_json: fields.JSON(default={})
+    test_bigint: fields.BigInteger(default=0)
+    test_decimal: fields.Decimal(scale=10, precision=2)
 
 
 fields_to_check = [
@@ -41,15 +44,17 @@ fields_to_check = [
 
 
 class ExampleModel2(Model):
-    __tablename__ = "example2"
-    __metadata__ = metadata
-    test = fields.Integer(primary_key=True)
-    test_string = fields.String(length=250)
+    class Meta:
+        tablename = "example2"
+        metadata = metadata
+
+    test: fields.Integer(primary_key=True)
+    test_string: fields.String(max_length=250)
 
 
 @pytest.fixture()
 def example():
-    return ExampleModel(pk=1, test_string="test", test_bool=True)
+    return ExampleModel(pk=1, test_string="test", test_bool=True, test_decimal=decimal.Decimal(3.5))
 
 
 def test_not_nullable_field_is_required():
@@ -83,60 +88,65 @@ def test_primary_key_access_and_setting(example):
 
 
 def test_pydantic_model_is_created(example):
-    assert issubclass(example.values.__class__, pydantic.BaseModel)
-    assert all([field in example.values.__fields__ for field in fields_to_check])
-    assert example.values.test == 1
+    assert issubclass(example.__class__, pydantic.BaseModel)
+    assert all([field in example.__fields__ for field in fields_to_check])
+    assert example.test == 1
 
 
 def test_sqlalchemy_table_is_created(example):
-    assert issubclass(example.__table__.__class__, sqlalchemy.Table)
-    assert all([field in example.__table__.columns for field in fields_to_check])
+    assert issubclass(example.Meta.table.__class__, sqlalchemy.Table)
+    assert all([field in example.Meta.table.columns for field in fields_to_check])
 
 
 def test_no_pk_in_model_definition():
     with pytest.raises(ModelDefinitionError):
-
         class ExampleModel2(Model):
-            __tablename__ = "example3"
-            __metadata__ = metadata
-            test_string = fields.String(length=250)
+            class Meta:
+                tablename = "example3"
+                metadata = metadata
+
+            test_string: fields.String(max_length=250)
 
 
 def test_two_pks_in_model_definition():
     with pytest.raises(ModelDefinitionError):
-
         class ExampleModel2(Model):
-            __tablename__ = "example3"
-            __metadata__ = metadata
-            id = fields.Integer(primary_key=True)
-            test_string = fields.String(length=250, primary_key=True)
+            class Meta:
+                tablename = "example3"
+                metadata = metadata
+
+            id: fields.Integer(primary_key=True)
+            test_string: fields.String(max_length=250, primary_key=True)
 
 
 def test_setting_pk_column_as_pydantic_only_in_model_definition():
     with pytest.raises(ModelDefinitionError):
-
         class ExampleModel2(Model):
-            __tablename__ = "example4"
-            __metadata__ = metadata
-            test = fields.Integer(primary_key=True, pydantic_only=True)
+            class Meta:
+                tablename = "example4"
+                metadata = metadata
+
+            test: fields.Integer(primary_key=True, pydantic_only=True)
 
 
 def test_decimal_error_in_model_definition():
     with pytest.raises(ModelDefinitionError):
-
         class ExampleModel2(Model):
-            __tablename__ = "example4"
-            __metadata__ = metadata
-            test = fields.Decimal(primary_key=True)
+            class Meta:
+                tablename = "example5"
+                metadata = metadata
+
+            test: fields.Decimal(primary_key=True)
 
 
 def test_string_error_in_model_definition():
     with pytest.raises(ModelDefinitionError):
-
         class ExampleModel2(Model):
-            __tablename__ = "example4"
-            __metadata__ = metadata
-            test = fields.String(primary_key=True)
+            class Meta:
+                tablename = "example6"
+                metadata = metadata
+
+            test: fields.String(primary_key=True)
 
 
 def test_json_conversion_in_model():