diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index df6f2a1..ea817d3 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -13,7 +13,7 @@ jobs: matrix: docker-compose-file: - docker-compose.yml - - testing/docker-compose.h2.yml + - testing/docker-compose.hsqldb.yml steps: - uses: actions/checkout@v2.4.0 with: diff --git a/build.gradle b/build.gradle index e5256ab..ca7ca48 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,7 @@ dependencies { implementation 'io.activej:activej-boot:5.0' implementation 'io.activej:activej-specializer:5.0' implementation 'io.activej:activej-launchers-http:5.0' + implementation 'org.hsqldb:hsqldb:2.6.1' implementation 'org.postgresql:postgresql:42.3.1' implementation 'org.hibernate:hibernate-core:5.6.1.Final' implementation 'org.hibernate:hibernate-hikaricp:5.6.1.Final' diff --git a/testing/config.h2.properties b/testing/config.hsqldb.properties similarity index 65% rename from testing/config.h2.properties rename to testing/config.hsqldb.properties index 9f6f391..7cbf892 100644 --- a/testing/config.h2.properties +++ b/testing/config.hsqldb.properties @@ -11,8 +11,9 @@ API_URL: https://pipedapi.kavin.rocks FRONTEND_URL: https://piped.kavin.rocks # Hibernate properties -hibernate.connection.url: jdbc:h2:mem:test;MODE=PostgreSQL -hibernate.connection.driver_class: org.h2.Driver +hibernate.connection.url: jdbc:hsqldb:mem:memdb;sql.syntax_pgs=true +hibernate.connection.driver_class: org.hsqldb.jdbcDriver +hibernate.dialect: org.hibernate.dialect.HSQLDialect hibernate.dialect: org.hibernate.dialect.PostgreSQL10Dialect hibernate.connection.username: piped hibernate.connection.password: changeme diff --git a/testing/docker-compose.h2.yml b/testing/docker-compose.hsqldb.yml similarity index 71% rename from testing/docker-compose.h2.yml rename to testing/docker-compose.hsqldb.yml index d4f28e9..31f4070 100644 --- a/testing/docker-compose.h2.yml +++ b/testing/docker-compose.hsqldb.yml @@ -5,4 +5,4 @@ services: ports: - "127.0.0.1:8080:8080" volumes: - - ./config.h2.properties:/app/config.properties + - ./config.hsqldb.properties:/app/config.properties