Merge everything into single Spring Boot application

16 files changed, 0 insertions, 43 deletions

diff --git a/juick-server/src/main/resources/db/migration/V1.10__favorites_user_uri.sql b/juick-server/src/main/resources/db/migration/V1.10__favorites_user_uri.sql
deleted file mode 100644
index 8f382398..00000000
--- a/juick-server/src/main/resources/db/migration/V1.10__favorites_user_uri.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE favorites ADD COLUMN user_uri char(255) DEFAULT NULL;
-UPDATE favorites SET user_uri='' WHERE user_uri IS NULL;
-ALTER TABLE favorites MODIFY COLUMN user_uri char(255) NOT NULL DEFAULT '';
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql b/juick-server/src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql
deleted file mode 100644
index e83eb621..00000000
--- a/juick-server/src/main/resources/db/migration/V1.11__increase pm timestamp precision.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE pm MODIFY COLUMN ts timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.12__drop unused tables.sql b/juick-server/src/main/resources/db/migration/V1.12__drop unused tables.sql
deleted file mode 100644
index 1599f5f6..00000000
--- a/juick-server/src/main/resources/db/migration/V1.12__drop unused tables.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DROP TABLE IF EXISTS messages_votes;
-DROP TABLE IF EXISTS reader_links;
-DROP TABLE IF EXISTS reader_rss;
-DROP TABLE IF EXISTS captcha;
-DROP TABLE IF EXISTS captchaimg;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.13__drop unused tables.sql b/juick-server/src/main/resources/db/migration/V1.13__drop unused tables.sql
deleted file mode 100644
index c35fc92c..00000000
--- a/juick-server/src/main/resources/db/migration/V1.13__drop unused tables.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DROP TABLE IF EXISTS ads_messages;
-DROP TABLE IF EXISTS ads_messages_log;
-DROP TABLE IF EXISTS presence;
-DROP TABLE IF EXISTS friends_facebook;
-DROP TABLE IF EXISTS users_refs;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.14__drop broken pm_streams.sql b/juick-server/src/main/resources/db/migration/V1.14__drop broken pm_streams.sql
deleted file mode 100644
index 448c5ce2..00000000
--- a/juick-server/src/main/resources/db/migration/V1.14__drop broken pm_streams.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS pm_streams;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql b/juick-server/src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql
deleted file mode 100644
index 6b3ab388..00000000
--- a/juick-server/src/main/resources/db/migration/V1.15__drop unused columns add ts for some tables.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE subscr_users DROP COLUMN `jid`;
-ALTER TABLE subscr_users DROP COLUMN `active`;
-ALTER TABLE auth ADD COLUMN ts timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE mail ADD COLUMN ts timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.16__last seen.sql b/juick-server/src/main/resources/db/migration/V1.16__last seen.sql
deleted file mode 100644
index 52ca4e90..00000000
--- a/juick-server/src/main/resources/db/migration/V1.16__last seen.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE users ADD COLUMN last_seen timestamp(6) NULL;
-UPDATE users SET last_seen=lastmessage;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.1__Add updated_at field.sql b/juick-server/src/main/resources/db/migration/V1.1__Add updated_at field.sql
deleted file mode 100644
index dac179b1..00000000
--- a/juick-server/src/main/resources/db/migration/V1.1__Add updated_at field.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE messages_txt ADD COLUMN updated_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE replies ADD COLUMN updated_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
diff --git a/juick-server/src/main/resources/db/migration/V1.2__Drop telegram_chats.sql b/juick-server/src/main/resources/db/migration/V1.2__Drop telegram_chats.sql
deleted file mode 100644
index c8faee0d..00000000
--- a/juick-server/src/main/resources/db/migration/V1.2__Drop telegram_chats.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO telegram(tg_id, tg_name, loginhash) SELECT chat_id AS tg_id, 'Anonymous', UUID() FROM telegram_chats;
-DROP TABLE telegram_chats;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql b/juick-server/src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql
deleted file mode 100644
index ced85ade..00000000
--- a/juick-server/src/main/resources/db/migration/V1.3__Nullable user_id column in auth table.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE auth MODIFY COLUMN user_id int(10) unsigned NULL;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.4__ActivityPub followers.sql b/juick-server/src/main/resources/db/migration/V1.4__ActivityPub followers.sql
deleted file mode 100644
index 16b39f62..00000000
--- a/juick-server/src/main/resources/db/migration/V1.4__ActivityPub followers.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE IF NOT EXISTS `followers` (
-  `user_id` int(10) unsigned DEFAULT NULL,
-  `acct` char(64) NOT NULL,
-  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE KEY `acct` (`acct`),
-  foreign key (user_id) references users(id)
-);
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.5__Drop acct index.sql b/juick-server/src/main/resources/db/migration/V1.5__Drop acct index.sql
deleted file mode 100644
index 58757d88..00000000
--- a/juick-server/src/main/resources/db/migration/V1.5__Drop acct index.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE followers ADD COLUMN `acct_migr` char(64) NOT NULL;
-UPDATE followers SET `acct_migr` = `acct`;
-ALTER TABLE followers DROP COLUMN `acct`;
-ALTER TABLE followers ADD COLUMN `acct` char(64) NOT NULL;
-UPDATE followers SET `acct` = `acct_migr`;
-ALTER TABLE followers DROP COLUMN `acct_migr`;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.6__user_uri.sql b/juick-server/src/main/resources/db/migration/V1.6__user_uri.sql
deleted file mode 100644
index c302907c..00000000
--- a/juick-server/src/main/resources/db/migration/V1.6__user_uri.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE replies ADD COLUMN user_uri char(255) DEFAULT NULL;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.7__reply_uri.sql b/juick-server/src/main/resources/db/migration/V1.7__reply_uri.sql
deleted file mode 100644
index 9ec35485..00000000
--- a/juick-server/src/main/resources/db/migration/V1.7__reply_uri.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE replies ADD COLUMN reply_uri char(255) DEFAULT NULL;
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.8__html reply.sql b/juick-server/src/main/resources/db/migration/V1.8__html reply.sql
deleted file mode 100644
index 9f939971..00000000
--- a/juick-server/src/main/resources/db/migration/V1.8__html reply.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE replies ADD COLUMN html tinyint(4) NOT NULL DEFAULT '0';
\ No newline at end of file
diff --git a/juick-server/src/main/resources/db/migration/V1.9__reply_uri_index.sql b/juick-server/src/main/resources/db/migration/V1.9__reply_uri_index.sql
deleted file mode 100644
index 0ee3c77f..00000000
--- a/juick-server/src/main/resources/db/migration/V1.9__reply_uri_index.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index reply_uri_index on replies(reply_uri)
\ No newline at end of file