From 6cfb503b400cbee3689cfb256a9779a024fe7f1d Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 10 Oct 2018 11:30:48 +1300 Subject: Add clean 4.0 changelog (fix #4035) --- schema/changelog-3.10.xml | 22 +- schema/changelog-3.11.xml | 6 + schema/changelog-3.12.xml | 20 +- schema/changelog-3.14.xml | 7 + schema/changelog-3.15.xml | 7 + schema/changelog-3.16.xml | 7 + schema/changelog-3.17.xml | 10 + schema/changelog-3.3.xml | 3 +- schema/changelog-3.5.xml | 3 +- schema/changelog-3.6.xml | 3 +- schema/changelog-3.7.xml | 11 + schema/changelog-3.8.xml | 7 + schema/changelog-3.9.xml | 21 +- schema/changelog-4.0-clean.xml | 679 +++++++++++++++++++++++++++++++++++++++++ schema/changelog-4.0.xml | 72 +++-- schema/changelog-master.xml | 3 + 16 files changed, 835 insertions(+), 46 deletions(-) create mode 100644 schema/changelog-4.0-clean.xml (limited to 'schema') diff --git a/schema/changelog-3.10.xml b/schema/changelog-3.10.xml index 4c64373e9..6d4fa634c 100644 --- a/schema/changelog-3.10.xml +++ b/schema/changelog-3.10.xml @@ -8,6 +8,12 @@ + + + + + + @@ -64,8 +70,8 @@ - - devicelimit = 0 + + devicelimit = 0 @@ -79,10 +85,14 @@ + + + + @@ -90,8 +100,12 @@ + + + + CREATE TRIGGER tg_users_delete ON users FOR DELETE @@ -105,8 +119,12 @@ + + + + CREATE TRIGGER tg_groups_delete ON groups FOR DELETE diff --git a/schema/changelog-3.11.xml b/schema/changelog-3.11.xml index 1fdaa3f17..31893c0df 100644 --- a/schema/changelog-3.11.xml +++ b/schema/changelog-3.11.xml @@ -8,6 +8,12 @@ + + + + + + diff --git a/schema/changelog-3.12.xml b/schema/changelog-3.12.xml index 19c67cb36..0d8c8550f 100644 --- a/schema/changelog-3.12.xml +++ b/schema/changelog-3.12.xml @@ -8,6 +8,12 @@ + + + + + + @@ -77,12 +83,6 @@ - - @@ -99,10 +99,14 @@ + + + + @@ -111,9 +115,13 @@ + + + SELECT data_type FROM information_schema.columns WHERE table_name = 'calendars' AND column_name = 'data'; + diff --git a/schema/changelog-3.14.xml b/schema/changelog-3.14.xml index f6cda4c1f..063adeed7 100644 --- a/schema/changelog-3.14.xml +++ b/schema/changelog-3.14.xml @@ -8,6 +8,12 @@ + + + + + + @@ -64,4 +70,5 @@ + diff --git a/schema/changelog-3.15.xml b/schema/changelog-3.15.xml index 202ae21eb..64afd5c31 100644 --- a/schema/changelog-3.15.xml +++ b/schema/changelog-3.15.xml @@ -8,6 +8,12 @@ + + + + + + @@ -141,4 +147,5 @@ + diff --git a/schema/changelog-3.16.xml b/schema/changelog-3.16.xml index 74fe35c3d..b5af517da 100644 --- a/schema/changelog-3.16.xml +++ b/schema/changelog-3.16.xml @@ -8,6 +8,12 @@ + + + + + + @@ -27,4 +33,5 @@ + diff --git a/schema/changelog-3.17.xml b/schema/changelog-3.17.xml index 09d07fcf1..dd4e18b2a 100644 --- a/schema/changelog-3.17.xml +++ b/schema/changelog-3.17.xml @@ -9,6 +9,9 @@ + + + @@ -20,6 +23,12 @@ + + + + + + @@ -82,4 +91,5 @@ + diff --git a/schema/changelog-3.3.xml b/schema/changelog-3.3.xml index e5f29c661..4a34c6626 100644 --- a/schema/changelog-3.3.xml +++ b/schema/changelog-3.3.xml @@ -10,7 +10,7 @@ - + @@ -185,4 +185,5 @@ + diff --git a/schema/changelog-3.5.xml b/schema/changelog-3.5.xml index 934f389b2..7adfc9f2f 100644 --- a/schema/changelog-3.5.xml +++ b/schema/changelog-3.5.xml @@ -10,7 +10,7 @@ - + @@ -65,4 +65,5 @@ + diff --git a/schema/changelog-3.6.xml b/schema/changelog-3.6.xml index 2e7cd61c8..27701640f 100644 --- a/schema/changelog-3.6.xml +++ b/schema/changelog-3.6.xml @@ -10,7 +10,7 @@ - + @@ -112,4 +112,5 @@ + diff --git a/schema/changelog-3.7.xml b/schema/changelog-3.7.xml index 1bae2aaff..1d1cdbaac 100644 --- a/schema/changelog-3.7.xml +++ b/schema/changelog-3.7.xml @@ -8,6 +8,12 @@ + + + + + + groupid NOT IN (SELECT id FROM groups) @@ -41,11 +47,16 @@ + + + + + diff --git a/schema/changelog-3.8.xml b/schema/changelog-3.8.xml index c80a8442c..fed12c563 100644 --- a/schema/changelog-3.8.xml +++ b/schema/changelog-3.8.xml @@ -8,6 +8,12 @@ + + + + + + @@ -121,4 +127,5 @@ + diff --git a/schema/changelog-3.9.xml b/schema/changelog-3.9.xml index 93fa6123b..9a797ff7d 100644 --- a/schema/changelog-3.9.xml +++ b/schema/changelog-3.9.xml @@ -8,30 +8,37 @@ + + + + + + - - attributes = '{"web":"true"}' + + attributes = '{"web":"true"}' - + attributes = '{"mail":"true"}' - - - attributes = '{"web":"true","mail":"true"}' + + + attributes = '{"web":"true","mail":"true"}' - + + diff --git a/schema/changelog-4.0-clean.xml b/schema/changelog-4.0-clean.xml new file mode 100644 index 000000000..96490a3f0 --- /dev/null +++ b/schema/changelog-4.0-clean.xml @@ -0,0 +1,679 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CREATE TRIGGER tg_groups_delete + ON tc_groups FOR DELETE + AS BEGIN + UPDATE tc_groups SET groupid = NULL WHERE groupid IN (SELECT deleted.id FROM deleted) + END + + + + CREATE TRIGGER tg_users_delete + ON tc_users FOR DELETE + AS BEGIN + DELETE FROM tc_user_user WHERE manageduserid IN (SELECT deleted.id FROM deleted) + END + + + + + diff --git a/schema/changelog-4.0.xml b/schema/changelog-4.0.xml index d1944c4f5..337cdc884 100644 --- a/schema/changelog-4.0.xml +++ b/schema/changelog-4.0.xml @@ -54,7 +54,11 @@ + + + + @@ -69,6 +73,9 @@ + + + @@ -78,38 +85,38 @@ - - web = 1 AND mail = 1 AND sms = 1 + + web = 1 AND mail = 1 AND sms = 1 - - web = 1 AND mail = 1 AND sms = 0 + + web = 1 AND mail = 1 AND sms = 0 - - web = 1 AND mail = 0 AND sms = 0 + + web = 1 AND mail = 0 AND sms = 0 - - web = 1 AND mail = 0 AND sms = 1 + + web = 1 AND mail = 0 AND sms = 1 - - web = 0 AND mail = 1 AND sms = 1 + + web = 0 AND mail = 1 AND sms = 1 - - web = 0 AND mail = 1 AND sms = 0 + + web = 0 AND mail = 1 AND sms = 0 - - web = 0 AND mail = 0 AND sms = 1 + + web = 0 AND mail = 0 AND sms = 1 @@ -117,6 +124,9 @@ + + + @@ -124,44 +134,50 @@ - - web = TRUE AND mail = TRUE AND sms = TRUE + + web = TRUE AND mail = TRUE AND sms = TRUE - - web = TRUE AND mail = TRUE AND sms = FALSE + + web = TRUE AND mail = TRUE AND sms = FALSE - - web = TRUE AND mail = FALSE AND sms = FALSE + + web = TRUE AND mail = FALSE AND sms = FALSE - - web = TRUE AND mail = FALSE AND sms = TRUE + + web = TRUE AND mail = FALSE AND sms = TRUE - - web = FALSE AND mail = TRUE AND sms = TRUE + + web = FALSE AND mail = TRUE AND sms = TRUE - - web = FALSE AND mail = TRUE AND sms = FALSE + + web = FALSE AND mail = TRUE AND sms = FALSE - - web = FALSE AND mail = FALSE AND sms = TRUE + + web = FALSE AND mail = FALSE AND sms = TRUE + + + + + + diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml index e8fbc0c4b..c14a2b4d4 100644 --- a/schema/changelog-master.xml +++ b/schema/changelog-master.xml @@ -5,6 +5,8 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> + + @@ -19,4 +21,5 @@ + -- cgit v1.2.3