From d9d8abadc43e578d53ccbf17be9340eb5c7eb4a8 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki <jyri-petteri.paloposki@iki.fi>
Date: Wed, 23 Oct 2024 01:52:02 +0300
Subject: [PATCH] Use correct var for detecting MySQL

---
 script/poll-for-db                    | 2 +-
 test-envs/docker-compose-mysql.yml    | 2 +-
 test-envs/docker-compose-postgres.yml | 2 +-
 test-envs/docker-compose-sqlite.yml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/script/poll-for-db b/script/poll-for-db
index 69b41fae3..33dd77091 100755
--- a/script/poll-for-db
+++ b/script/poll-for-db
@@ -2,7 +2,7 @@
 
 echo "==> Polling DB…"
 
-if [ "$DATABASE_TYPE" == "mysql" ]; then
+if [ "$2" == "mysql" ]; then
   appdir=$(cd $(dirname "$0")/.. && pwd)
   [ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@
 
diff --git a/test-envs/docker-compose-mysql.yml b/test-envs/docker-compose-mysql.yml
index b6edacf0e..a16effe7f 100644
--- a/test-envs/docker-compose-mysql.yml
+++ b/test-envs/docker-compose-mysql.yml
@@ -11,7 +11,7 @@ services:
       args:
         RUBY_VERSION: ${RUBY_VERSION}
     environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
+      # These are set in script/cibuild, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
       DATABASE_NAME: $DATABASE_NAME
       DATABASE_USERNAME: root
diff --git a/test-envs/docker-compose-postgres.yml b/test-envs/docker-compose-postgres.yml
index 1e7e7a7dc..ddd54f881 100644
--- a/test-envs/docker-compose-postgres.yml
+++ b/test-envs/docker-compose-postgres.yml
@@ -11,7 +11,7 @@ services:
       args:
         RUBY_VERSION: ${RUBY_VERSION}
     environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
+      # These are set in script/cibuild, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
       DATABASE_NAME: $DATABASE_NAME
       DATABASE_USERNAME: postgres
diff --git a/test-envs/docker-compose-sqlite.yml b/test-envs/docker-compose-sqlite.yml
index 18db5e685..e0ae6af38 100644
--- a/test-envs/docker-compose-sqlite.yml
+++ b/test-envs/docker-compose-sqlite.yml
@@ -6,7 +6,7 @@ services:
       args:
         RUBY_VERSION: ${RUBY_VERSION}
     environment:
-      # These are set in script/ci-build, so we need to pass-thru them.
+      # These are set in script/cibuild, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
       DATABASE_NAME: "/app/db/db.sqlite"
       DATABASE_TYPE: sqlite3