From 02829af2c77df3fcc9aea3453e66f33e539ec676 Mon Sep 17 00:00:00 2001
From: sander-hash <sanderjongenelen@hotmail.nl>
Date: Wed, 29 Apr 2026 18:00:16 +0200
Subject: [PATCH 1/2] Added posible fix for pipeline

---
 .github/workflows/tests.yml | 18 +++++++++++++-----
 tests/docker-compose.yaml   |  3 ---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d44184a..4318045 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -58,9 +58,6 @@ jobs:
         image: clickhouse/clickhouse-server:26.3.3.20
         ports:
           - 8124:8123
-        env:
-          CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
-          CLICKHOUSE_PASSWORD: ""
         options: >-
           --health-cmd "curl -f http://localhost:8123/ping"
           --health-interval 10s
@@ -82,8 +79,19 @@ jobs:
 
       - name: Copy ClickHouse config for deprecated syntax
         run: |
-          docker cp tests/clickhouse-latest-config/allow_deprecated.xml $(docker ps -q --filter "ancestor=clickhouse/clickhouse-server:26.3.3.20"):/etc/clickhouse-server/users.d/allow_deprecated.xml
-          sleep 2
+          CONTAINER_ID=$(docker ps -q --filter "ancestor=clickhouse/clickhouse-server:26.3.3.20")
+          docker cp tests/clickhouse-latest-config/allow_deprecated.xml "$CONTAINER_ID":/etc/clickhouse-server/users.d/allow_deprecated.xml
+          docker restart "$CONTAINER_ID"
+          for i in {1..30}; do
+            if curl -fs http://127.0.0.1:8124/ping > /dev/null; then
+              echo "ClickHouse ready"
+              exit 0
+            fi
+            sleep 2
+          done
+          echo "ClickHouse failed to become ready"
+          docker logs "$CONTAINER_ID"
+          exit 1
 
       - name: Run tests (ClickHouse 26.3)
         run: ./vendor/bin/phpunit -c phpunit-ch26.xml
diff --git a/tests/docker-compose.yaml b/tests/docker-compose.yaml
index 9ded376..f637935 100644
--- a/tests/docker-compose.yaml
+++ b/tests/docker-compose.yaml
@@ -21,9 +21,6 @@ services:
         image: clickhouse/clickhouse-server:26.3.3.20
         hostname: clickhouse-latest
         container_name: clickhouse-latest
-        environment:
-            CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
-            CLICKHOUSE_PASSWORD: ""
         ports:
         - 19001:9000
         - 8124:8123

From aa5fe194f8678a9c4c87adc18c1ebd91b15c0be3 Mon Sep 17 00:00:00 2001
From: sander-hash <sanderjongenelen@hotmail.nl>
Date: Wed, 29 Apr 2026 18:04:28 +0200
Subject: [PATCH 2/2] Revert local test

---
 tests/docker-compose.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/docker-compose.yaml b/tests/docker-compose.yaml
index f637935..9ded376 100644
--- a/tests/docker-compose.yaml
+++ b/tests/docker-compose.yaml
@@ -21,6 +21,9 @@ services:
         image: clickhouse/clickhouse-server:26.3.3.20
         hostname: clickhouse-latest
         container_name: clickhouse-latest
+        environment:
+            CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
+            CLICKHOUSE_PASSWORD: ""
         ports:
         - 19001:9000
         - 8124:8123