Skip to content

Commit c17e1b3

Browse files
brfrn169brfrn169
committed
Use PostgreSQL in integration tests by default (#2894)
1 parent 838c2e7 commit c17e1b3

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ jobs:
454454
uses: gradle/actions/setup-gradle@v4
455455

456456
- name: Execute Gradle 'integrationTestJdbc' task
457-
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
457+
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:mysql://localhost:3306/ -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
458458

459459
- name: Upload Gradle test reports
460460
if: always()
@@ -513,7 +513,7 @@ jobs:
513513
uses: gradle/actions/setup-gradle@v4
514514

515515
- name: Execute Gradle 'integrationTestJdbc' task
516-
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
516+
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:mysql://localhost:3306/ -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
517517

518518
- name: Upload Gradle test reports
519519
if: always()
@@ -572,7 +572,7 @@ jobs:
572572
uses: gradle/actions/setup-gradle@v4
573573

574574
- name: Execute Gradle 'integrationTestJdbc' task
575-
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
575+
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:mysql://localhost:3306/ -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
576576

577577
- name: Upload Gradle test reports
578578
if: always()
@@ -636,7 +636,7 @@ jobs:
636636
uses: gradle/actions/setup-gradle@v4
637637

638638
- name: Execute Gradle 'integrationTestJdbc' task
639-
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/ -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
639+
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
640640

641641
- name: Upload Gradle test reports
642642
if: always()
@@ -700,7 +700,7 @@ jobs:
700700
uses: gradle/actions/setup-gradle@v4
701701

702702
- name: Execute Gradle 'integrationTestJdbc' task
703-
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/ -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
703+
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
704704

705705
- name: Upload Gradle test reports
706706
if: always()
@@ -764,7 +764,7 @@ jobs:
764764
uses: gradle/actions/setup-gradle@v4
765765

766766
- name: Execute Gradle 'integrationTestJdbc' task
767-
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/ -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
767+
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
768768

769769
- name: Upload Gradle test reports
770770
if: always()
@@ -828,7 +828,7 @@ jobs:
828828
uses: gradle/actions/setup-gradle@v4
829829

830830
- name: Execute Gradle 'integrationTestJdbc' task
831-
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/ -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
831+
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
832832

833833
- name: Upload Gradle test reports
834834
if: always()
@@ -892,7 +892,7 @@ jobs:
892892
uses: gradle/actions/setup-gradle@v4
893893

894894
- name: Execute Gradle 'integrationTestJdbc' task
895-
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:postgresql://localhost:5432/ -Dscalardb.jdbc.username=postgres -Dscalardb.jdbc.password=postgres ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
895+
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
896896

897897
- name: Upload Gradle test reports
898898
if: always()
@@ -1070,7 +1070,7 @@ jobs:
10701070

10711071
- name: Wait for the container to be ready
10721072
timeout-minutes: 5
1073-
run : |
1073+
run: |
10741074
while [ "`docker inspect -f {{.State.Health.Status}} oracle-23`" != "healthy" ]
10751075
do
10761076
sleep 10
@@ -1454,7 +1454,7 @@ jobs:
14541454
uses: gradle/actions/setup-gradle@v4
14551455

14561456
- name: Execute Gradle 'integrationTestJdbc' task
1457-
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
1457+
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:mariadb://localhost:3306 -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
14581458

14591459
- name: Upload Gradle test reports
14601460
if: always()
@@ -1475,7 +1475,6 @@ jobs:
14751475
- label: with_group_commit
14761476
group_commit_enabled: true
14771477

1478-
14791478
steps:
14801479
- name: Run MariaDB 11.4
14811480
run: |
@@ -1514,7 +1513,7 @@ jobs:
15141513
uses: gradle/actions/setup-gradle@v4
15151514

15161515
- name: Execute Gradle 'integrationTestJdbc' task
1517-
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
1516+
run: ./gradlew integrationTestJdbc -Dscalardb.jdbc.url=jdbc:mariadb://localhost:3306 -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
15181517

15191518
- name: Upload Gradle test reports
15201519
if: always()
@@ -1587,6 +1586,14 @@ jobs:
15871586
runs-on: ubuntu-latest
15881587

15891588
services:
1589+
postgres:
1590+
image: postgres:17-alpine
1591+
env:
1592+
POSTGRES_USER: postgres
1593+
POSTGRES_PASSWORD: postgres
1594+
ports:
1595+
- 5432:5432
1596+
15901597
cassandra:
15911598
image: cassandra:3.11
15921599
env:
@@ -1604,10 +1611,6 @@ jobs:
16041611
group_commit_enabled: true
16051612

16061613
steps:
1607-
- name: Run MySQL 8
1608-
run: |
1609-
docker run -e MYSQL_ROOT_PASSWORD=mysql -p 3306:3306 -d mysql:8 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
1610-
16111614
- uses: actions/checkout@v4
16121615

16131616
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
@@ -1645,7 +1648,7 @@ jobs:
16451648

16461649
- name: Upload Gradle test reports
16471650
uses: actions/upload-artifact@v4
1648-
if : always()
1651+
if: always()
16491652
with:
16501653
name: multi_storage_integration_test_reports_${{ matrix.mode.label }}
16511654
path: core/build/reports/tests/integrationTestMultiStorage

‎core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcEnv.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public final class JdbcEnv {
88
private static final String PROP_JDBC_USERNAME = "scalardb.jdbc.username";
99
private static final String PROP_JDBC_PASSWORD = "scalardb.jdbc.password";
1010

11-
private static final String DEFAULT_JDBC_URL = "jdbc:mysql://localhost:3306/";
12-
private static final String DEFAULT_JDBC_USERNAME = "root";
13-
private static final String DEFAULT_JDBC_PASSWORD = "mysql";
11+
private static final String DEFAULT_JDBC_URL = "jdbc:postgresql://localhost:5432/";
12+
private static final String DEFAULT_JDBC_USERNAME = "postgres";
13+
private static final String DEFAULT_JDBC_PASSWORD = "postgres";
1414

1515
private JdbcEnv() {}
1616

‎core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageEnv.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public final class MultiStorageEnv {
1919
private static final String DEFAULT_CASSANDRA_USERNAME = "cassandra";
2020
private static final String DEFAULT_CASSANDRA_PASSWORD = "cassandra";
2121

22-
private static final String DEFAULT_JDBC_CONTACT_POINT = "jdbc:mysql://localhost:3306/";
23-
private static final String DEFAULT_JDBC_USERNAME = "root";
24-
private static final String DEFAULT_JDBC_PASSWORD = "mysql";
22+
private static final String DEFAULT_JDBC_CONTACT_POINT = "jdbc:postgresql://localhost:5432/";
23+
private static final String DEFAULT_JDBC_USERNAME = "postgres";
24+
private static final String DEFAULT_JDBC_PASSWORD = "postgres";
2525

2626
private MultiStorageEnv() {}
2727

0 commit comments

Comments
 (0)