Skip to content

Commit 2822517

Browse files
feeblefakieKodaiD
andauthored
Backport to branch(3.13) : Remove SQL Server set up for duplicate permission tests (#2972)
Co-authored-by: Kodai Doki <[email protected]>
1 parent 3859ef5 commit 2822517

File tree

2 files changed

+15
-110
lines changed

2 files changed

+15
-110
lines changed

.github/workflows/ci.yaml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,6 +1151,10 @@ jobs:
11511151
sa-password: "SqlServer17"
11521152
version: 2017
11531153

1154+
- name: Create database with Japanese collation for integration test
1155+
run: |
1156+
sqlcmd -S localhost -U sa -P SqlServer17 -Q "CREATE DATABASE test_db COLLATE Japanese_BIN2;"
1157+
11541158
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
11551159
uses: actions/setup-java@v4
11561160
with:
@@ -1188,16 +1192,11 @@ jobs:
11881192
}
11891193
echo "JAVA_HOME=C:\Program Files\Java\${jdk_root_dir}" >> ${env:GITHUB_ENV}
11901194
1191-
- name: Create no superuser
1192-
run: ./ci/no-superuser/create-no-superuser-sqlserver.sh SqlServer17 10 3
1193-
shell: bash
1194-
timeout-minutes: 1
1195-
11961195
- name: Setup Gradle
11971196
uses: gradle/actions/setup-gradle@v4
11981197

11991198
- name: Execute Gradle 'integrationTestJdbc' task
1200-
run: ./gradlew.bat integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" "-Dfile.encoding=UTF-8" "-Dscalardb.jdbc.username=no_superuser" "-Dscalardb.jdbc.password=no_superuser_password" ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
1199+
run: ./gradlew.bat integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" "-Dfile.encoding=UTF-8" "-Dscalardb.jdbc.username=sa" "-Dscalardb.jdbc.password=SqlServer17" ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
12011200

12021201
- name: Upload Gradle test reports
12031202
if: always()
@@ -1232,6 +1231,10 @@ jobs:
12321231
steps:
12331232
- uses: actions/checkout@v5
12341233

1234+
- name: Create database with Japanese collation for integration test
1235+
run: |
1236+
docker exec sqlserver19 /opt/mssql-tools18/bin/sqlcmd -S localhost -C -U sa -P SqlServer19 -Q "CREATE DATABASE test_db COLLATE Japanese_BIN2;"
1237+
12351238
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
12361239
uses: actions/setup-java@v4
12371240
with:
@@ -1259,15 +1262,11 @@ jobs:
12591262
container_id=$(docker create "container-registry.oracle.com/java/jdk:${{ env.INT_TEST_JAVA_RUNTIME_VERSION }}")
12601263
docker cp -L "$container_id:/usr/java/default" /usr/lib/jvm/oracle-jdk && docker rm "$container_id"
12611264
1262-
- name: Create no superuser
1263-
run: ./ci/no-superuser/create-no-superuser-sqlserver.sh SqlServer19 10 3 sqlserver19
1264-
timeout-minutes: 1
1265-
12661265
- name: Setup Gradle
12671266
uses: gradle/actions/setup-gradle@v4
12681267

12691268
- name: Execute Gradle 'integrationTestJdbc' task
1270-
run: ./gradlew integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" -Dscalardb.jdbc.username=no_superuser -Dscalardb.jdbc.password=no_superuser_password ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
1269+
run: ./gradlew integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer19 ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
12711270

12721271
- name: Upload Gradle test reports
12731272
if: always()
@@ -1302,6 +1301,10 @@ jobs:
13021301
steps:
13031302
- uses: actions/checkout@v5
13041303

1304+
- name: Create database with Japanese collation for integration test
1305+
run: |
1306+
docker exec sqlserver22 /opt/mssql-tools18/bin/sqlcmd -S localhost -C -U sa -P SqlServer22 -Q "CREATE DATABASE test_db COLLATE Japanese_BIN2;"
1307+
13051308
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
13061309
uses: actions/setup-java@v4
13071310
with:
@@ -1329,15 +1332,11 @@ jobs:
13291332
container_id=$(docker create "container-registry.oracle.com/java/jdk:${{ env.INT_TEST_JAVA_RUNTIME_VERSION }}")
13301333
docker cp -L "$container_id:/usr/java/default" /usr/lib/jvm/oracle-jdk && docker rm "$container_id"
13311334
1332-
- name: Create no superuser
1333-
run: ./ci/no-superuser/create-no-superuser-sqlserver.sh SqlServer22 10 3 sqlserver22
1334-
timeout-minutes: 1
1335-
13361335
- name: Setup Gradle
13371336
uses: gradle/actions/setup-gradle@v4
13381337

13391338
- name: Execute Gradle 'integrationTestJdbc' task
1340-
run: ./gradlew integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" -Dscalardb.jdbc.username=no_superuser -Dscalardb.jdbc.password=no_superuser_password ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
1339+
run: ./gradlew integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer22 ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
13411340

13421341
- name: Upload Gradle test reports
13431342
if: always()

ci/no-superuser/create-no-superuser-sqlserver.sh

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)