Skip to content
Snippets Groups Projects
Commit 1dc4cf0e authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge master into Feature_1034869 

Conflicts:
	others/db_changes/masterChangelog.xml
parents 74fdccc1 e5f863eb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 108 additions and 13 deletions
others/db_changes/data_alias/data/example_task/base.xml → others/db_changes/data_alias/basic/2019.2/data/example_task/base.xml
+ 3
− 3
View file @ 1dc4cf0e
......@@ -7,7 +7,7 @@
</column>
<column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
<column name="CODE" valueNumeric="10000"/>
<column name="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
<column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
......@@ -28,7 +28,7 @@
</column>
<column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
<column name="CODE" valueNumeric="10001"/>
<column name="SUBJECT" value="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
<column name="STATUS" value="00595a73-22e2-4c3b-a21c-06bdec262d20"/>
......@@ -49,7 +49,7 @@
</column>
<column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
<column name="CODE" valueNumeric="10002"/>
<column name="SUBJECT" value="Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris"/>
<column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
......
others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml 0 → 100644
+ 13
− 0
View file @ 1dc4cf0e
<?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 author="j.goderbauer" id="598345d1-691b-4cae-b1c0-44c9c48705c8">
<dropNotNullConstraint tableName="TASK" columnName="CODE" />
<update tableName="TASK">
<column name="CODE"/>
</update>
<rollback>
<addNotNullConstraint tableName="TASK" columnName="CODE" />
<!--the update which sets everything to null cannot be rolled back-->
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/data_alias/struct/activity_add_parent.xml → others/db_changes/data_alias/basic/2019.2/task_add_parent.xml
+ 7
− 10
View file @ 1dc4cf0e
<?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 author="a.loreth" id="31d7b6f2-c376-4bfa-ba42-9aab6f07737c">
<addColumn
tableName="ACTIVITY">
<column name="PARENT_CONTEXT" type="VARCHAR(64)" />
<column name="PARENT_ID" type="CHAR(36)" />
</addColumn>
</changeSet>
</databaseChangeLog>
<changeSet author="a.loreth" id="a1890934-4f52-4623-a587-9d690505bbaf">
<addColumn tableName="TASK">
<column name="PARENT_CONTEXT" type="VARCHAR(64)"/>
<column name="PARENT_ID" type="CHAR(36)"/>
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/data_alias/basic/2019.2/update_TaskType_Task.xml 0 → 100644
+ 85
− 0
View file @ 1dc4cf0e
<?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 author="a.loreth" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
<column name="KEYID" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
<column name="TITLE" value="Task"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="971b9424-9dda-4a4b-b6db-66c3ae3258ad" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="54231fc1-050e-4f00-91e1-4968387a6370" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b" />
</whereParams>
</delete>
<rollback>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
</whereParams>
</delete>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0"/>
<column name="KEYID" value="2594110a-a5a2-4516-a581-7540167e3976"/>
<column name="TITLE" value="Visit"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="971b9424-9dda-4a4b-b6db-66c3ae3258ad"/>
<column name="KEYID" value="d1765fbd-3388-4ac1-a67e-22533f14ef94"/>
<column name="TITLE" value="E-Mail"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="54231fc1-050e-4f00-91e1-4968387a6370"/>
<column name="KEYID" value="c402d3ad-9c46-4e79-b7fa-f70b771cb9d0"/>
<column name="TITLE" value="Phone"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b"/>
<column name="KEYID" value="76188d38-a969-420e-bb99-d713ad7ce6fb"/>
<column name="TITLE" value="Online-Meeting"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment