bugfix: clickhouse change exception text in new version so we check t…

…able via system table

Makefile

@@ -26,3 +26,8 @@ ci:
 	docker compose -f test-dockerfiles/docker-compose.ci.yml down
 	docker compose -f test-dockerfiles/docker-compose.ci.yml up --build chmfc
 	docker compose -f test-dockerfiles/docker-compose.ci.yml down
+
+	docker-compose -f test-dockerfiles/docker-compose.ci.23.8.yml rm -f
+	docker compose -f test-dockerfiles/docker-compose.ci.23.8.yml down
+	docker compose -f test-dockerfiles/docker-compose.ci.23.8.yml up --build chmfc
+	docker compose -f test-dockerfiles/docker-compose.ci.23.8.yml down

chmfc.py

@@ -25,22 +25,15 @@
 
 def check_or_create_migrations_table(client: Client):
     # check migrations table and create it if needs
-    exists = True
-    try:
-        ch_client.execute(rule_queries.exists_migrations_table())
-    except Exception as e:
-        if f"Table {migrations_table} doesn't exist" in str(e):
-            create_shards, create_distributed = rule_queries.create_migrations_table()
-            ch_client.execute(create_shards)
-            ch_client.execute(create_distributed)
-
-            exists = False
-            logger.info(f"Table {migrations_table} has been created.")
-        else:
-            raise CHMFCBaseError(e)
-
-    if exists:
+    migrations_tables_exists = ch_client.execute(rule_queries.exists_migrations_table())
+    if migrations_tables_exists:
         logger.info(f"Table {migrations_table} exists.")
+    else:
+        create_shards, create_distributed = rule_queries.create_migrations_table()
+        ch_client.execute(create_shards)
+        ch_client.execute(create_distributed)
+
+        logger.info(f"Table {migrations_table} has been created.")
 
 
 def handle_migration(client: Client, version: int, v: Migration):

test-dockerfiles/docker-compose.ci.23.8.yml

@@ -0,0 +1,74 @@
+version: '2.4'
+
+services:
+
+  chmfc:
+    build:
+      context: ../
+      dockerfile: Dockerfile
+    container_name: chmfc
+    environment:
+      CHMFC_CH_HOST: clickhouse
+      CHMFC_CH_LOGIN: test
+      CHMFC_CH_PASSWORD: test
+      CHMFC_CH_DATABASE: default
+      CHMFC_MIG_PATH: /migrations
+      CHMFC_MIG_TABLE: default.migrations
+    volumes:
+      - ../test-migrations:/migrations
+    depends_on:
+      clickhouse:
+        condition: service_healthy
+      clickhouse1:
+        condition: service_healthy
+
+  clickhouse:
+    image: clickhouse/clickhouse-server:23.8
+    container_name: test_clickhouse
+    volumes:
+      - ./clickhouse/macros.xml:/etc/clickhouse-server/conf.d/macros.xml
+      - ./clickhouse/zookeeper.xml:/etc/clickhouse-server/conf.d/zookeeper.xml
+      - ./clickhouse/remote_servers.xml:/etc/clickhouse-server/config.d/remote_servers.xml
+    environment:
+      CLICKHOUSE_DB: test
+      CLICKHOUSE_USER: test
+      CLICKHOUSE_PASSWORD: test
+      REPLICA_NAME: clickhouse
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "http://localhost:8123/ping"]
+      interval: 5s
+      timeout: 3s
+      retries: 3
+    depends_on:
+      zookeeper:
+        condition: service_started
+
+  clickhouse1:
+    image: clickhouse/clickhouse-server:23.8
+    container_name: test_clickhouse1
+    volumes:
+      - ./clickhouse/macros.xml:/etc/clickhouse-server/conf.d/macros.xml
+      - ./clickhouse/zookeeper.xml:/etc/clickhouse-server/conf.d/zookeeper.xml
+      - ./clickhouse/remote_servers.xml:/etc/clickhouse-server/config.d/remote_servers.xml
+    environment:
+      CLICKHOUSE_DB: test
+      CLICKHOUSE_USER: test
+      CLICKHOUSE_PASSWORD: test
+      REPLICA_NAME: clickhouse1
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "http://localhost:8123/ping"]
+      interval: 5s
+      timeout: 3s
+      retries: 3
+    depends_on:
+      zookeeper:
+        condition: service_started
+
+  zookeeper:
+    image: zookeeper:3.5
+    container_name: zookeeper
+    hostname: zookeeper
+
+networks:
+  default:
+    name: test

test-dockerfiles/docker-compose.yml

@@ -3,7 +3,7 @@ version: '2.4'
 services:
 
   clickhouse:
-    image: yandex/clickhouse-server:21.8.5.7
+    image: clickhouse/clickhouse-server:23.8
     container_name: test_clickhouse
     volumes:
       - ./clickhouse/macros.xml:/etc/clickhouse-server/conf.d/macros.xml
@@ -24,7 +24,7 @@ services:
         condition: service_started
 
   clickhouse1:
-    image: yandex/clickhouse-server:21.8.5.7
+    image: clickhouse/clickhouse-server:23.8
     container_name: test_clickhouse1
     volumes:
       - ./clickhouse/macros.xml:/etc/clickhouse-server/conf.d/macros.xml

utils/queries.py

@@ -5,7 +5,7 @@ def __init__(self, migrations_table: str):
         self.table = migrations_table.split('.')[1]
 
     def exists_migrations_table(self):
-        return f'select version from {self.migrations_table} limit 1'
+        return f"select uuid from system.tables where database = '{self.schema}' and name = '{self.table}'"
 
     def create_migrations_table(self):
         create_shards_query = '''