From 81fc0c9afcea0fb6daa758d28325210cbb8f314f Mon Sep 17 00:00:00 2001 From: Jonas L Date: Mon, 31 Jan 2022 10:19:53 +0100 Subject: [PATCH] fix(legacy): clean sql migrations files (#1545) * fix(legacy): do not fail on fresh sql migration * fix(legacy): sql only drop if exists * fix(legacy): remove unused in db locales These inserts are making migration fail --- legacy/build/sql/defaultdata.sql | 20 -------------------- legacy/build/sql/sequences.sql | 4 ++-- legacy/build/sql/triggers.sql | 6 +++--- legacy/build/sql/views.sql | 4 ++-- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/legacy/build/sql/defaultdata.sql b/legacy/build/sql/defaultdata.sql index 82b27c1e0..1b58b34b4 100644 --- a/legacy/build/sql/defaultdata.sql +++ b/legacy/build/sql/defaultdata.sql @@ -328,26 +328,6 @@ INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA'); INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_locale', 'en_CA'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English (Canada)'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_GB', 'English (Britain)'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_US', 'English (USA)'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('cs_CZ', 'Český'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_DE', 'Deutsch'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_AT', 'Deutsch (Österreich)'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('el_GR', 'Ελληνικά'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('es_ES', 'Español'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('fr_FR', 'Français'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('hr_HR', 'Hrvatski'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('hu_HU', 'Magyar'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('it_IT', 'Italiano'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ko_KR', '한국어'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('pl_PL', 'Polski'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('pt_BR', 'Português (Brasil)'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ru_RU', 'Русский'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('sr_RS', 'Српски (Ћирилица)'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('sr_RS@latin', 'Srpski (Latinica)'); -INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', '简体中文'); - -- end of added in 2.3 -- added in 2.5.2 diff --git a/legacy/build/sql/sequences.sql b/legacy/build/sql/sequences.sql index 867983d69..1b24aeb07 100644 --- a/legacy/build/sql/sequences.sql +++ b/legacy/build/sql/sequences.sql @@ -1,7 +1,7 @@ -DROP SEQUENCE schedule_group_id_seq CASCADE; +DROP SEQUENCE IF EXISTS schedule_group_id_seq CASCADE; CREATE SEQUENCE schedule_group_id_seq; -DROP SEQUENCE show_group_id_seq CASCADE; +DROP SEQUENCE IF EXISTS show_group_id_seq CASCADE; CREATE SEQUENCE show_group_id_seq; diff --git a/legacy/build/sql/triggers.sql b/legacy/build/sql/triggers.sql index 02f3d57de..c28ada902 100644 --- a/legacy/build/sql/triggers.sql +++ b/legacy/build/sql/triggers.sql @@ -1,6 +1,6 @@ ---------------------------------------------------------------------------------- ---calculate_position() +-- calculate_position() ---------------------------------------------------------------------------------- -DROP FUNCTION calculate_position() CASCADE; +DROP FUNCTION IF EXISTS calculate_position CASCADE; ---remove this trigger for group adds/delete +-- remove this trigger for group adds/delete diff --git a/legacy/build/sql/views.sql b/legacy/build/sql/views.sql index 3402dafe6..7cbc6a4dd 100644 --- a/legacy/build/sql/views.sql +++ b/legacy/build/sql/views.sql @@ -1,5 +1,5 @@ ------------------------------------------------------- ----cc_playlisttimes +-- cc_playlisttimes ------------------------------------------------------- -DROP VIEW cc_playlisttimes; +DROP VIEW IF EXISTS cc_playlisttimes;