replace INSERT run order fix ; issue

Author: robjharrison

deployment_extracts/eclipse/live/ssd_deployment_individual_files_tsql/ssd_address.sql

@@ -2,7 +2,8 @@
 -- =============================================================================
 -- Description: Contains full address details for every person
 -- Author: D2I
--- Version: 0.1: new RH
+-- Version: 0.2 Fixed run order and ; use 
+--          0.1: new RH
 -- Status: [D]ev
 -- Remarks: [EA_API_PRIORITY_TABLE]
 --          JSON built via string concat for legacy SQL Server compatibility
@@ -38,15 +39,6 @@ END
 
 
 /* META-ELEMENT: {"type": "insert_data"} */
-INSERT INTO ssd_development.ssd_address (
-    addr_table_id,
-    addr_person_id,
-    addr_address_type,
-    addr_address_start_date,
-    addr_address_end_date,
-    addr_address_postcode,
-    addr_address_json
-)
 ;WITH EXCLUSIONS AS (
     SELECT
         PV.PERSONID
@@ -57,6 +49,15 @@ INSERT INTO ssd_development.ssd_address (
         OR UPPER(PV.FORENAME) LIKE '%DUPLICATE%'
         OR UPPER(PV.SURNAME)  LIKE '%DUPLICATE%'
 )
+INSERT INTO ssd_development.ssd_address (
+    addr_table_id,
+    addr_person_id,
+    addr_address_type,
+    addr_address_start_date,
+    addr_address_end_date,
+    addr_address_postcode,
+    addr_address_json
+)
 SELECT
     CONVERT(NVARCHAR(48), PERSADDRESS.ADDRESSID) AS addr_table_id,              -- metadata={"item_ref":"ADDR007A"}
     CONVERT(NVARCHAR(48), PERSADDRESS.PERSONID)  AS addr_person_id,             -- metadata={"item_ref":"ADDR002A"}
@@ -89,4 +90,4 @@ WHERE NOT EXISTS (
     SELECT 1
     FROM EXCLUSIONS E
     WHERE E.PERSONID = PERSADDRESS.PERSONID
-);
+);

deployment_extracts/eclipse/live/ssd_deployment_individual_files_tsql/ssd_person.sql

@@ -2,7 +2,8 @@
 -- =============================================================================
 -- Description: Person/child details. 
 -- Author: D2I
--- Version: 0.1: new RH
+-- Version: 0.2 Fixed run order and ; use 
+--          0.1: new RH
 -- Status: [D]ev
 -- Remarks: [EA_API_PRIORITY_TABLE]
 
@@ -58,24 +59,6 @@ VALUES
 
 
 /* META-ELEMENT: {"type": "insert_data"} */
-INSERT INTO ssd_development.ssd_person (
-    pers_legacy_id,
-    pers_person_id,
-    pers_upn,
-    pers_forename,
-    pers_surname,
-    pers_sex,
-    pers_gender,
-    pers_ethnicity,
-    pers_dob,
-    pers_single_unique_id,
-    pers_upn_unknown,
-    pers_send_flag,
-    pers_expected_dob,
-    pers_death_date,
-    pers_is_mother,
-    pers_nationality
-)
 ;WITH EXCLUSIONS AS (
     SELECT CONVERT(NVARCHAR(48), PV.PERSONID) AS PERSONID
     FROM PERSONVIEW PV
@@ -181,6 +164,24 @@ CLASS_FILTER AS (
     WHERE CPV.classificationpathid IN (17,21,43,50)
       AND CPV.enddate IS NULL
 )
+INSERT INTO ssd_development.ssd_person (
+    pers_legacy_id,
+    pers_person_id,
+    pers_upn,
+    pers_forename,
+    pers_surname,
+    pers_sex,
+    pers_gender,
+    pers_ethnicity,
+    pers_dob,
+    pers_single_unique_id,
+    pers_upn_unknown,
+    pers_send_flag,
+    pers_expected_dob,
+    pers_death_date,
+    pers_is_mother,
+    pers_nationality
+)
 SELECT DISTINCT
     CONVERT(NVARCHAR(48), P.CAREFIRSTID)  AS pers_legacy_id,        -- PERS014A
     CONVERT(NVARCHAR(48), P.PERSONID)     AS pers_person_id,        -- PERS001A
@@ -315,5 +316,4 @@ WHERE
     AND (
         NOT EXISTS (SELECT 1 FROM @allowed_persons)
         OR CONVERT(NVARCHAR(48), P.PERSONID) IN (SELECT personid FROM @allowed_persons)
-    );
-
+    );