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

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