switch pool for sqlite with new factory, add tests if fks are reflected in db

tests/test_cascades.py

@@ -1,27 +1,14 @@
-import time
 from typing import Optional
 
 import databases
 import pytest
 import sqlalchemy
-from sqlalchemy import (
-    Column,
-    ForeignKey,
-    ForeignKeyConstraint,
-    Integer,
-    String,
-    Table,
-    create_engine,
-    inspect,
-)
-from sqlalchemy.dialects import postgresql
 
 import ormar
 from tests.settings import DATABASE_URL
 
 database = databases.Database(DATABASE_URL)
 metadata = sqlalchemy.MetaData()
-engine = sqlalchemy.create_engine(DATABASE_URL, echo=True)
 
 
 class Artist(ormar.Model):
@@ -45,43 +32,34 @@ class Album(ormar.Model):
     artist: Optional[Artist] = ormar.ForeignKey(Artist, ondelete="CASCADE")
 
 
-#
-# class Track(ormar.Model):
-#     class Meta:
-#         tablename = "tracks"
-#         metadata = metadata
-#         database = database
-#
-#     id: int = ormar.Integer(primary_key=True)
-#     album: Optional[Album] = ormar.ForeignKey(Album, ondelete='CASCADE')
-#     title: str = ormar.String(max_length=100)
+class Track(ormar.Model):
+    class Meta:
+        tablename = "tracks"
+        metadata = metadata
+        database = database
+
+    id: int = ormar.Integer(primary_key=True)
+    album: Optional[Album] = ormar.ForeignKey(Album, ondelete="CASCADE")
+    title: str = ormar.String(max_length=100)
 
 
 @pytest.fixture(autouse=True, scope="module")
 def create_test_database():
-    # if "sqlite" in DATABASE_URL:
-    #     with engine.connect() as connection:
-    #         connection.execute("PRAGMA foreign_keys = ON;")
+    engine = sqlalchemy.create_engine(DATABASE_URL)
     metadata.drop_all(engine)
     metadata.create_all(engine)
-    # tables = list(metadata.tables.values())
-    # tab = Album.Meta.table
-    # breakpoint()
     yield
-    # metadata.drop_all(engine)
+    metadata.drop_all(engine)
 
 
 @pytest.mark.asyncio
 async def test_simple_cascade():
     async with database:
-        # async with database.transaction(force_rollback=True):
         artist = await Artist(name="Dr Alban").save()
         await Album(name="Jamaica", artist=artist).save()
         await Artist.objects.delete(id=artist.id)
-
         artists = await Artist.objects.all()
         assert len(artists) == 0
 
-    async with database:
         albums = await Album.objects.all()
         assert len(albums) == 0

tests/test_database_fk_creation.py

@@ -0,0 +1,55 @@
+from typing import Optional
+
+import databases
+import pytest
+import sqlalchemy
+
+import ormar
+from tests.settings import DATABASE_URL
+
+database = databases.Database(DATABASE_URL)
+metadata = sqlalchemy.MetaData()
+engine = sqlalchemy.create_engine(DATABASE_URL)
+
+
+class Artist(ormar.Model):
+    class Meta:
+        tablename = "artists"
+        metadata = metadata
+        database = database
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=100)
+
+
+class Album(ormar.Model):
+    class Meta:
+        tablename = "albums"
+        metadata = metadata
+        database = database
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=100)
+    artist: Optional[Artist] = ormar.ForeignKey(Artist, ondelete="CASCADE")
+
+
+@pytest.fixture(autouse=True, scope="module")
+def create_test_database():
+    metadata.drop_all(engine)
+    metadata.create_all(engine)
+    yield
+    metadata.drop_all(engine)
+
+
+def test_simple_cascade():
+    inspector = sqlalchemy.inspect(engine)
+    columns = inspector.get_columns("albums")
+    assert len(columns) == 3
+    col_names = [col.get("name") for col in columns]
+    assert sorted(["id", "name", "artist"]) == sorted(col_names)
+    fks = inspector.get_foreign_keys("albums")
+    assert len(fks) == 1
+    assert fks[0]["name"] == "fk_albums_artists_id_artist"
+    assert fks[0]["constrained_columns"][0] == "artist"
+    assert fks[0]["referred_columns"][0] == "id"
+    assert fks[0]["options"].get("ondelete") == "CASCADE"

tests/test_model_definition.py

@@ -3,6 +3,7 @@ import asyncio
 import datetime
 import decimal
 
+import databases
 import pydantic
 import pytest
 import sqlalchemy
@@ -14,12 +15,16 @@ from ormar.models import Model
 from tests.settings import DATABASE_URL
 
 metadata = sqlalchemy.MetaData()
+from tests.settings import DATABASE_URL
+
+database = databases.Database(DATABASE_URL, force_rollback=True)
 
 
 class ExampleModel(Model):
     class Meta:
         tablename = "example"
         metadata = metadata
+        database = database
 
     test: int = ormar.Integer(primary_key=True)
     test_string: str = ormar.String(max_length=250)
@@ -52,6 +57,7 @@ class ExampleModel2(Model):
     class Meta:
         tablename = "examples"
         metadata = metadata
+        database = database
 
     test: int = ormar.Integer(primary_key=True)
     test_string: str = ormar.String(max_length=250)