From 6cfb503b400cbee3689cfb256a9779a024fe7f1d Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 10 Oct 2018 11:30:48 +1300
Subject: Add clean 4.0 changelog (fix #4035)

---
 schema/changelog-3.10.xml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'schema/changelog-3.10.xml')

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 @@
 
   <changeSet author="author" id="changelog-3.10">
 
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <tableExists tableName="tc_servers" />
+      </not>
+    </preConditions>
+
     <createTable tableName="calendars">
       <column name="id" type="INT" autoIncrement="true">
         <constraints primaryKey="true" />
@@ -64,8 +70,8 @@
     <addForeignKeyConstraint baseTableName="user_user" baseColumnNames="userid" constraintName="fk_user_user_userid" referencedTableName="users" referencedColumnNames="id" onDelete="CASCADE" />
 
     <update tableName="users">
-        <column name="devicelimit" valueNumeric="-1" />
-        <where>devicelimit = 0</where>
+      <column name="devicelimit" valueNumeric="-1" />
+      <where>devicelimit = 0</where>
     </update>
     <dropDefaultValue tableName="users" columnName="devicelimit" />
     <addDefaultValue tableName="users" columnName="devicelimit" defaultValueNumeric="-1" />
@@ -79,10 +85,14 @@
   <changeSet author="author" id="changelog-3.10-notmssql">
 
     <preConditions onFail="MARK_RAN">
+      <not>
+        <tableExists tableName="tc_servers" />
+      </not>
       <not>
         <dbms type="mssql" />
       </not>
     </preConditions>
+
     <addForeignKeyConstraint baseTableName="user_user" baseColumnNames="manageduserid" constraintName="fk_user_user_manageduserid" referencedTableName="users" referencedColumnNames="id" onDelete="CASCADE" />
 
   </changeSet>
@@ -90,8 +100,12 @@
   <changeSet author="author" id="changelog-3.10-mssql">
 
     <preConditions onFail="MARK_RAN">
+      <not>
+        <tableExists tableName="tc_servers" />
+      </not>
       <dbms type="mssql" />
     </preConditions>
+
     <sql>
       CREATE TRIGGER tg_users_delete
       ON users FOR DELETE
@@ -105,8 +119,12 @@
   <changeSet author="author" id="changelog-3.7-mssql">
 
     <preConditions onFail="MARK_RAN">
+      <not>
+        <tableExists tableName="tc_servers" />
+      </not>
       <dbms type="mssql" />
     </preConditions>
+
     <sql>
       CREATE TRIGGER tg_groups_delete
       ON groups FOR DELETE
-- 
cgit v1.2.3