From 796f31ace1c6749385a4b2a255cd881277362e53 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Feb 2019 14:51:36 +0100
Subject: [PATCH] Merge origin/master into #1035025_SALUTATION

Conflicts:
	entity/Person_entity/Person_entity.aod
	entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
	others/db_changes/masterChangelog.xml
---
 .../data_alias/basic/2019.2/changelog.xml     |   2 +-
 .../basic/2019.2/create_salutation.xml        | 332 ++++++++++++++++++
 .../basic/2019.2/removeTaskCode.xml           |  13 -
 .../data_alias/struct/create_salutation.xml   |  17 -
 4 files changed, 333 insertions(+), 31 deletions(-)
 create mode 100644 others/db_changes/data_alias/basic/2019.2/create_salutation.xml
 delete mode 100644 others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
 delete mode 100644 others/db_changes/data_alias/struct/create_salutation.xml

diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index f96d83ec7e7..c2994f22062 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -37,5 +37,5 @@
     <include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
 	
     <include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
-    <include relativeToChangelogFile="true" file="removeTaskCode.xml"/>
+    <include relativeToChangelogFile="true" file="create_salutation.xml"/>
 </databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/create_salutation.xml b/others/db_changes/data_alias/basic/2019.2/create_salutation.xml
new file mode 100644
index 00000000000..86848438ed5
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/create_salutation.xml
@@ -0,0 +1,332 @@
+<?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.luginger" id="936582fe-351f-11e9-b210-d663bd873d93">
+        <createTable tableName="SALUTATION">
+            <column name="SALUTATIONID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_SALUTATION_SALUTATIONID"/>
+            </column>   
+            <column name="HEADLINE" type="NVARCHAR(50)"/>                       
+            <column name="LANGUAGE" type="CHAR(36)"/>
+            <column name="LETTERSALUTATION" type="NVARCHAR(50)"/>
+            <column name="SALUTATION" type="NVARCHAR(50)"/>
+            <column name="SEX" type="CHAR(36)"/>
+            <column name="SORT" type="INTEGER"/>
+            <column name="TITLE" type="NVARCHAR(30)"/>       
+        </createTable>
+        
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Herr {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrter Herr {ln}"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE"/>
+            <column name="SALUTATION" value="Herr"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="1"/>
+            <column name="SALUTATIONID" value="c98c8644-9e00-4715-a775-827a364f5cef"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Herr Bürgermeister {fn} - {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrter Herr Bürgermeister"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Bürgermeister"/>
+            <column name="SALUTATION" value="Herr"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="2"/>
+            <column name="SALUTATIONID" value="8feaf27b-1fae-4d8c-a742-9cd023f46409"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Frau {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrte Frau {ln}"/>
+            <column name="SEX" value="f"/>
+            <column name="TITLE"/>
+            <column name="SALUTATION" value="Frau"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="3"/>
+            <column name="SALUTATIONID" value="cbcc2c2b-9b64-442b-a6be-aaf8e462128c"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrte Damen und Herren"/>
+            <column name="SEX"/>
+            <column name="TITLE"/>
+            <column name="SALUTATION"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="4"/>
+            <column name="SALUTATIONID" value="6b835563-5d3e-4c4c-807b-63c5bdb82e68"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="{ti} {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Dear Dr.  {ln}"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Dr."/>
+            <column name="SALUTATION" value="Mr."/>
+            <column name="LANGUAGE" value="en"/>
+            <column name="SORT" valueNumeric="5"/>
+            <column name="SALUTATIONID" value="f9135efb-ebd4-4c9f-bfa1-3beedb647009"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Dr. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Dear Dr. {ln}"/>
+            <column name="SEX" value="f"/>
+            <column name="TITLE" value="Dr."/>
+            <column name="SALUTATION" value="Mrs."/>
+            <column name="LANGUAGE" value="en"/>
+            <column name="SORT" valueNumeric="6"/>
+            <column name="SALUTATIONID" value="0b9a3d9b-a56c-47e9-a984-e88cface58db"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE"/>
+            <column name="LETTERSALUTATION" value="Madame, Monsieur"/>
+            <column name="SEX"/>
+            <column name="TITLE"/>
+            <column name="SALUTATION"/>
+            <column name="LANGUAGE" value="fra"/>
+            <column name="SORT" valueNumeric="7"/>
+            <column name="SALUTATIONID" value="ff97826d-a8ea-45e5-b426-2a27f4fa9201"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Monsieur {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Monsieur"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE"/>
+            <column name="SALUTATION" value="Monsieur"/>
+            <column name="LANGUAGE" value="fra"/>
+            <column name="SORT" valueNumeric="8"/>
+            <column name="SALUTATIONID" value="c1095e86-38d6-4329-a388-4cfabab10eae"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Frau Dr. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrte Frau Dr. {ln}"/>
+            <column name="SEX" value="f"/>
+            <column name="TITLE" value="Dr."/>
+            <column name="SALUTATION" value="Frau"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="9"/>
+            <column name="SALUTATIONID" value="6b35b8c5-920c-408b-b172-453a506aa775"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Monsieur Prof.{fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Monsieur Prof."/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Prof."/>
+            <column name="SALUTATION" value="Monsieur"/>
+            <column name="LANGUAGE" value="fra"/>
+            <column name="SORT" valueNumeric="10"/>
+            <column name="SALUTATIONID" value="67fa73ae-a739-44fd-9244-28a49bc0d01d"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Monsieur Dr.{fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Monsieur Dr."/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Dr."/>
+            <column name="SALUTATION" value="Monsieur"/>
+            <column name="LANGUAGE" value="fra"/>
+            <column name="SORT" valueNumeric="11"/>
+            <column name="SALUTATIONID" value="516b740d-b932-4a64-b611-af0ea69f6bd0"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Herr Professor {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Professor"/>
+            <column name="SALUTATION" value="Herr"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="12"/>
+            <column name="SALUTATIONID" value="5d9ad542-27b8-4dec-bcbd-a2c7d223f012"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Herr Dr. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrter Herr Dr. {ln}"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Dr."/>
+            <column name="SALUTATION" value="Herr"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="13"/>
+            <column name="SALUTATIONID" value="76fe57c0-cf68-4240-ba6d-eb7d52f46317"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Herr Präsident {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrter Herr Präsident"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Präsident"/>
+            <column name="SALUTATION" value="Herr"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="14"/>
+            <column name="SALUTATIONID" value="4b9af3f4-f34a-4170-a28c-ffdbca80c4d3"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Herr Prof. Dr. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Prof. Dr."/>
+            <column name="SALUTATION" value="Herr"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="15"/>
+            <column name="SALUTATIONID" value="1f19ba34-8346-4620-a10e-fb39fdd0be9b"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Mr. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Dear Mr. {ln}"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE"/>
+            <column name="SALUTATION" value="Mr."/>
+            <column name="LANGUAGE" value="en"/>
+            <column name="SORT" valueNumeric="16"/>
+            <column name="SALUTATIONID" value="801efd2a-41ce-4a5d-8ed5-c2db7fedb4e8"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Professor {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Dear Professor {ln}"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Professor"/>
+            <column name="SALUTATION" value="Mr."/>
+            <column name="LANGUAGE" value="en"/>
+            <column name="SORT" valueNumeric="17"/>
+            <column name="SALUTATIONID" value="ce348b08-c1bf-4e76-8272-6d6b32ecdd6a"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Mrs. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Dear Mrs. {ln}"/>
+            <column name="SEX" value="f"/>
+            <column name="TITLE"/>
+            <column name="SALUTATION" value="Mrs."/>
+            <column name="LANGUAGE" value="en"/>
+            <column name="SORT" valueNumeric="18"/>
+            <column name="SALUTATIONID" value="11816f93-f6e9-427f-af68-fbf29c3e3544"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Madame {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Madame"/>
+            <column name="SEX" value="f"/>
+            <column name="TITLE"/>
+            <column name="SALUTATION" value="Madame"/>
+            <column name="LANGUAGE" value="fra"/>
+            <column name="SORT" valueNumeric="19"/>
+            <column name="SALUTATIONID" value="2360e24d-1784-47b8-b0e9-3b57bd704e8a"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE"/>
+            <column name="LETTERSALUTATION" value="Dear Sir or Madame"/>
+            <column name="SEX"/>
+            <column name="TITLE"/>
+            <column name="SALUTATION"/>
+            <column name="LANGUAGE" value="en"/>
+            <column name="SORT" valueNumeric="20"/>
+            <column name="SALUTATIONID" value="f7b3c876-366d-438a-a1e6-f17ceb641f36"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Herr Prof. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Prof."/>
+            <column name="SALUTATION" value="Herr"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="21"/>
+            <column name="SALUTATIONID" value="75f4f04f-1877-425d-8d5d-56604d0040b2"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Monsieur Prof.Dr.{fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Monsieur Prof.Dr."/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Prof.Dr."/>
+            <column name="SALUTATION" value="Monsieur"/>
+            <column name="LANGUAGE" value="fra"/>
+            <column name="SORT" valueNumeric="22"/>
+            <column name="SALUTATIONID" value="2d8ec97f-38d7-45a8-9c45-ed672f4b035d"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Madame Dr.{fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Madame Dr."/>
+            <column name="SEX" value="f"/>
+            <column name="TITLE" value="Dr."/>
+            <column name="SALUTATION" value="Madame"/>
+            <column name="LANGUAGE" value="fra"/>
+            <column name="SORT" valueNumeric="23"/>
+            <column name="SALUTATIONID" value="4e76c69b-ee75-49e5-8581-2a808b29a117"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Monsieur Dr. Ing. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Monsieur Dr. Ing. {ln}"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Dr. Ing."/>
+            <column name="SALUTATION" value="Monsieur"/>
+            <column name="LANGUAGE" value="fra"/>
+            <column name="SORT" valueNumeric="24"/>
+            <column name="SALUTATIONID" value="f3ea547a-d744-4ce8-815a-126d9697e037"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Madame Dr. Ing. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Madame Dr. Ing. {ln}"/>
+            <column name="SEX" value="f"/>
+            <column name="TITLE" value="Dr. Ing."/>
+            <column name="SALUTATION" value="Madame"/>
+            <column name="LANGUAGE" value="fra"/>
+            <column name="SORT" valueNumeric="25"/>
+            <column name="SALUTATIONID" value="e8e001ab-b200-480f-917b-33d57e2a8734"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Frau Dr. Ing. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrte Frau Dr. Ing. {ln}"/>
+            <column name="SEX" value="f"/>
+            <column name="TITLE" value="Dr. Ing."/>
+            <column name="SALUTATION" value="Frau"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="26"/>
+            <column name="SALUTATIONID" value="0e719a2a-1018-49e0-b056-c90779955bf9"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Herr Dr. Ing. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Sehr geehrter Herr Dr. Ing. {ln}"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Dr. Ing."/>
+            <column name="SALUTATION" value="Herr"/>
+            <column name="LANGUAGE" value="deu"/>
+            <column name="SORT" valueNumeric="27"/>
+            <column name="SALUTATIONID" value="0500939e-5820-457d-a95f-6835b9501df9"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Mr. Dr. Ing. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Dear Dr. Ing. {ln}"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Dr. Ing."/>
+            <column name="SALUTATION" value="Mr."/>
+            <column name="LANGUAGE" value="en"/>
+            <column name="SORT" valueNumeric="28"/>
+            <column name="SALUTATIONID" value="5260f79c-1001-41dc-b3ff-28b4ce7091b9"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Señor Dr. Ing. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Estimado Dr. Ing. {ln}"/>
+            <column name="SEX" value="m"/>
+            <column name="TITLE" value="Dr. Ing."/>
+            <column name="SALUTATION" value="Señor"/>
+            <column name="LANGUAGE" value="spa"/>
+            <column name="SORT" valueNumeric="29"/>
+            <column name="SALUTATIONID" value="7617a199-82b7-40ef-b2f7-0e85d32fad64"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Señora Dr. Ing. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Estimado Dr. Ing. {ln}"/>
+            <column name="SEX" value="f"/>
+            <column name="TITLE" value="Dr. Ing."/>
+            <column name="SALUTATION" value="Señora"/>
+            <column name="LANGUAGE" value="spa"/>
+            <column name="SORT" valueNumeric="30"/>
+            <column name="SALUTATIONID" value="25b28c87-edb5-4686-a3c4-92a5136aadc0"/>
+        </insert>
+        <insert tableName="SALUTATION">
+            <column name="HEADLINE" value="Mrs. Dr. Ing. {fn} {ln}"/>
+            <column name="LETTERSALUTATION" value="Dear Dr. Ing. {ln}"/>
+            <column name="SEX" value="f"/>
+            <column name="TITLE" value="Dr. Ing."/>
+            <column name="SALUTATION" value="Mrs."/>
+            <column name="LANGUAGE" value="en"/>
+            <column name="SORT" valueNumeric="31"/>
+            <column name="SALUTATIONID" value="4505783d-8a9f-4a18-ba2e-091794db3812"/>
+        </insert>
+        
+        <rollback>
+            <dropTable tableName="SALUTATION"/>
+        </rollback>
+    </changeSet>
+</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml b/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
deleted file mode 100644
index a74490dfcf3..00000000000
--- a/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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
diff --git a/others/db_changes/data_alias/struct/create_salutation.xml b/others/db_changes/data_alias/struct/create_salutation.xml
deleted file mode 100644
index 52ec7e8e9c8..00000000000
--- a/others/db_changes/data_alias/struct/create_salutation.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.luginger" id="936582fe-351f-11e9-b210-d663bd873d93">
-	<createTable tableName="SALUTATION">
-		<column name="SALUTATIONID" type="CHAR(36)">
-			<constraints primaryKey="true" primaryKeyName="PK_SALUTATION_SALUTATIONID"/>
-		</column>   
-                <column name="HEADLINE" type="NVARCHAR(50)"/>                       
-                <column name="LANGUAGE" type="CHAR(3)"/>
-		<column name="LETTERSALUTATION" type="NVARCHAR(50)"/>
-                <column name="SALUTATION" type="NVARCHAR(50)"/>
-                <column name="SEX" type="CHAR(36)"/>
-                <column name="SORT" type="INTEGER"/>
-                <column name="TITLE" type="NVARCHAR(30)"/>
-	</createTable>      
-</changeSet>
-</databaseChangeLog>
-- 
GitLab