Fix enum schema (#715)

* fix schema with enum fields - issue #699

* fix drivers dependencies - make them optional

* fix command

* provide extras

* add bolean field to related model

* add test with select related and boolean

* new test case based on issue

* fix bool issue in postgres limit queries - issue #704

* fix coverage

* bump version and add release info

tests/test_fastapi/test_enum_schema.py

@@ -0,0 +1,33 @@
+from enum import Enum
+
+import databases
+import sqlalchemy
+
+import ormar
+from tests.settings import DATABASE_URL
+
+database = databases.Database(DATABASE_URL, force_rollback=True)
+metadata = sqlalchemy.MetaData()
+
+
+class MyEnum(Enum):
+    SMALL = 1
+    BIG = 2
+
+
+class EnumExample(ormar.Model):
+    class Meta:
+        tablename = "enum_example"
+        metadata = metadata
+        database = database
+
+    id: int = ormar.Integer(primary_key=True)
+    size: MyEnum = ormar.Enum(enum_class=MyEnum, default=MyEnum.SMALL)
+
+
+def test_proper_schema():
+    schema = EnumExample.schema_json()
+    assert (
+        '{"MyEnum": {"title": "MyEnum", "description": "An enumeration.", '
+        '"enum": [1, 2]}}' in schema
+    )

tests/test_relations/test_foreign_keys.py

@@ -34,6 +34,7 @@ class Track(ormar.Model):
     title: str = ormar.String(max_length=100)
     position: int = ormar.Integer()
     play_count: int = ormar.Integer(nullable=True, default=0)
+    is_disabled: bool = ormar.Boolean(default=False)
 
 
 class Cover(ormar.Model):
@@ -350,6 +351,18 @@ async def test_limit_and_offset():
             assert len(tracks) == 1
             assert tracks[0].title == "Sample2"
 
+            album = await Album.objects.select_related("tracks").limit(1).get()
+            assert len(album.tracks) == 3
+            assert album.tracks[0].title == "Sample"
+
+            album = (
+                await Album.objects.select_related("tracks")
+                .limit(1, limit_raw_sql=True)
+                .get()
+            )
+            assert len(album.tracks) == 1
+            assert album.tracks[0].title == "Sample"
+
 
 @pytest.mark.asyncio
 async def test_get_exceptions():

tests/test_relations/test_postgress_select_related_with_limit.py

@@ -0,0 +1,107 @@
+# Models
+import uuid
+from datetime import date
+from enum import Enum
+from typing import Optional
+
+from pydantic import EmailStr
+
+import databases
+import sqlalchemy
+from sqlalchemy import create_engine
+
+import ormar
+import pytest
+
+from tests.settings import DATABASE_URL
+
+database = databases.Database(DATABASE_URL, force_rollback=True)
+metadata = sqlalchemy.MetaData()
+
+
+class PrimaryKeyMixin:
+    id: uuid.UUID = ormar.UUID(primary_key=True, default=uuid.uuid4)
+
+
+class Level(Enum):
+    ADMIN = "0"
+    STAFF = "1"
+
+
+class MainMeta(ormar.ModelMeta):
+    database = database
+    metadata = metadata
+
+
+class User(PrimaryKeyMixin, ormar.Model):
+    """User Model Class to Implement Method for Operations of User Entity"""
+
+    mobile: str = ormar.String(unique=True, index=True, max_length=10)
+    password: str = ormar.String(max_length=128)
+    level: str = ormar.String(
+        max_length=1, choices=list(Level), default=Level.STAFF.value
+    )
+    email: Optional[str] = ormar.String(max_length=255, nullable=True, default=None)
+    avatar: Optional[str] = ormar.String(max_length=255, nullable=True, default=None)
+    fullname: Optional[str] = ormar.String(max_length=64, nullable=True, default=None)
+    is_active: bool = ormar.Boolean(index=True, nullable=False, default=True)
+
+    class Meta(MainMeta):
+        orders_by = ["-is_active", "-level"]
+
+
+class Task(PrimaryKeyMixin, ormar.Model):
+    """Task Model Class to Implement Method for Operations of Task Entity"""
+
+    name: str = ormar.String(max_length=64, nullalbe=False)
+    description: Optional[str] = ormar.Text(nullable=True, default=None)
+    start_date: Optional[date] = ormar.Date(nullable=True, default=None)
+    end_date: Optional[date] = ormar.Date(nullable=True, default=None)
+    is_halted: bool = ormar.Boolean(index=True, nullable=False, default=True)
+    user: User = ormar.ForeignKey(to=User)
+
+    class Meta(MainMeta):
+        orders_by = ["-end_date", "-start_date"]
+        constraints = [
+            ormar.UniqueColumns("user", "name"),
+        ]
+
+
+@pytest.fixture(autouse=True, scope="module")
+def create_test_database():
+    engine = create_engine(DATABASE_URL)
+    metadata.create_all(engine)
+    yield
+    metadata.drop_all(engine)
+
+
+@pytest.mark.asyncio
+async def test_selecting_related_with_limit():
+    async with database:
+        user1 = await User(mobile="9928917653", password="pass1").save()
+        user2 = await User(mobile="9928917654", password="pass2").save()
+        await Task(name="one", user=user1).save()
+        await Task(name="two", user=user1).save()
+        await Task(name="three", user=user2).save()
+        await Task(name="four", user=user2).save()
+
+        users = (
+            await User.objects.limit(2, limit_raw_sql=True)
+            .select_related(User.tasks)
+            .all()
+        )
+        users2 = (
+            await User.objects.select_related(User.tasks)
+            .limit(2, limit_raw_sql=True)
+            .all()
+        )
+        assert users == users2
+        assert len(users) == 1
+        assert len(users[0].tasks) == 2
+
+        users3 = await User.objects.limit(2).select_related(User.tasks).all()
+        users4 = await User.objects.select_related(User.tasks).limit(2).all()
+        assert users3 == users4
+        assert len(users3) == 2
+        assert len(users3[0].tasks) == 2
+        assert len(users3[1].tasks) == 2