Skip to content

Commit 4d276c9

Browse files
KodaiDfeeblefakie
andcommitted
Remove SQL Server set up for duplicate permission tests (#2959)
Co-authored-by: Hiroyuki Yamada <[email protected]>
1 parent f4596b8 commit 4d276c9

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
@@ -1147,6 +1147,10 @@ jobs:
11471147
sa-password: "SqlServer17"
11481148
version: 2017
11491149

1150+
- name: Create database with Japanese collation for integration test
1151+
run: |
1152+
sqlcmd -S localhost -U sa -P SqlServer17 -Q "CREATE DATABASE test_db COLLATE Japanese_BIN2;"
1153+
11501154
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
11511155
uses: actions/setup-java@v4
11521156
with:
@@ -1184,16 +1188,11 @@ jobs:
11841188
}
11851189
echo "JAVA_HOME=C:\Program Files\Java\${jdk_root_dir}" >> ${env:GITHUB_ENV}
11861190
1187-
- name: Create no superuser
1188-
run: ./ci/no-superuser/create-no-superuser-sqlserver.sh SqlServer17 10 3
1189-
shell: bash
1190-
timeout-minutes: 1
1191-
11921191
- name: Setup Gradle
11931192
uses: gradle/actions/setup-gradle@v4
11941193

11951194
- name: Execute Gradle 'integrationTestJdbc' task
1196-
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 || '' }}
1195+
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 || '' }}
11971196

11981197
- name: Upload Gradle test reports
11991198
if: always()
@@ -1228,6 +1227,10 @@ jobs:
12281227
steps:
12291228
- uses: actions/checkout@v5
12301229

1230+
- name: Create database with Japanese collation for integration test
1231+
run: |
1232+
docker exec sqlserver19 /opt/mssql-tools18/bin/sqlcmd -S localhost -C -U sa -P SqlServer19 -Q "CREATE DATABASE test_db COLLATE Japanese_BIN2;"
1233+
12311234
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
12321235
uses: actions/setup-java@v4
12331236
with:
@@ -1255,15 +1258,11 @@ jobs:
12551258
container_id=$(docker create "container-registry.oracle.com/java/jdk:${{ env.INT_TEST_JAVA_RUNTIME_VERSION }}")
12561259
docker cp -L "$container_id:/usr/java/default" /usr/lib/jvm/oracle-jdk && docker rm "$container_id"
12571260
1258-
- name: Create no superuser
1259-
run: ./ci/no-superuser/create-no-superuser-sqlserver.sh SqlServer19 10 3 sqlserver19
1260-
timeout-minutes: 1
1261-
12621261
- name: Setup Gradle
12631262
uses: gradle/actions/setup-gradle@v4
12641263

12651264
- name: Execute Gradle 'integrationTestJdbc' task
1266-
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 || '' }}
1265+
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 || '' }}
12671266

12681267
- name: Upload Gradle test reports
12691268
if: always()
@@ -1298,6 +1297,10 @@ jobs:
12981297
steps:
12991298
- uses: actions/checkout@v5
13001299

1300+
- name: Create database with Japanese collation for integration test
1301+
run: |
1302+
docker exec sqlserver22 /opt/mssql-tools18/bin/sqlcmd -S localhost -C -U sa -P SqlServer22 -Q "CREATE DATABASE test_db COLLATE Japanese_BIN2;"
1303+
13011304
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
13021305
uses: actions/setup-java@v4
13031306
with:
@@ -1325,15 +1328,11 @@ jobs:
13251328
container_id=$(docker create "container-registry.oracle.com/java/jdk:${{ env.INT_TEST_JAVA_RUNTIME_VERSION }}")
13261329
docker cp -L "$container_id:/usr/java/default" /usr/lib/jvm/oracle-jdk && docker rm "$container_id"
13271330
1328-
- name: Create no superuser
1329-
run: ./ci/no-superuser/create-no-superuser-sqlserver.sh SqlServer22 10 3 sqlserver22
1330-
timeout-minutes: 1
1331-
13321331
- name: Setup Gradle
13331332
uses: gradle/actions/setup-gradle@v4
13341333

13351334
- name: Execute Gradle 'integrationTestJdbc' task
1336-
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 || '' }}
1335+
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 || '' }}
13371336

13381337
- name: Upload Gradle test reports
13391338
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)