From 8ecacc77f8265bcd57bab0ebf315071c7a1f8b50 Mon Sep 17 00:00:00 2001
From: woodjes <jessica.woodland-scott@db.com>
Date: Tue, 6 Feb 2024 11:28:20 +0000
Subject: [PATCH 1/2] Add default value to logical_flow external_id

- tested against mssql and h2

#CTCTOWALTZ-3035
#6976
---
 .../resources/liquibase/db.changelog-1.58.xml | 45 +++++++++++++++++++
 .../resources/liquibase/db.properties.xml     |  3 ++
 2 files changed, 48 insertions(+)

diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-1.58.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.58.xml
index 0c0c23e8e4..0786dccdc4 100644
--- a/waltz-schema/src/main/resources/liquibase/db.changelog-1.58.xml
+++ b/waltz-schema/src/main/resources/liquibase/db.changelog-1.58.xml
@@ -25,6 +25,7 @@
     </changeSet>
 
     <changeSet id="20240119-6944-1"
+               dbms="postgresql"
                author="OscarGreen03">
         <comment>6944: add external_id to logical_flow table</comment>
         <addColumn tableName="logical_flow">
@@ -34,4 +35,48 @@
             </column>
         </addColumn>
     </changeSet>
+
+    <changeSet id="20240205-6944-2"
+               dbms="!postgresql"
+               author="woodjes">
+        <comment>6944: adding external id to logical_flow</comment>
+        <addColumn tableName="logical_flow">
+            <column name="external_id"
+                    type="${external-id.type}"
+                    defaultValueComputed="CONCAT('LF:', ${uuid.function})">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="20240205-6944-3"
+               dbms="postgresql"
+               author="woodjes">
+        <comment>6944: adding default value to logical_flow</comment>
+        <update tableName="logical_flow">
+            <column name="external_id"
+                    value="CONCAT('LF:', ${uuid.function})"
+                    type="${external-id.type}"/>
+            <where>'external_id' is null</where>
+        </update>
+    </changeSet>
+
+    <changeSet id="20240205-6944-4"
+               dbms="postgresql"
+               author="woodjes">
+        <comment>6944: adding default value to logical_flow</comment>
+        <addNotNullConstraint tableName="logical_flow"
+                               columnName="external_id"
+                               columnDataType="${external-id.type}"/>
+    </changeSet>
+
+    <changeSet id="20240205-6944-5"
+               dbms="!postgresql"
+               author="woodjes">
+        <comment>6944: add unique constraint to logical flow ext id</comment>
+        <addUniqueConstraint tableName="logical_flow"
+                             constraintName="idx_lf_ext_id_unique"
+                             columnNames="external_id"/>
+    </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file
diff --git a/waltz-schema/src/main/resources/liquibase/db.properties.xml b/waltz-schema/src/main/resources/liquibase/db.properties.xml
index a1207b7438..1c5d4fa1af 100644
--- a/waltz-schema/src/main/resources/liquibase/db.properties.xml
+++ b/waltz-schema/src/main/resources/liquibase/db.properties.xml
@@ -81,6 +81,9 @@
     <property name="false.value" value="false" dbms="postgresql"></property>
     <property name="false.value" value="false" dbms="h2"></property>
 
+    <property name="uuid.function" value="gen_random_uuid()" dbms="postgresql"/>
+    <property name="uuid.function" value="NEWID()" dbms="mssql"/>
+    <property name="uuid.function" value="random_uuid()" dbms="h2"/>
 
     <!-- COLUMN NAME OVERRIDES (to support reserved words in col name) -->
     <property name="key.col" value="[key]" dbms="mssql"/>

From acae423b4dd7c46b585c2a41656937367e53da21 Mon Sep 17 00:00:00 2001
From: David Watkins <davidwatkins73@gmail.com>
Date: Thu, 8 Feb 2024 09:13:15 +0000
Subject: [PATCH 2/2] Prep 1.58

#6910
---
 .../src/main/resources/liquibase/db.changelog-1.58.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-1.58.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.58.xml
index 0786dccdc4..6031bf796e 100644
--- a/waltz-schema/src/main/resources/liquibase/db.changelog-1.58.xml
+++ b/waltz-schema/src/main/resources/liquibase/db.changelog-1.58.xml
@@ -55,9 +55,9 @@
         <comment>6944: adding default value to logical_flow</comment>
         <update tableName="logical_flow">
             <column name="external_id"
-                    value="CONCAT('LF:', ${uuid.function})"
+                    valueComputed="CONCAT('LF:', ${uuid.function})"
                     type="${external-id.type}"/>
-            <where>'external_id' is null</where>
+            <where>external_id is NULL</where>
         </update>
     </changeSet>