Fixed environment variable names depending on test implementation.

Author: masato-hi

.github/workflows/sqlx.yml

@@ -534,20 +534,20 @@ jobs:
       - run: cargo build --features any,postgres,mysql,macros,migrate,_unstable-all-types,runtime-${{ matrix.runtime }}
 
       - run: |
-          docker compose -f tests/docker-compose.yml run -d -p 5432:5432 --name postgres_${{ matrix.postgres }} postgres_${{ matrix.postgres }}
-          docker exec postgres_${{ matrix.postgres }} bash -c "until pg_isready; do sleep 1; done"
+          docker compose -f tests/docker-compose.yml run -d -p 5432:5432 --name postgres_1_${{ matrix.postgres }} postgres_${{ matrix.postgres }}
+          docker exec postgres_1_${{ matrix.postgres }} bash -c "until pg_isready; do sleep 1; done"
 
       - run: |
-          docker compose -f tests/docker-compose.yml run -d -p 5433:5432 --name postgres_users_${{ matrix.postgres }} postgres_${{ matrix.postgres }}
-          docker exec postgres_users_${{ matrix.postgres }} bash -c "until pg_isready; do sleep 1; done"
+          docker compose -f tests/docker-compose.yml run -d -p 5433:5432 --name postgres_2_${{ matrix.postgres }} postgres_${{ matrix.postgres }}
+          docker exec postgres_2_${{ matrix.postgres }} bash -c "until pg_isready; do sleep 1; done"
 
       - run: |
-          docker compose -f tests/docker-compose.yml run -d -p 3306:3306 --name mysql_posts_${{ matrix.mysql }} mysql_${{ matrix.mysql }}
-          docker exec mysql_posts_${{ matrix.mysql }} bash -c "until mysqladmin ping; do sleep 1; done"
+          docker compose -f tests/docker-compose.yml run -d -p 3306:3306 --name mysql_1_${{ matrix.mysql }} mysql_${{ matrix.mysql }}
+          docker exec mysql_1_${{ matrix.mysql }} bash -c "until mysqladmin ping; do sleep 1; done"
 
       - run: |
-          docker compose -f tests/docker-compose.yml run -d -p 3307:3306 --name mysql_comments_${{ matrix.mysql }} mysql_${{ matrix.mysql }}
-          docker exec mysql_comments_${{ matrix.mysql }} bash -c "until mysqladmin ping; do sleep 1; done"
+          docker compose -f tests/docker-compose.yml run -d -p 3307:3306 --name mysql_2_${{ matrix.mysql }} mysql_${{ matrix.mysql }}
+          docker exec mysql_2_${{ matrix.mysql }} bash -c "until mysqladmin ping; do sleep 1; done"
 
       # Create data dir for offline mode
       - run: mkdir .sqlx
@@ -560,9 +560,10 @@ jobs:
           --features any,postgres,mysql,macros,migrate,_unstable-all-types,runtime-${{ matrix.runtime }}
         env:
           DATABASE_URL: postgres://postgres:password@localhost:5432/sqlx
-          PG_USERS_DATABASE_URL: postgres://postgres:password@localhost:5433/sqlx
-          MYSQL_POSTS_DATABASE_URL: mysql://root:password@localhost:3306/sqlx
-          MYSQL_COMMENTS_DATABASE_URL: mysql://root:password@localhost:3307/sqlx
+          PG_1_DATABASE_URL: postgres://postgres:password@localhost:5432/sqlx
+          PG_2_DATABASE_URL: postgres://postgres:password@localhost:5433/sqlx
+          MYSQL_1_DATABASE_URL: mysql://root:password@localhost:3306/sqlx
+          MYSQL_2_DATABASE_URL: mysql://root:password@localhost:3307/sqlx
           SQLX_OFFLINE_DIR: .sqlx
           RUSTFLAGS: -D warnings --cfg postgres="${{ matrix.postgres }}" --cfg mysql_${{ matrix.mysql }}
 

tests/mixed/test-attr.rs

@@ -5,25 +5,25 @@ use sqlx::{MySqlPool, PgPool};
 const PG_MIGRATOR: sqlx::migrate::Migrator = sqlx::migrate!("tests/postgres/migrations");
 const MYSQL_MIGRATOR: sqlx::migrate::Migrator = sqlx::migrate!("tests/mysql/migrations");
 
-const PG_USERS_DATABASE_URL: &'static str = "PG_USERS_DATABASE_URL";
-const MYSQL_COMMENTS_DATABASE_URL: &'static str = "MYSQL_COMMENTS_DATABASE_URL";
+const PG_2_DATABASE_URL: &'static str = "PG_2_DATABASE_URL";
+const MYSQL_2_DATABASE_URL: &'static str = "MYSQL_2_DATABASE_URL";
 
 #[sqlx::test(
     env(migrations = "tests/postgres/migrations"), // no database url var
     env(
         migrator = "PG_MIGRATOR",
         fixtures(path = "fixtures/postgres", scripts("users")),
-        var = "PG_USERS_DATABASE_URL", // rust path
+        var = "PG_2_DATABASE_URL", // rust path
     ),
     env(
         migrations = "tests/mysql/migrations",
         fixtures(path = "fixtures/mysql", scripts("posts")),
-        var("MYSQL_POSTS_DATABASE_URL"), // string literal
+        var("MYSQL_1_DATABASE_URL"), // string literal
     ),
     env(
         migrator = "MYSQL_MIGRATOR",
         fixtures(path = "fixtures/mysql", scripts("comments")),
-        var = "MYSQL_COMMENTS_DATABASE_URL", // rust path
+        var = "MYSQL_2_DATABASE_URL", // rust path
     ),
 )]
 async fn it_gets_from_invidual_environments(