From 6bd9c61791dfdbb40a46799c2410699a28f34368 Mon Sep 17 00:00:00 2001 From: Andrea Spacca Date: Sat, 7 Oct 2023 14:26:59 +0900 Subject: [PATCH 1/7] add back org.hsqldb:hsqldb:2.7.2 --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 7ab5ba1..d667540 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,7 @@ dependencies { implementation 'io.activej:activej-boot:5.5' implementation 'io.activej:activej-specializer:5.5' implementation 'io.activej:activej-launchers-http:5.5' + implementation 'org.hsqldb:hsqldb:2.7.2' implementation 'org.postgresql:postgresql:42.6.0' implementation 'org.hibernate:hibernate-core:6.3.1.Final' implementation 'org.hibernate:hibernate-hikaricp:6.3.1.Final' From 0bbe5506a756206fea6d261851d121c19bb998c5 Mon Sep 17 00:00:00 2001 From: Andrea Spacca Date: Sat, 7 Oct 2023 14:27:20 +0900 Subject: [PATCH 2/7] add hsqldb driver in liquibase helper --- src/main/java/me/kavin/piped/utils/LiquibaseHelper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/me/kavin/piped/utils/LiquibaseHelper.java b/src/main/java/me/kavin/piped/utils/LiquibaseHelper.java index a97d09c..9268005 100644 --- a/src/main/java/me/kavin/piped/utils/LiquibaseHelper.java +++ b/src/main/java/me/kavin/piped/utils/LiquibaseHelper.java @@ -28,6 +28,8 @@ public class LiquibaseHelper { // register YugabyteDB database DatabaseFactory.getInstance().register(new liquibase.ext.yugabytedb.database.YugabyteDBDatabase()); + // register HsqlDatabase database + DatabaseFactory.getInstance().register(new liquibase.database.core.HsqlDatabase()); Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(DriverManager.getConnection(url, username, password))); From b64ee87fdf4d9089a6f48a73e9d6439db341ca91 Mon Sep 17 00:00:00 2001 From: Andrea Spacca Date: Sat, 7 Oct 2023 14:30:22 +0900 Subject: [PATCH 3/7] add liquibase migrtion for hsqldb --- .../changelog/db.changelog-master.xml | 1 - .../changelog/version/0-1-init-hsqldb.sql | 135 ++++++++++++++++++ .../resources/changelog/version/0-init.xml | 3 +- .../changelog/version/1-fix-subs.xml | 15 +- 4 files changed, 151 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/changelog/version/0-1-init-hsqldb.sql diff --git a/src/main/resources/changelog/db.changelog-master.xml b/src/main/resources/changelog/db.changelog-master.xml index 68fb5f2..4d3a056 100644 --- a/src/main/resources/changelog/db.changelog-master.xml +++ b/src/main/resources/changelog/db.changelog-master.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/resources/changelog/version/0-1-init-hsqldb.sql b/src/main/resources/changelog/version/0-1-init-hsqldb.sql new file mode 100644 index 0000000..08f9356 --- /dev/null +++ b/src/main/resources/changelog/version/0-1-init-hsqldb.sql @@ -0,0 +1,135 @@ +CREATE TABLE IF NOT EXISTS users ( + id BIGSERIAL NOT NULL, + password TEXT NULL, + session_id VARCHAR(36) NULL, + username VARCHAR(24) NULL UNIQUE, + CONSTRAINT users_pkey PRIMARY KEY (id) +); + +DROP INDEX users.users_id_idx IF EXISTS; + +CREATE INDEX IF NOT EXISTS username_idx ON users (username ASC); + +-- rollback DROP TABLE users IF EXISTS + +CREATE TABLE IF NOT EXISTS channels ( + uploader_id VARCHAR(24) NOT NULL, + uploader VARCHAR(100) NULL, + uploader_avatar VARCHAR(150) NULL, + verified BOOLEAN NULL, + CONSTRAINT channels_pkey PRIMARY KEY (uploader_id) +); + +CREATE INDEX IF NOT EXISTS channels_uploader_idx ON channels (uploader ASC); + +-- rollback DROP TABLE channels IF EXISTS + +CREATE TABLE IF NOT EXISTS pubsub ( + id VARCHAR(24) NOT NULL, + subbed_at INT8 NULL, + CONSTRAINT pubsub_pkey PRIMARY KEY (id) +); + +CREATE INDEX IF NOT EXISTS pubsub_id_idx ON pubsub (id ASC); + +-- rollback DROP TABLE pubsub IF EXISTS + +CREATE TABLE IF NOT EXISTS playlists ( + id BIGSERIAL NOT NULL, + name VARCHAR(200) NULL, + playlist_id UUID NOT NULL UNIQUE DEFAULT uuid(), + short_description VARCHAR(100) NULL, + thumbnail VARCHAR(300) NULL, + owner INT8 NOT NULL, + CONSTRAINT playlists_pkey PRIMARY KEY (id), + CONSTRAINT fk_playlists_owner FOREIGN KEY (owner) REFERENCES users(id) +); + +-- rollback DROP TABLE playlists IF EXISTS + +CREATE TABLE IF NOT EXISTS playlist_videos ( + id VARCHAR(11) NOT NULL, + duration INT8 NULL, + thumbnail VARCHAR(400) NULL, + title VARCHAR(120) NULL, + uploader_id VARCHAR(24) NOT NULL, + CONSTRAINT playlist_videos_pkey PRIMARY KEY (id), + CONSTRAINT fk_playlist_video_uploader_id FOREIGN KEY (uploader_id) REFERENCES channels(uploader_id) +); + +CREATE INDEX IF NOT EXISTS playlist_videos_id_idx ON playlist_videos (id ASC); +CREATE INDEX IF NOT EXISTS playlist_videos_uploader_id_idx ON playlist_videos (uploader_id ASC); + +-- rollback DROP TABLE playlist_videos IF EXISTS + +CREATE TABLE IF NOT EXISTS playlists_videos_ids ( + playlist_id INT8 NOT NULL, + videos_id VARCHAR(11) NOT NULL, + videos_order INT4 NOT NULL, + CONSTRAINT playlists_videos_ids_pkey PRIMARY KEY (playlist_id, videos_order), + CONSTRAINT fk_playlists_videos_video_id_playlist_video FOREIGN KEY (videos_id) REFERENCES playlist_videos(id), + CONSTRAINT fk_playlists_videos_playlist_id_playlist FOREIGN KEY (playlist_id) REFERENCES playlists(id) +); + +CREATE INDEX IF NOT EXISTS playlists_videos_ids_playlist_id_idx ON playlists_videos_ids (playlist_id ASC); + +-- rollback DROP TABLE playlists_videos_ids IF EXISTS + +CREATE TABLE IF NOT EXISTS unauthenticated_subscriptions ( + id VARCHAR(24) NOT NULL, + subscribed_at INT8 NOT NULL, + CONSTRAINT unauthenticated_subscriptions_pkey PRIMARY KEY (id), + CONSTRAINT fk_unauthenticated_subscriptions_id_channels FOREIGN KEY (id) REFERENCES channels(uploader_id) +); + +CREATE INDEX IF NOT EXISTS unauthenticated_subscriptions_subscribed_at_idx ON unauthenticated_subscriptions (subscribed_at ASC); + +-- rollback DROP TABLE unauthenticated_subscriptions IF EXISTS + +CREATE INDEX IF NOT EXISTS users_session_id_idx ON users (session_id ASC); + +-- rollback DROP INDEX users_session_id_idx IF EXISTS + +CREATE TABLE IF NOT EXISTS videos ( + id VARCHAR(11) NOT NULL UNIQUE, + duration INT8 NULL, + thumbnail VARCHAR(400) NULL, + title VARCHAR(120) NULL, + uploaded INT8 NULL, + views INT8 NULL, + uploader_id VARCHAR(24) NOT NULL, + is_short BOOLEAN NOT NULL DEFAULT false, + CONSTRAINT videos_pkey PRIMARY KEY (id, uploader_id), + CONSTRAINT fk_videos_channels_uploader_id FOREIGN KEY (uploader_id) REFERENCES channels(uploader_id) +); + +CREATE UNIQUE INDEX IF NOT EXISTS videos_id_idx ON videos (id ASC); +CREATE INDEX IF NOT EXISTS video_uploaded_idx ON videos (uploaded ASC); +CREATE INDEX IF NOT EXISTS video_uploader_id_idx ON videos (uploader_id ASC); + +-- rollback DROP TABLE videos IF EXISTS + +CREATE TABLE IF NOT EXISTS users_subscribed ( + subscriber INT8 NOT NULL, + channel VARCHAR(24) NOT NULL, + CONSTRAINT users_subscribed_pkey PRIMARY KEY (subscriber, channel), + CONSTRAINT fk_subscriber_users FOREIGN KEY (subscriber) REFERENCES users(id) +); + +CREATE INDEX IF NOT EXISTS users_subscribed_subscriber_idx ON users_subscribed (subscriber ASC); +CREATE INDEX IF NOT EXISTS users_subscribed_channel_idx ON users_subscribed (channel ASC); + +-- rollback DROP TABLE users_subscribed IF EXISTS + +CREATE INDEX IF NOT EXISTS pubsub_subbed_at_idx ON pubsub (subbed_at ASC); + +-- rollback DROP INDEX pubsub_subbed_at_idx IF EXISTS + +CREATE INDEX IF NOT EXISTS playlists_playlist_id_idx ON playlists (playlist_id ASC); +CREATE INDEX IF NOT EXISTS playlists_owner_idx ON playlists (owner ASC); + +-- rollback DROP INDEX playlists_playlist_id_idx IF EXISTS +-- rollback DROP INDEX playlists_owner_idx IF EXISTS +CREATE INDEX IF NOT EXISTS unauthenticated_subscriptions_id_idx ON unauthenticated_subscriptions (id ASC); + +-- rollback DROP INDEX unauthenticated_subscriptions_id_idx IF EXISTS diff --git a/src/main/resources/changelog/version/0-init.xml b/src/main/resources/changelog/version/0-init.xml index 649566a..d29ff61 100644 --- a/src/main/resources/changelog/version/0-init.xml +++ b/src/main/resources/changelog/version/0-init.xml @@ -9,9 +9,10 @@ - + + diff --git a/src/main/resources/changelog/version/1-fix-subs.xml b/src/main/resources/changelog/version/1-fix-subs.xml index e3f44cc..f26d9ed 100644 --- a/src/main/resources/changelog/version/1-fix-subs.xml +++ b/src/main/resources/changelog/version/1-fix-subs.xml @@ -4,12 +4,25 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + ALTER TABLE unauthenticated_subscriptions DROP CONSTRAINT IF EXISTS fk_unauthenticated_subscriptions_id_channels; ALTER TABLE unauthenticated_subscriptions ADD CONSTRAINT fk_unauthenticated_subscriptions_id_channels FOREIGN KEY (id) REFERENCES channels(uploader_id); + + + + + + + + From 2982ec9201e558929a63e77f5932275b0d8b1ddf Mon Sep 17 00:00:00 2001 From: Andrea Spacca Date: Sat, 7 Oct 2023 14:30:51 +0900 Subject: [PATCH 4/7] add back testing for hsqldb --- .github/workflows/docker-build-test.yml | 1 + testing/config.hsqldb.properties | 18 ++++++++++++++++++ testing/docker-compose.hsqldb.yml | 8 ++++++++ 3 files changed, 27 insertions(+) create mode 100644 testing/config.hsqldb.properties create mode 100644 testing/docker-compose.hsqldb.yml diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index 26423c4..7772b4c 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -19,6 +19,7 @@ jobs: matrix: docker-compose-file: - docker-compose.yml + - testing/docker-compose.hsqldb.yml - testing/docker-compose.cockroachdb.yml - testing/docker-compose.yugabytedb.yml dockerfile: diff --git a/testing/config.hsqldb.properties b/testing/config.hsqldb.properties new file mode 100644 index 0000000..c366fc9 --- /dev/null +++ b/testing/config.hsqldb.properties @@ -0,0 +1,18 @@ +# The port to Listen on. +PORT: 8080 + +# Proxy +PROXY_PART: https://pipedproxy-ams.kavin.rocks + +# Public API URL +API_URL: https://pipedapi.kavin.rocks + +# Public Frontend URL +FRONTEND_URL: https://piped.video + +# Hibernate properties +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.connection.username: piped +hibernate.connection.password: changeme \ No newline at end of file diff --git a/testing/docker-compose.hsqldb.yml b/testing/docker-compose.hsqldb.yml new file mode 100644 index 0000000..f60ec09 --- /dev/null +++ b/testing/docker-compose.hsqldb.yml @@ -0,0 +1,8 @@ +services: + piped: + image: 1337kavin/piped:latest + restart: unless-stopped + ports: + - "127.0.0.1:8080:8080" + volumes: + - ./config.hsqldb.properties:/app/config.properties \ No newline at end of file From 36cc75cf6623dd6ac5b823e52cb92cdc69f8aed8 Mon Sep 17 00:00:00 2001 From: Kavin <20838718+FireMasterK@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:29:21 +0100 Subject: [PATCH 5/7] Fix unnecessary odd spacing. --- .../changelog/version/0-1-init-hsqldb.sql | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/src/main/resources/changelog/version/0-1-init-hsqldb.sql b/src/main/resources/changelog/version/0-1-init-hsqldb.sql index 08f9356..cbcc14c 100644 --- a/src/main/resources/changelog/version/0-1-init-hsqldb.sql +++ b/src/main/resources/changelog/version/0-1-init-hsqldb.sql @@ -1,9 +1,9 @@ CREATE TABLE IF NOT EXISTS users ( - id BIGSERIAL NOT NULL, - password TEXT NULL, - session_id VARCHAR(36) NULL, - username VARCHAR(24) NULL UNIQUE, - CONSTRAINT users_pkey PRIMARY KEY (id) + id BIGSERIAL NOT NULL, + password TEXT NULL, + session_id VARCHAR(36) NULL, + username VARCHAR(24) NULL UNIQUE, + CONSTRAINT users_pkey PRIMARY KEY (id) ); DROP INDEX users.users_id_idx IF EXISTS; @@ -13,11 +13,11 @@ CREATE INDEX IF NOT EXISTS username_idx ON users (username ASC); -- rollback DROP TABLE users IF EXISTS CREATE TABLE IF NOT EXISTS channels ( - uploader_id VARCHAR(24) NOT NULL, - uploader VARCHAR(100) NULL, - uploader_avatar VARCHAR(150) NULL, - verified BOOLEAN NULL, - CONSTRAINT channels_pkey PRIMARY KEY (uploader_id) + uploader_id VARCHAR(24) NOT NULL, + uploader VARCHAR(100) NULL, + uploader_avatar VARCHAR(150) NULL, + verified BOOLEAN NULL, + CONSTRAINT channels_pkey PRIMARY KEY (uploader_id) ); CREATE INDEX IF NOT EXISTS channels_uploader_idx ON channels (uploader ASC); @@ -25,9 +25,9 @@ CREATE INDEX IF NOT EXISTS channels_uploader_idx ON channels (uploader ASC); -- rollback DROP TABLE channels IF EXISTS CREATE TABLE IF NOT EXISTS pubsub ( - id VARCHAR(24) NOT NULL, - subbed_at INT8 NULL, - CONSTRAINT pubsub_pkey PRIMARY KEY (id) + id VARCHAR(24) NOT NULL, + subbed_at INT8 NULL, + CONSTRAINT pubsub_pkey PRIMARY KEY (id) ); CREATE INDEX IF NOT EXISTS pubsub_id_idx ON pubsub (id ASC); @@ -35,26 +35,26 @@ CREATE INDEX IF NOT EXISTS pubsub_id_idx ON pubsub (id ASC); -- rollback DROP TABLE pubsub IF EXISTS CREATE TABLE IF NOT EXISTS playlists ( - id BIGSERIAL NOT NULL, - name VARCHAR(200) NULL, - playlist_id UUID NOT NULL UNIQUE DEFAULT uuid(), - short_description VARCHAR(100) NULL, - thumbnail VARCHAR(300) NULL, - owner INT8 NOT NULL, - CONSTRAINT playlists_pkey PRIMARY KEY (id), - CONSTRAINT fk_playlists_owner FOREIGN KEY (owner) REFERENCES users(id) + id BIGSERIAL NOT NULL, + name VARCHAR(200) NULL, + playlist_id UUID NOT NULL UNIQUE DEFAULT uuid(), + short_description VARCHAR(100) NULL, + thumbnail VARCHAR(300) NULL, + owner INT8 NOT NULL, + CONSTRAINT playlists_pkey PRIMARY KEY (id), + CONSTRAINT fk_playlists_owner FOREIGN KEY (owner) REFERENCES users(id) ); -- rollback DROP TABLE playlists IF EXISTS CREATE TABLE IF NOT EXISTS playlist_videos ( - id VARCHAR(11) NOT NULL, - duration INT8 NULL, - thumbnail VARCHAR(400) NULL, - title VARCHAR(120) NULL, - uploader_id VARCHAR(24) NOT NULL, - CONSTRAINT playlist_videos_pkey PRIMARY KEY (id), - CONSTRAINT fk_playlist_video_uploader_id FOREIGN KEY (uploader_id) REFERENCES channels(uploader_id) + id VARCHAR(11) NOT NULL, + duration INT8 NULL, + thumbnail VARCHAR(400) NULL, + title VARCHAR(120) NULL, + uploader_id VARCHAR(24) NOT NULL, + CONSTRAINT playlist_videos_pkey PRIMARY KEY (id), + CONSTRAINT fk_playlist_video_uploader_id FOREIGN KEY (uploader_id) REFERENCES channels(uploader_id) ); CREATE INDEX IF NOT EXISTS playlist_videos_id_idx ON playlist_videos (id ASC); @@ -63,12 +63,12 @@ CREATE INDEX IF NOT EXISTS playlist_videos_uploader_id_idx ON playlist_videos (u -- rollback DROP TABLE playlist_videos IF EXISTS CREATE TABLE IF NOT EXISTS playlists_videos_ids ( - playlist_id INT8 NOT NULL, - videos_id VARCHAR(11) NOT NULL, - videos_order INT4 NOT NULL, - CONSTRAINT playlists_videos_ids_pkey PRIMARY KEY (playlist_id, videos_order), - CONSTRAINT fk_playlists_videos_video_id_playlist_video FOREIGN KEY (videos_id) REFERENCES playlist_videos(id), - CONSTRAINT fk_playlists_videos_playlist_id_playlist FOREIGN KEY (playlist_id) REFERENCES playlists(id) + playlist_id INT8 NOT NULL, + videos_id VARCHAR(11) NOT NULL, + videos_order INT4 NOT NULL, + CONSTRAINT playlists_videos_ids_pkey PRIMARY KEY (playlist_id, videos_order), + CONSTRAINT fk_playlists_videos_video_id_playlist_video FOREIGN KEY (videos_id) REFERENCES playlist_videos(id), + CONSTRAINT fk_playlists_videos_playlist_id_playlist FOREIGN KEY (playlist_id) REFERENCES playlists(id) ); CREATE INDEX IF NOT EXISTS playlists_videos_ids_playlist_id_idx ON playlists_videos_ids (playlist_id ASC); @@ -76,10 +76,10 @@ CREATE INDEX IF NOT EXISTS playlists_videos_ids_playlist_id_idx ON playlists_vid -- rollback DROP TABLE playlists_videos_ids IF EXISTS CREATE TABLE IF NOT EXISTS unauthenticated_subscriptions ( - id VARCHAR(24) NOT NULL, - subscribed_at INT8 NOT NULL, - CONSTRAINT unauthenticated_subscriptions_pkey PRIMARY KEY (id), - CONSTRAINT fk_unauthenticated_subscriptions_id_channels FOREIGN KEY (id) REFERENCES channels(uploader_id) + id VARCHAR(24) NOT NULL, + subscribed_at INT8 NOT NULL, + CONSTRAINT unauthenticated_subscriptions_pkey PRIMARY KEY (id), + CONSTRAINT fk_unauthenticated_subscriptions_id_channels FOREIGN KEY (id) REFERENCES channels(uploader_id) ); CREATE INDEX IF NOT EXISTS unauthenticated_subscriptions_subscribed_at_idx ON unauthenticated_subscriptions (subscribed_at ASC); @@ -91,16 +91,16 @@ CREATE INDEX IF NOT EXISTS users_session_id_idx ON users (session_id ASC); -- rollback DROP INDEX users_session_id_idx IF EXISTS CREATE TABLE IF NOT EXISTS videos ( - id VARCHAR(11) NOT NULL UNIQUE, - duration INT8 NULL, - thumbnail VARCHAR(400) NULL, - title VARCHAR(120) NULL, - uploaded INT8 NULL, - views INT8 NULL, - uploader_id VARCHAR(24) NOT NULL, - is_short BOOLEAN NOT NULL DEFAULT false, - CONSTRAINT videos_pkey PRIMARY KEY (id, uploader_id), - CONSTRAINT fk_videos_channels_uploader_id FOREIGN KEY (uploader_id) REFERENCES channels(uploader_id) + id VARCHAR(11) NOT NULL UNIQUE, + duration INT8 NULL, + thumbnail VARCHAR(400) NULL, + title VARCHAR(120) NULL, + uploaded INT8 NULL, + views INT8 NULL, + uploader_id VARCHAR(24) NOT NULL, + is_short BOOLEAN NOT NULL DEFAULT false, + CONSTRAINT videos_pkey PRIMARY KEY (id, uploader_id), + CONSTRAINT fk_videos_channels_uploader_id FOREIGN KEY (uploader_id) REFERENCES channels(uploader_id) ); CREATE UNIQUE INDEX IF NOT EXISTS videos_id_idx ON videos (id ASC); @@ -110,10 +110,10 @@ CREATE INDEX IF NOT EXISTS video_uploader_id_idx ON videos (uploader_id ASC); -- rollback DROP TABLE videos IF EXISTS CREATE TABLE IF NOT EXISTS users_subscribed ( - subscriber INT8 NOT NULL, - channel VARCHAR(24) NOT NULL, - CONSTRAINT users_subscribed_pkey PRIMARY KEY (subscriber, channel), - CONSTRAINT fk_subscriber_users FOREIGN KEY (subscriber) REFERENCES users(id) + subscriber INT8 NOT NULL, + channel VARCHAR(24) NOT NULL, + CONSTRAINT users_subscribed_pkey PRIMARY KEY (subscriber, channel), + CONSTRAINT fk_subscriber_users FOREIGN KEY (subscriber) REFERENCES users(id) ); CREATE INDEX IF NOT EXISTS users_subscribed_subscriber_idx ON users_subscribed (subscriber ASC); From 0ae0b5b24f04544e5ce965dde5766d23f5746501 Mon Sep 17 00:00:00 2001 From: Kavin <20838718+FireMasterK@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:30:09 +0100 Subject: [PATCH 6/7] Fix missing newline. --- testing/config.hsqldb.properties | 2 +- testing/docker-compose.hsqldb.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/config.hsqldb.properties b/testing/config.hsqldb.properties index c366fc9..4c8ebe2 100644 --- a/testing/config.hsqldb.properties +++ b/testing/config.hsqldb.properties @@ -15,4 +15,4 @@ 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.connection.username: piped -hibernate.connection.password: changeme \ No newline at end of file +hibernate.connection.password: changeme diff --git a/testing/docker-compose.hsqldb.yml b/testing/docker-compose.hsqldb.yml index f60ec09..31f4070 100644 --- a/testing/docker-compose.hsqldb.yml +++ b/testing/docker-compose.hsqldb.yml @@ -5,4 +5,4 @@ services: ports: - "127.0.0.1:8080:8080" volumes: - - ./config.hsqldb.properties:/app/config.properties \ No newline at end of file + - ./config.hsqldb.properties:/app/config.properties From cb17f9bdc84ecb78f8b15168737ea6ba6ed430e8 Mon Sep 17 00:00:00 2001 From: Andrea Spacca Date: Tue, 21 Nov 2023 13:45:09 +0900 Subject: [PATCH 7/7] drop registering hsqldatabse factory --- src/main/java/me/kavin/piped/utils/LiquibaseHelper.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/me/kavin/piped/utils/LiquibaseHelper.java b/src/main/java/me/kavin/piped/utils/LiquibaseHelper.java index 9268005..a97d09c 100644 --- a/src/main/java/me/kavin/piped/utils/LiquibaseHelper.java +++ b/src/main/java/me/kavin/piped/utils/LiquibaseHelper.java @@ -28,8 +28,6 @@ public class LiquibaseHelper { // register YugabyteDB database DatabaseFactory.getInstance().register(new liquibase.ext.yugabytedb.database.YugabyteDBDatabase()); - // register HsqlDatabase database - DatabaseFactory.getInstance().register(new liquibase.database.core.HsqlDatabase()); Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(DriverManager.getConnection(url, username, password)));