improvement 16635

apache · Sep 21, 2024 · 29ac6c1 · 29ac6c1
1 parent 8f4e698
commit 29ac6c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/schema-check/mysql/running-test.sh b/.github/workflows/schema-check/mysql/running-test.sh
@@ -29,15 +29,15 @@ export SPRING_DATASOURCE_PASSWORD="mysql"
 bash ds_schema_check_test/dev/tools/bin/upgrade-schema.sh
 
 # Install the target version schema and upgrade it
-export SPRING_DATASOURCE_URL="jdbc:mysql://127.0.0.1:3306/dolphinscheduler_${DATABASE_VERSION}?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false"
 docker run -v "./ds_schema_check_test/mysql-connector-java-8.0.16.jar:/opt/dolphinscheduler/tools/libs/mysql-connector-java-8.0.16.jar" \
 --network schema-test apache/dolphinscheduler-tools:${DS_VERSION} -c \
 'export DATABASE="mysql"; \
 export SPRING_DATASOURCE_DRIVER_CLASS_NAME="com.mysql.cj.jdbc.Driver"; \
 export SPRING_DATASOURCE_USERNAME="root"; \
 export SPRING_DATASOURCE_PASSWORD="mysql"; \
-export SPRING_DATASOURCE_URL="jdbc:mysql://mysql:3306/dolphinscheduler_320?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false"; \
+export SPRING_DATASOURCE_URL="jdbc:mysql://mysql:3306/dolphinscheduler_${DATABASE_VERSION}?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false"; \
 bash tools/bin/upgrade-schema.sh'
+export SPRING_DATASOURCE_URL="jdbc:mysql://127.0.0.1:3306/dolphinscheduler_${DATABASE_VERSION}?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false"
 bash ds_schema_check_test/dev/tools/bin/upgrade-schema.sh
 
 # Compare the schema

diff --git a/.github/workflows/schema-check/postgresql/running-test.sh b/.github/workflows/schema-check/postgresql/running-test.sh
@@ -29,14 +29,14 @@ export SPRING_DATASOURCE_URL="jdbc:postgresql://127.0.0.1:5432/dolphinscheduler_
 bash ds_schema_check_test/dev/tools/bin/upgrade-schema.sh
 
 # Install the target version schema and upgrade it
-export SPRING_DATASOURCE_URL="jdbc:postgresql://127.0.0.1:5432/dolphinscheduler_${DATABASE_VERSION}"
 docker run --network schema-test apache/dolphinscheduler-tools:${DS_VERSION} -c \
 'export DATABASE="postgresql"; \
 export SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver"; \
 export SPRING_DATASOURCE_USERNAME="postgres"; \
 export SPRING_DATASOURCE_PASSWORD="postgres"; \
 SPRING_DATASOURCE_URL="jdbc:postgresql://postgres:5432/dolphinscheduler_${DATABASE_VERSION}"; \
 bash tools/bin/upgrade-schema.sh'
+export SPRING_DATASOURCE_URL="jdbc:postgresql://127.0.0.1:5432/dolphinscheduler_${DATABASE_VERSION}"
 bash ds_schema_check_test/dev/tools/bin/upgrade-schema.sh
 
 # Compare the schema