From 06540fec5268e799c859c1f428e64351ab9431e9 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 12 Jul 2016 11:54:57 +0500
Subject: Add Foreign Key Constraint for groupIds

---
 schema/changelog-3.7-notmssql.xml | 19 +++++++++++++++++++
 schema/changelog-3.7.xml          | 24 ++++++++++++++++++++++++
 schema/changelog-master.xml       |  2 ++
 3 files changed, 45 insertions(+)
 create mode 100644 schema/changelog-3.7-notmssql.xml
 create mode 100644 schema/changelog-3.7.xml

(limited to 'schema')

diff --git a/schema/changelog-3.7-notmssql.xml b/schema/changelog-3.7-notmssql.xml
new file mode 100644
index 000000000..a22703073
--- /dev/null
+++ b/schema/changelog-3.7-notmssql.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
+  logicalFilePath="changelog-3.7-notmssql">
+
+  <changeSet author="author" id="changelog-3.7-notmssql">
+
+    <preConditions onFail="CONTINUE">
+        <not>
+            <dbms type="mssql" />
+        </not>
+    </preConditions>
+    <addForeignKeyConstraint baseColumnNames="groupid" baseTableName="groups" constraintName="fk_group_group_groupid" onDelete="SET NULL" onUpdate="RESTRICT" referencedColumnNames="id" referencedTableName="groups"/>
+
+  </changeSet>
+</databaseChangeLog>
diff --git a/schema/changelog-3.7.xml b/schema/changelog-3.7.xml
new file mode 100644
index 000000000..f6e2c713d
--- /dev/null
+++ b/schema/changelog-3.7.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
+  logicalFilePath="changelog-3.7">
+
+  <changeSet author="author" id="changelog-3.7">
+
+    <update tableName="devices">
+        <column name="groupid"/>
+        <where>groupid NOT IN (SELECT id FROM groups)</where>
+    </update>
+
+    <addForeignKeyConstraint baseColumnNames="groupid" baseTableName="devices" constraintName="fk_device_group_groupid" onDelete="SET NULL" onUpdate="RESTRICT" referencedColumnNames="id" referencedTableName="groups"/>
+
+    <update tableName="groups">
+        <column name="groupid"/>
+        <where>groupid NOT IN (SELECT id FROM (SELECT id FROM groups) AS groups_1)</where>
+    </update>
+
+  </changeSet>
+</databaseChangeLog>
diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml
index 399cd3c8d..e6fd842aa 100644
--- a/schema/changelog-master.xml
+++ b/schema/changelog-master.xml
@@ -8,4 +8,6 @@
   <include file="changelog-3.3.xml" relativeToChangelogFile="true" />
   <include file="changelog-3.5.xml" relativeToChangelogFile="true" />
   <include file="changelog-3.6.xml" relativeToChangelogFile="true" />
+  <include file="changelog-3.7.xml" relativeToChangelogFile="true" />
+  <include file="changelog-3.7-notmssql.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
-- 
cgit v1.2.3


From 53ae187eb2912c68411b7a0ec6b42bf7f72f3e0f Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 12 Jul 2016 17:34:55 +0500
Subject: Fix indentation

---
 schema/changelog-3.7-notmssql.xml | 6 +++---
 schema/changelog-3.7.xml          | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'schema')

diff --git a/schema/changelog-3.7-notmssql.xml b/schema/changelog-3.7-notmssql.xml
index a22703073..2478c4628 100644
--- a/schema/changelog-3.7-notmssql.xml
+++ b/schema/changelog-3.7-notmssql.xml
@@ -9,9 +9,9 @@
   <changeSet author="author" id="changelog-3.7-notmssql">
 
     <preConditions onFail="CONTINUE">
-        <not>
-            <dbms type="mssql" />
-        </not>
+      <not>
+        <dbms type="mssql" />
+      </not>
     </preConditions>
     <addForeignKeyConstraint baseColumnNames="groupid" baseTableName="groups" constraintName="fk_group_group_groupid" onDelete="SET NULL" onUpdate="RESTRICT" referencedColumnNames="id" referencedTableName="groups"/>
 
diff --git a/schema/changelog-3.7.xml b/schema/changelog-3.7.xml
index f6e2c713d..8e1af75d0 100644
--- a/schema/changelog-3.7.xml
+++ b/schema/changelog-3.7.xml
@@ -9,15 +9,15 @@
   <changeSet author="author" id="changelog-3.7">
 
     <update tableName="devices">
