From 546e013453ef449f0c0d3670cde4076eda8f7a5c Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 16 Dec 2022 20:00:01 +0300 Subject: Drop unused zero date column --- src/main/resources/db/migration/V1.23__drop_off_ts.sql | 1 + src/test/resources/application-mysql.yml | 2 +- src/test/resources/db/specific/mariadb/V1.23__data.sql | 13 ------------- src/test/resources/db/specific/mariadb/V1.999__data.sql | 13 +++++++++++++ src/test/resources/db/specific/postgresql/V1.23__data.sql | 13 ------------- src/test/resources/db/specific/postgresql/V1.999__data.sql | 13 +++++++++++++ 6 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 src/main/resources/db/migration/V1.23__drop_off_ts.sql delete mode 100644 src/test/resources/db/specific/mariadb/V1.23__data.sql create mode 100644 src/test/resources/db/specific/mariadb/V1.999__data.sql delete mode 100644 src/test/resources/db/specific/postgresql/V1.23__data.sql create mode 100644 src/test/resources/db/specific/postgresql/V1.999__data.sql (limited to 'src') diff --git a/src/main/resources/db/migration/V1.23__drop_off_ts.sql b/src/main/resources/db/migration/V1.23__drop_off_ts.sql new file mode 100644 index 00000000..47136476 --- /dev/null +++ b/src/main/resources/db/migration/V1.23__drop_off_ts.sql @@ -0,0 +1 @@ +alter table useroptions drop column off_ts; diff --git a/src/test/resources/application-mysql.yml b/src/test/resources/application-mysql.yml index 033a4f1e..b53730bc 100644 --- a/src/test/resources/application-mysql.yml +++ b/src/test/resources/application-mysql.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: org.mariadb.jdbc.Driver - url: jdbc:mariadb://localhost:3306/juick?zeroDateTimeBehavior=convertToNull&sessionVariables=sql_mode=NO_AUTO_VALUE_ON_ZERO + url: jdbc:mariadb://localhost:3306/juick?sessionVariables=sql_mode=NO_AUTO_VALUE_ON_ZERO username: root password: secret flyway: diff --git a/src/test/resources/db/specific/mariadb/V1.23__data.sql b/src/test/resources/db/specific/mariadb/V1.23__data.sql deleted file mode 100644 index a5db173a..00000000 --- a/src/test/resources/db/specific/mariadb/V1.23__data.sql +++ /dev/null @@ -1,13 +0,0 @@ -INSERT INTO users(id, nick, passw) VALUES(0, 'Anonymous', 'password'); -INSERT INTO users(id, nick, passw) VALUES(2, 'juick', 'password'); -INSERT INTO users(id, nick, passw) VALUES(5, 'archive', 'password'); -INSERT INTO tags(tag_id, name) VALUES(2, 'juick'); -ALTER TABLE tags AUTO_INCREMENT = 10; -ALTER TABLE users AUTO_INCREMENT = 10; -INSERT INTO reactions (like_id, description) VALUES (1, 'like'); -INSERT INTO reactions (like_id, description) VALUES (2, 'love'); -INSERT INTO reactions (like_id, description) VALUES (3, 'lol'); -INSERT INTO reactions (like_id, description) VALUES (4, 'hmm'); -INSERT INTO reactions (like_id, description) VALUES (5, 'angry'); -INSERT INTO reactions (like_id, description) VALUES (6, 'uhblya'); -INSERT INTO reactions (like_id, description) VALUES (7, 'ugh'); diff --git a/src/test/resources/db/specific/mariadb/V1.999__data.sql b/src/test/resources/db/specific/mariadb/V1.999__data.sql new file mode 100644 index 00000000..a5db173a --- /dev/null +++ b/src/test/resources/db/specific/mariadb/V1.999__data.sql @@ -0,0 +1,13 @@ +INSERT INTO users(id, nick, passw) VALUES(0, 'Anonymous', 'password'); +INSERT INTO users(id, nick, passw) VALUES(2, 'juick', 'password'); +INSERT INTO users(id, nick, passw) VALUES(5, 'archive', 'password'); +INSERT INTO tags(tag_id, name) VALUES(2, 'juick'); +ALTER TABLE tags AUTO_INCREMENT = 10; +ALTER TABLE users AUTO_INCREMENT = 10; +INSERT INTO reactions (like_id, description) VALUES (1, 'like'); +INSERT INTO reactions (like_id, description) VALUES (2, 'love'); +INSERT INTO reactions (like_id, description) VALUES (3, 'lol'); +INSERT INTO reactions (like_id, description) VALUES (4, 'hmm'); +INSERT INTO reactions (like_id, description) VALUES (5, 'angry'); +INSERT INTO reactions (like_id, description) VALUES (6, 'uhblya'); +INSERT INTO reactions (like_id, description) VALUES (7, 'ugh'); diff --git a/src/test/resources/db/specific/postgresql/V1.23__data.sql b/src/test/resources/db/specific/postgresql/V1.23__data.sql deleted file mode 100644 index 673b24d2..00000000 --- a/src/test/resources/db/specific/postgresql/V1.23__data.sql +++ /dev/null @@ -1,13 +0,0 @@ -INSERT INTO users(id, nick, passw) VALUES(0, 'Anonymous', 'password'); -INSERT INTO users(id, nick, passw) VALUES(2, 'juick', 'password'); -INSERT INTO users(id, nick, passw) VALUES(5, 'archive', 'password'); -INSERT INTO tags(tag_id, name) VALUES(2, 'juick'); -alter sequence tags_tag_id_seq restart with 10; -alter sequence users_id_seq restart with 10; -INSERT INTO reactions (like_id, description) VALUES (1, 'like'); -INSERT INTO reactions (like_id, description) VALUES (2, 'love'); -INSERT INTO reactions (like_id, description) VALUES (3, 'lol'); -INSERT INTO reactions (like_id, description) VALUES (4, 'hmm'); -INSERT INTO reactions (like_id, description) VALUES (5, 'angry'); -INSERT INTO reactions (like_id, description) VALUES (6, 'uhblya'); -INSERT INTO reactions (like_id, description) VALUES (7, 'ugh'); diff --git a/src/test/resources/db/specific/postgresql/V1.999__data.sql b/src/test/resources/db/specific/postgresql/V1.999__data.sql new file mode 100644 index 00000000..673b24d2 --- /dev/null +++ b/src/test/resources/db/specific/postgresql/V1.999__data.sql @@ -0,0 +1,13 @@ +INSERT INTO users(id, nick, passw) VALUES(0, 'Anonymous', 'password'); +INSERT INTO users(id, nick, passw) VALUES(2, 'juick', 'password'); +INSERT INTO users(id, nick, passw) VALUES(5, 'archive', 'password'); +INSERT INTO tags(tag_id, name) VALUES(2, 'juick'); +alter sequence tags_tag_id_seq restart with 10; +alter sequence users_id_seq restart with 10; +INSERT INTO reactions (like_id, description) VALUES (1, 'like'); +INSERT INTO reactions (like_id, description) VALUES (2, 'love'); +INSERT INTO reactions (like_id, description) VALUES (3, 'lol'); +INSERT INTO reactions (like_id, description) VALUES (4, 'hmm'); +INSERT INTO reactions (like_id, description) VALUES (5, 'angry'); +INSERT INTO reactions (like_id, description) VALUES (6, 'uhblya'); +INSERT INTO reactions (like_id, description) VALUES (7, 'ugh'); -- cgit v1.2.3