fix #41 #43

error when trying to apply migrations to another database

Author: jayvynl

.github/workflows/base-test.yml

@@ -33,11 +33,6 @@ jobs:
         python -m pip install tox
     - name: Lint code
       run: tox -e lint
-    - name: Cache docker image
-      uses: actions/cache@v3
-      with:
-        path: /var/lib/docker/image/overlay2
-        key: docker-image-${{ hashFiles('compose.yaml') }}
     - name: Start clickhouse cluster
       run: docker compose up -d --wait
     - name: Run test

clickhouse-config/node1/network-and-logging.xml

@@ -4,9 +4,8 @@
   <listen_host>0.0.0.0</listen_host>
   <listen_try>1</listen_try>
 
-  <!--
   <logger>
-      <console>1</console>
+    <level>warning</level>
+    <console>1</console>
   </logger>
-  -->
 </clickhouse>

clickhouse-config/node2/network-and-logging.xml

@@ -4,9 +4,8 @@
   <listen_host>0.0.0.0</listen_host>
   <listen_try>1</listen_try>
 
-  <!--
   <logger>
-      <console>1</console>
+    <level>warning</level>
+    <console>1</console>
   </logger>
-  -->
 </clickhouse>

clickhouse-config/node3/network-and-logging.xml

@@ -4,9 +4,8 @@
   <listen_host>0.0.0.0</listen_host>
   <listen_try>1</listen_try>
 
-  <!--
   <logger>
-      <console>1</console>
+    <level>warning</level>
+    <console>1</console>
   </logger>
-  -->
 </clickhouse>

clickhouse-config/node4/network-and-logging.xml

@@ -4,9 +4,8 @@
   <listen_host>0.0.0.0</listen_host>
   <listen_try>1</listen_try>
 
-  <!--
   <logger>
-      <console>1</console>
+    <level>warning</level>
+    <console>1</console>
   </logger>
-  -->
 </clickhouse>

clickhouse_backend/patch/migrations.py

@@ -75,7 +75,7 @@ def __str__(self):
                 class Migration(django_models.Model):
                     app = django_models.CharField(max_length=255)
                     name = django_models.CharField(max_length=255)
-                    applied = models.DateTimeField(default=now)
+                    applied = django_models.DateTimeField(default=now)
 
                     class Meta:
                         apps = Apps()

compose.yaml

@@ -1,8 +1,6 @@
 x-base-service: &base-service
   image: clickhouse/clickhouse-server:23.6.2.18
   restart: always
-  environment:
-    - "CLICKHOUSE_DB=other"
   ulimits:
     nofile:
       soft: 262144

tests/aggregation/models.py

@@ -1,9 +1,7 @@
 from django.db import models
 
-from clickhouse_backend.models import ClickhouseModel
 
-
-class Author(ClickhouseModel):
+class Author(models.Model):
     name = models.CharField(max_length=100)
     age = models.IntegerField()
     friends = models.ManyToManyField("self", blank=True)
@@ -13,15 +11,15 @@ def __str__(self):
         return self.name
 
 
-class Publisher(ClickhouseModel):
+class Publisher(models.Model):
     name = models.CharField(max_length=255)
     num_awards = models.IntegerField()
 
     def __str__(self):
         return self.name
 
 
-class Book(ClickhouseModel):
+class Book(models.Model):
     isbn = models.CharField(max_length=9)
     name = models.CharField(max_length=255)
     pages = models.IntegerField()
@@ -36,7 +34,7 @@ def __str__(self):
         return self.name
 
 
-class Store(ClickhouseModel):
+class Store(models.Model):
     name = models.CharField(max_length=255)
     books = models.ManyToManyField(Book)
     original_opening = models.DateTimeField()

tests/aggregation_regress/models.py

@@ -1,20 +1,18 @@
 from django.db import models
 
-from clickhouse_backend.models import ClickhouseModel
 
-
-class Author(ClickhouseModel):
+class Author(models.Model):
     name = models.CharField(max_length=100)
     age = models.IntegerField()
     friends = models.ManyToManyField("self", blank=True)
 
 
-class Publisher(ClickhouseModel):
+class Publisher(models.Model):
     name = models.CharField(max_length=255)
     num_awards = models.IntegerField()
 
 
-class Book(ClickhouseModel):
+class Book(models.Model):
     isbn = models.CharField(max_length=9)
     name = models.CharField(max_length=255)
     pages = models.IntegerField()
@@ -29,7 +27,7 @@ class Meta:
         ordering = ("name",)
 
 
-class Store(ClickhouseModel):
+class Store(models.Model):
     name = models.CharField(max_length=255)
     books = models.ManyToManyField(Book)
     original_opening = models.DateTimeField()
@@ -40,20 +38,20 @@ class HardbackBook(Book):
 
 
 # Models for ticket #21150
-class Alfa(ClickhouseModel):
+class Alfa(models.Model):
     name = models.CharField(max_length=10, null=True)
 
 
-class Bravo(ClickhouseModel):
+class Bravo(models.Model):
     pass
 
 
-class Charlie(ClickhouseModel):
+class Charlie(models.Model):
     alfa = models.ForeignKey(Alfa, models.SET_NULL, null=True)
     bravo = models.ForeignKey(Bravo, models.SET_NULL, null=True)
 
 
-class SelfRefFK(ClickhouseModel):
+class SelfRefFK(models.Model):
     name = models.CharField(max_length=50)
     parent = models.ForeignKey(
         "self", models.SET_NULL, null=True, blank=True, related_name="children"

tests/annotations/models.py

@@ -1,20 +1,18 @@
 from django.db import models
 
-from clickhouse_backend.models import ClickhouseModel
 
-
-class Author(ClickhouseModel):
+class Author(models.Model):
     name = models.CharField(max_length=100)
     age = models.IntegerField()
     friends = models.ManyToManyField("self", blank=True)
 
 
-class Publisher(ClickhouseModel):
+class Publisher(models.Model):
     name = models.CharField(max_length=255)
     num_awards = models.IntegerField()
 
 
-class Book(ClickhouseModel):
+class Book(models.Model):
     isbn = models.CharField(max_length=9)
     name = models.CharField(max_length=255)
     pages = models.IntegerField()
@@ -26,7 +24,7 @@ class Book(ClickhouseModel):
     pubdate = models.DateField()
 
 
-class Store(ClickhouseModel):
+class Store(models.Model):
     name = models.CharField(max_length=255)
     books = models.ManyToManyField(Book)
     original_opening = models.DateTimeField()
@@ -37,7 +35,7 @@ class DepartmentStore(Store):
     chain = models.CharField(max_length=255)
 
 
-class Employee(ClickhouseModel):
+class Employee(models.Model):
     # The order of these fields matter, do not change. Certain backends
     # rely on field ordering to perform database conversions, and this
     # model helps to test that.
@@ -49,12 +47,12 @@ class Employee(ClickhouseModel):
     salary = models.DecimalField(max_digits=8, decimal_places=2)
 
 
-class Company(ClickhouseModel):
+class Company(models.Model):
     name = models.CharField(max_length=200)
     motto = models.CharField(max_length=200, null=True, blank=True)
     ticker_name = models.CharField(max_length=10, null=True, blank=True)
     description = models.CharField(max_length=200, null=True, blank=True)
 
 
-class Ticket(ClickhouseModel):
+class Ticket(models.Model):
     active_at = models.DateTimeField()