-        <column name="groupid"/>
-        <where>groupid NOT IN (SELECT id FROM groups)</where>
+      <column name="groupid"/>
+      <where>groupid NOT IN (SELECT id FROM groups)</where>
     </update>
 
     <addForeignKeyConstraint baseColumnNames="groupid" baseTableName="devices" constraintName="fk_device_group_groupid" onDelete="SET NULL" onUpdate="RESTRICT" referencedColumnNames="id" referencedTableName="groups"/>
 
     <update tableName="groups">
-        <column name="groupid"/>
-        <where>groupid NOT IN (SELECT id FROM (SELECT id FROM groups) AS groups_1)</where>
+      <column name="groupid"/>
+      <where>groupid NOT IN (SELECT id FROM (SELECT id FROM groups) AS groups_1)</where>
     </update>
 
   </changeSet>
-- 
cgit v1.2.3


From d7370221110ff21bc202d428fccedacf00b67fed Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 13 Jul 2016 08:55:45 +0500
Subject: Use one file for two changeSets

---
 schema/changelog-3.7-notmssql.xml | 19 -------------------
 schema/changelog-3.7.xml          | 11 +++++++++++
 schema/changelog-master.xml       |  1 -
 3 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 schema/changelog-3.7-notmssql.xml

(limited to 'schema')

diff --git a/schema/changelog-3.7-notmssql.xml b/schema/changelog-3.7-notmssql.xml
deleted file mode 100644
index 2478c4628..000000000
--- a/schema/changelog-3.7-notmssql.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
-  logicalFilePath="changelog-3.7-notmssql">
-
-  <changeSet author="author" id="changelog-3.7-notmssql">
-
-    <preConditions onFail="CONTINUE">
-      <not>
-        <dbms type="mssql" />
-      </not>
-    </preConditions>
-    <addForeignKeyConstraint baseColumnNames="groupid" baseTableName="groups" constraintName="fk_group_group_groupid" onDelete="SET NULL" onUpdate="RESTRICT" referencedColumnNames="id" referencedTableName="groups"/>
-
-  </changeSet>
-</databaseChangeLog>
diff --git a/schema/changelog-3.7.xml b/schema/changelog-3.7.xml
index 8e1af75d0..26248673c 100644
--- a/schema/changelog-3.7.xml
+++ b/schema/changelog-3.7.xml
@@ -21,4 +21,15 @@
     </update>
 
   </changeSet>
+
+  <changeSet author="author" id="changelog-3.7-notmssql">
+
+    <preConditions onFail="CONTINUE">
+      <not>
+        <dbms type="mssql" />
+      </not>
+    </preConditions>
+    <addForeignKeyConstraint baseColumnNames="groupid" baseTableName="groups" constraintName="fk_group_group_groupid" onDelete="SET NULL" onUpdate="RESTRICT" referencedColumnNames="id" referencedTableName="groups"/>
+
+  </changeSet>
 </databaseChangeLog>
diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml
index e6fd842aa..3b62537d0 100644
--- a/schema/changelog-master.xml
+++ b/schema/changelog-master.xml
@@ -9,5 +9,4 @@
   <include file="changelog-3.5.xml" relativeToChangelogFile="true" />
   <include file="changelog-3.6.xml" relativeToChangelogFile="true" />
   <include file="changelog-3.7.xml" relativeToChangelogFile="true" />
-  <include file="changelog-3.7-notmssql.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
-- 
cgit v1.2.3


From f96d6a68af0b82f331f187cfd5506e603742e37f Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 13 Jul 2016 09:08:16 +0500
Subject: Set MARK_RAN and name for intermediate table

---
 schema/changelog-3.7.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'schema')

diff --git a/schema/changelog-3.7.xml b/schema/changelog-3.7.xml
index 26248673c..5e836a99c 100644
--- a/schema/changelog-3.7.xml
+++ b/schema/changelog-3.7.xml
@@ -17,14 +17,14 @@
 
     <update tableName="groups">
       <column name="groupid"/>
-      <where>groupid NOT IN (SELECT id FROM (SELECT id FROM groups) AS groups_1)</where>
+      <where>groupid NOT IN (SELECT id FROM (SELECT id FROM groups) AS groups_ids)</where>
     </update>
 
   </changeSet>
 
   <changeSet author="author" id="changelog-3.7-notmssql">
 
-    <preConditions onFail="CONTINUE">
+    <preConditions onFail="MARK_RAN">
       <not>
         <dbms type="mssql" />
       </not>
-- 
cgit v1.2.3