Simplify

Author: palewire

.github/workflows/continuous-deployment.yaml

@@ -68,7 +68,7 @@ jobs:
           uv pip install ${{ matrix.psycopg }} django==${{ matrix.django }}
 
       - name: Test
-        run: uv run pytest tests
+        run: uv run pytest tests --reuse-db --nomigrations
         env:
           PGPASSWORD: postgres
 

manage.py

@@ -102,10 +102,9 @@ docs = [
 
 
 [tool.pytest.ini_options]
-addopts = "-p no:warnings --cov=postgres_copy --cov-branch -cov-report=term-missing:skip-covered --cov-context=test"
+addopts = "-p no:warnings --cov=postgres_copy --cov-branch -cov-report=term-missing:skip-covered --cov-context=test --reuse-db --nomigrations"
 testpaths = ["tests"]
 python_files = "test_*.py"
-DJANGO_SETTINGS_MODULE = "tests.settings"
 
 [tool.coverage.run]
 source = ["postgres_copy"]

pyproject.toml

@@ -1,64 +1,62 @@
 import os
-import sys
-import pytest
-from django.db import connections
+from pathlib import Path
+from django.conf import settings
 
-# Add the parent directory to sys.path
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+ROOT_DIR = Path(__file__).parent.parent
+PG_USER = os.environ.get("PG_USER", "postgres")
 
 
-@pytest.fixture(scope="session")
-def django_db_setup(django_db_setup, django_db_blocker):
-    """
-    Fixture to set up the test database with the required tables.
-    This extends the built-in django_db_setup fixture.
-    """
-    # Import all test models
-    from tests.test_models import (
-        MockObject,
-        MockFKObject,
-        MockBlankObject,
-        ExtendedMockObject,
-        LimitedMockObject,
-        OverloadMockObject,
-        SecondaryMockObject,
-        UniqueMockObject,
+def pytest_configure():
+    settings.configure(
+        DATABASES={
+            "default": {
+                "HOST": "localhost",
+                "PORT": 5432,
+                "NAME": "test",
+                "USER": PG_USER,
+                "ENGINE": "django.db.backends.postgresql_psycopg2",
+            },
+            "other": {
+                "HOST": "localhost",
+                "PORT": 5432,
+                "NAME": "test_alternative",
+                "USER": PG_USER,
+                "ENGINE": "django.db.backends.postgresql_psycopg2",
+            },
+            "sqlite": {"NAME": "sqlite", "ENGINE": "django.db.backends.sqlite3"},
+            "secondary": {
+                "HOST": "localhost",
+                "PORT": 5432,
+                "NAME": "test_secondary",
+                "USER": PG_USER,
+                "ENGINE": "django.db.backends.postgresql_psycopg2",
+            },
+        },
+        INSTALLED_APPS=("tests",),
+        DATABASE_ROUTERS=["tests.router.CustomRouter"],
+        DEFAULT_AUTO_FIELD="django.db.models.BigAutoField",
+        LOGGING={
+            "version": 1,
+            "disable_existing_loggers": False,
+            "handlers": {
+                "file": {
+                    "level": "DEBUG",
+                    "class": "logging.FileHandler",
+                    "filename": ROOT_DIR / "tests.log",
+                },
+            },
+            "formatters": {
+                "verbose": {
+                    "format": "%(levelname)s|%(asctime)s|%(module)s|%(message)s",
+                    "datefmt": "%d/%b/%Y %H:%M:%S",
+                }
+            },
+            "loggers": {
+                "postgres_copy": {
+                    "handlers": ["file"],
+                    "level": "DEBUG",
+                    "propagate": True,
+                },
+            },
+        },
     )
-
-    with django_db_blocker.unblock():
-        # Check if tables exist and create them if they don't
-        for alias in connections:
-            connection = connections[alias]
-
-            # Get a list of all tables in the database
-            with connection.cursor() as cursor:
-                if connection.vendor == "postgresql":
-                    cursor.execute(
-                        "SELECT tablename FROM pg_tables WHERE schemaname = 'public'"
-                    )
-                    existing_tables = {row[0] for row in cursor.fetchall()}
-                elif connection.vendor == "sqlite":
-                    cursor.execute("SELECT name FROM sqlite_master WHERE type='table'")
-                    existing_tables = {row[0] for row in cursor.fetchall()}
-                else:
-                    existing_tables = set()
-
-                # Create tables that don't exist
-                with connection.schema_editor() as schema_editor:
-                    for model in [
-                        MockObject,
-                        MockFKObject,
-                        MockBlankObject,
-                        ExtendedMockObject,
-                        LimitedMockObject,
-                        OverloadMockObject,
-                        SecondaryMockObject,
-                        UniqueMockObject,
-                    ]:
-                        table_name = model._meta.db_table
-                        if table_name not in existing_tables:
-                            try:
-                                schema_editor.create_model(model)
-                                print(f"Created table {table_name} in {alias}")
-                            except Exception as e:
-                                print(f"Error creating {table_name} in {alias}: {e}")

tests/conftest.py

@@ -3,7 +3,7 @@
 
 from postgres_copy import CopyManager, CopyMapping
 
-from .test_fields import MyIntegerField
+from .fields import MyIntegerField
 
 
 class MockObject(models.Model):