fix liquibase

.liquibase/Data_alias/basic/2019.2/alter_activityLink_Derby.xml → .liquibase/Data_alias/basic/2019.2/alter_activityLink.xml

@@ -8,4 +8,14 @@
             RENAME COLUMN ACTIVITYLINK.ACTIVITY_ID_NEW TO ACTIVITY_ID;
         </sql>
     </changeSet>
+    
+    <changeSet author="j.hoermann" id="9a86323f-a299-42a5-937a-f5e37d0db507">
+        <preConditions onFail="CONTINUE">
+            <not>
+                <dbms type="derby" />
+            </not>
+        </preConditions>
+
+        <modifyDataType tableName="ACTIVITYLINK" columnName="ACTIVITY_ID" newDataType="CHAR(36)"/>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2019.2/alter_activityLink_notDerby.xml

-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet dbms="!derby" author="j.hoermann" id="634590d7-8bcc-40f9-9615-9de7cd91e586">
-        <modifyDataType tableName="ACTIVITYLINK" columnName="ACTIVITY_ID" newDataType="CHAR(36)"/>
-    </changeSet>
-</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2019.2/change_Milestone_datatype_to_new_Keyword_logic_Derby.xml → .liquibase/Data_alias/basic/2019.2/change_Milestone_datatype_to_new_Keyword_logic.xml

@@ -13,4 +13,15 @@
             RENAME COLUMN SALESPROJECT_MILESTONE.VALUE_NEW TO VALUE;
         </sql>
     </changeSet>
+    
+    <changeSet author="j.hoermann" id="f5074961-4aa0-4cd8-8541-7381ddfb0b71">
+        <preConditions onFail="CONTINUE">
+            <not>
+                <dbms type="derby" />
+            </not>
+        </preConditions>
+
+        <modifyDataType tableName="SALESPROJECT_MILESTONE" columnName="TYPE" newDataType="NVARCHAR(80)"/>
+        <modifyDataType tableName="SALESPROJECT_MILESTONE" columnName="VALUE" newDataType="CHAR(36)"/>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2019.2/change_Milestone_datatype_to_new_Keyword_logic_notDerby.xml

-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet dbms="!derby" author="j.hoermann" id="f5074961-4aa0-4cd8-8541-7381ddfb0b71">
-        <modifyDataType tableName="SALESPROJECT_MILESTONE" columnName="TYPE" newDataType="NVARCHAR(80)"/>
-        <modifyDataType tableName="SALESPROJECT_MILESTONE" columnName="VALUE" newDataType="CHAR(36)"/>
-    </changeSet>
-</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2019.2/changelog.xml

@@ -133,14 +133,10 @@
     <include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml" />
     <include relativeToChangelogFile="true" file="Contactmanagement_added_ImageBlobs.xml" />
 	
-    <!-- Derby needs special handling -->
-    <include relativeToChangelogFile="true" file="alter_activityLink_notDerby.xml" />
-    <include relativeToChangelogFile="true" file="alter_activityLink_Derby.xml" />
+    <include relativeToChangelogFile="true" file="alter_activityLink.xml" />
     
     <include relativeToChangelogFile="true" file="renameCycle_to_Milestone.xml" />
-    <!-- Derby needs special handling -->
-    <include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic_notDerby.xml" />
-    <include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic_Derby.xml" />
+    <include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic.xml" />
     <include relativeToChangelogFile="true" file="update_Milestone_to_new_Keyword.xml" />
 
     <include relativeToChangelogFile="true" file="data/example_person/PERSON_admin.xml" context="example"/>