fix #51 (#54)

* fix #51

* fix ci and test

* fix ci

Author: jayvynl

.github/workflows/base-test.yml

@@ -45,11 +45,6 @@ jobs:
         flag-name: run-${{ join(matrix.*, '-') }}
         parallel: true
 
-  release:
-
-    needs: test
-    uses: ./.github/workflows/release.yml
-
   coveralls-finish:
 
     needs: test

.github/workflows/release.yml

@@ -1,10 +1,14 @@
 name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI
 
 on:
-  workflow_call:
+  pull_request:
+    types: [closed]
+    branches: [ "main" ]
+  push:
 
 jobs:
   build:
+    if: github.event.pull_request.merged == true || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
     name: Build distribution 📦
     runs-on: ubuntu-latest
 

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### 1.1.3
 - Fix #50 partition by single expression raise TypeError.
+- Fix #51 .
 
 ### 1.1.2
 - Use [flake8](https://flake8.pycqa.org/) to lint code.

clickhouse_backend/backend/__init__.py

@@ -0,0 +1,3 @@
+from clickhouse_backend.patch import patch_all
+
+patch_all()

clickhouse_backend/models/__init__.py

@@ -1,5 +1,3 @@
-from clickhouse_backend.patch import patch_all
-
 from .base import ClickhouseModel
 from .engines import *  # noqa: F401,F403
 from .engines import __all__ as engines_all
@@ -17,4 +15,3 @@
     *fucntions_all,
     *indexes_all,
 ]
-patch_all()

clickhouse_backend/patch/migrations.py

@@ -12,8 +12,6 @@
 from django.db.migrations.recorder import MigrationRecorder
 from django.utils.timezone import now
 
-from clickhouse_backend import models
-
 __all__ = ["patch_migrations", "patch_migration_recorder", "patch_migration"]
 
 
@@ -30,6 +28,7 @@ def Migration(self):
         """
         if self._migration_class is None:
             if self.connection.vendor == "clickhouse":
+                from clickhouse_backend import models
 
                 class Migration(models.ClickhouseModel):
                     app = models.StringField(max_length=255)
@@ -65,6 +64,19 @@ def __str__(self):
             self._migration_class = Migration
         return self._migration_class
 
+    def has_table(self):
+        """Return True if the django_migrations table exists."""
+        with self.connection.cursor() as cursor:
+            tables = self.connection.introspection.table_names(cursor)
+            if self.Migration._meta.db_table in tables:
+                if self.connection.vendor == "clickhouse":
+                    # fix https://github.com/jayvynl/django-clickhouse-backend/issues/51
+                    cursor.execute(
+                        "ALTER table django_migrations ADD COLUMN IF NOT EXISTS deleted Bool"
+                    )
+                return True
+        return False
+
     def migration_qs(self):
         if self.connection.vendor == "clickhouse":
             return self.Migration.objects.using(self.connection.alias).filter(
@@ -104,6 +116,7 @@ def flush(self):
             self.migration_qs.all().delete()
 
     MigrationRecorder.Migration = property(Migration)
+    MigrationRecorder.has_table = has_table
     MigrationRecorder.migration_qs = property(migration_qs)
     MigrationRecorder.record_applied = record_applied
     MigrationRecorder.record_unapplied = record_unapplied

tests/auth_tests/models/__init__.py

@@ -1,34 +1,17 @@
 from .custom_permissions import CustomPermissionsUser
 from .custom_user import CustomUser, CustomUserWithoutIsActiveField, ExtensionUser
-from .invalid_models import CustomUserNonUniqueUsername
 from .is_active import IsActiveTestUser1
-from .minimal import MinimalUser
-from .no_password import NoPasswordUser
 from .uuid_pk import UUIDUser
 from .with_custom_email_field import CustomEmailField
-from .with_foreign_key import CustomUserWithFK, Email
 from .with_integer_username import IntegerUsernameUser
-from .with_last_login_attr import UserWithDisabledLastLoginField
-from .with_many_to_many import CustomUserWithM2M, CustomUserWithM2MThrough, Organization
-from .with_unique_constraint import CustomUserWithUniqueConstraint
 
 __all__ = (
     "CustomEmailField",
     "CustomPermissionsUser",
     "CustomUser",
-    "CustomUserNonUniqueUsername",
-    "CustomUserWithFK",
-    "CustomUserWithM2M",
-    "CustomUserWithM2MThrough",
-    "CustomUserWithUniqueConstraint",
+    "IsActiveTestUser1",
     "CustomUserWithoutIsActiveField",
-    "Email",
     "ExtensionUser",
     "IntegerUsernameUser",
-    "IsActiveTestUser1",
-    "MinimalUser",
-    "NoPasswordUser",
-    "Organization",
     "UUIDUser",
-    "UserWithDisabledLastLoginField",
 )

tests/auth_tests/models/invalid_models.py

@@ -0,0 +1,15 @@
+from django.core.management import call_command
+from django.db import connection
+from django.test import TestCase
+
+
+class TestMigrationTable(TestCase):
+    # Regression test for https://github.com/jayvynl/django-clickhouse-backend/issues/51
+    def test_update_from_110(self):
+        with connection.cursor() as cursor:
+            cursor.execute("ALTER table django_migrations DROP COLUMN deleted")
+            call_command("migrate", fake=True)
+            fields = connection.introspection.get_table_description(
+                cursor, "django_migrations"
+            )
+            self.assertIn("deleted", {field.name for field in fields})