Skip to content

Commit 06ac5ac

Browse files
brfrn169brfrn169
committed
Use PostgreSQL in integration tests by default (#2894)
1 parent 725c250 commit 06ac5ac

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
@@ -450,7 +450,7 @@ jobs:
450450
uses: gradle/actions/setup-gradle@v4
451451

452452
- name: Execute Gradle 'integrationTestJdbc' task
453-
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
453+
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 || '' }}
454454

455455
- name: Upload Gradle test reports
456456
if: always()
@@ -509,7 +509,7 @@ jobs:
509509
uses: gradle/actions/setup-gradle@v4
510510

511511
- name: Execute Gradle 'integrationTestJdbc' task
512-
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
512+
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 || '' }}
513513

514514
- name: Upload Gradle test reports
515515
if: always()
@@ -568,7 +568,7 @@ jobs:
568568
uses: gradle/actions/setup-gradle@v4
569569

570570
- name: Execute Gradle 'integrationTestJdbc' task
571-
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
571+
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 || '' }}
572572

573573
- name: Upload Gradle test reports
574574
if: always()
@@ -632,7 +632,7 @@ jobs:
632632
uses: gradle/actions/setup-gradle@v4
633633

634634
- name: Execute Gradle 'integrationTestJdbc' task
635-
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 || '' }}
635+
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
636636

637637
- name: Upload Gradle test reports
638638
if: always()
@@ -696,7 +696,7 @@ jobs:
696696
uses: gradle/actions/setup-gradle@v4
697697

698698
- name: Execute Gradle 'integrationTestJdbc' task
699-
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 || '' }}
699+
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
700700

701701
- name: Upload Gradle test reports
702702
if: always()
@@ -760,7 +760,7 @@ jobs:
760760
uses: gradle/actions/setup-gradle@v4
761761

762762
- name: Execute Gradle 'integrationTestJdbc' task
763-
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 || '' }}
763+
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
764764

765765
- name: Upload Gradle test reports
766766
if: always()
@@ -824,7 +824,7 @@ jobs:
824824
uses: gradle/actions/setup-gradle@v4
825825

826826
- name: Execute Gradle 'integrationTestJdbc' task
827-
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 || '' }}
827+
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
828828

829829
- name: Upload Gradle test reports
830830
if: always()
@@ -888,7 +888,7 @@ jobs:
888888
uses: gradle/actions/setup-gradle@v4
889889

890890
- name: Execute Gradle 'integrationTestJdbc' task
891-
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 || '' }}
891+
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
892892

893893
- name: Upload Gradle test reports
894894
if: always()
@@ -1066,7 +1066,7 @@ jobs:
10661066

10671067
- name: Wait for the container to be ready
10681068
timeout-minutes: 5
1069-
run : |
1069+
run: |
10701070
while [ "`docker inspect -f {{.State.Health.Status}} oracle-23`" != "healthy" ]
10711071
do
10721072
sleep 10
@@ -1450,7 +1450,7 @@ jobs:
14501450
uses: gradle/actions/setup-gradle@v4
14511451

14521452
- name: Execute Gradle 'integrationTestJdbc' task
1453-
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
1453+
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 || '' }}
14541454

14551455
- name: Upload Gradle test reports
14561456
if: always()
@@ -1471,7 +1471,6 @@ jobs:
14711471
- label: with_group_commit
14721472
group_commit_enabled: true
14731473

1474-
14751474
steps:
14761475
- name: Run MariaDB 11.4
14771476
run: |
@@ -1510,7 +1509,7 @@ jobs:
15101509
uses: gradle/actions/setup-gradle@v4
15111510

15121511
- name: Execute Gradle 'integrationTestJdbc' task
1513-
run: ./gradlew integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
1512+
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 || '' }}
15141513

15151514
- name: Upload Gradle test reports
15161515
if: always()
@@ -1583,6 +1582,14 @@ jobs:
15831582
runs-on: ubuntu-latest
15841583

15851584
services:
1585+
postgres:
1586+
image: postgres:17-alpine
1587+
env:
1588+
POSTGRES_USER: postgres
1589+
POSTGRES_PASSWORD: postgres
1590+
ports:
1591+
- 5432:5432
1592+
15861593
cassandra:
15871594
image: cassandra:3.11
15881595
env:
@@ -1600,10 +1607,6 @@ jobs:
16001607
group_commit_enabled: true
16011608

16021609
steps:
1603-
- name: Run MySQL 8
1604-
run: |
1605-
docker run -e MYSQL_ROOT_PASSWORD=mysql -p 3306:3306 -d mysql:8 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
1606-
16071610
- uses: actions/checkout@v4
16081611

16091612
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
@@ -1641,7 +1644,7 @@ jobs:
16411644

16421645
- name: Upload Gradle test reports
16431646
uses: actions/upload-artifact@v4
1644-
if : always()
1647+
if: always()
16451648
with:
16461649
name: multi_storage_integration_test_reports_${{ matrix.mode.label }}
16471650
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)