From 7d16c4d95e7d5eb5859eb066327422786d463bd5 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Fri, 2 Jan 2026 17:39:26 -0800 Subject: [PATCH] Consolidate SQL scripts to *-0.000-25.000.sql --- ....00-16.30.sql => etltest-0.000-25.000.sql} | 302 +++++++++++++++++- .../postgresql/etltest-24.000-24.001.sql | 148 --------- .../postgresql/etltest-24.001-24.002.sql | 148 --------- ...00-21.000.sql => etltest-0.000-25.000.sql} | 262 +++++++++++++++ .../sqlserver/etltest-24.000-24.001.sql | 129 -------- .../sqlserver/etltest-24.001-24.002.sql | 129 -------- 6 files changed, 563 insertions(+), 555 deletions(-) rename modules/ETLtest/resources/schemas/dbscripts/postgresql/{etltest-0.00-16.30.sql => etltest-0.000-25.000.sql} (63%) delete mode 100644 modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-24.000-24.001.sql delete mode 100644 modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-24.001-24.002.sql rename modules/ETLtest/resources/schemas/dbscripts/sqlserver/{etltest-0.000-21.000.sql => etltest-0.000-25.000.sql} (70%) delete mode 100644 modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-24.000-24.001.sql delete mode 100644 modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-24.001-24.002.sql diff --git a/modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-0.00-16.30.sql b/modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-0.000-25.000.sql similarity index 63% rename from modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-0.00-16.30.sql rename to modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-0.000-25.000.sql index e8b8e15f0b..4570b6268e 100644 --- a/modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-0.00-16.30.sql +++ b/modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-0.000-25.000.sql @@ -621,4 +621,304 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE -COST 100; \ No newline at end of file +COST 100; + +/* 24.xxx SQL scripts */ + +CREATE OR REPLACE FUNCTION etltest.etltest + (IN transformrunid integer + , IN containerid entityid DEFAULT NULL::character varying + , INOUT rowsinserted integer DEFAULT 0 + , INOUT rowsdeleted integer DEFAULT 0 + , INOUT rowsmodified integer DEFAULT 0 + , INOUT returnmsg character varying DEFAULT 'default message'::character varying + , IN debug character varying DEFAULT ''::character varying + , IN filterrunid integer DEFAULT NULL::integer + , INOUT filterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone + , INOUT filterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone + , INOUT previousfilterrunid integer DEFAULT (-1) + , INOUT previousfilterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone + , INOUT previousfilterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone + --, INOUT procVersion decimal DEFAULT 0 + , IN testmode integer DEFAULT (-1) + , INOUT testinoutparam character varying DEFAULT ''::character varying + , INOUT runcount integer DEFAULT 1 + , OUT return_status integer) + RETURNS record AS +$BODY$ + +/* + Test modes + 1 normal operation + 2 return code > 0 + 3 raise error + 4 input/output parameter persistence + 5 override of persisted input/output parameter + 6 Run filter strategy, require filterRunId. Test persistence. + 7 Modified since filter strategy, no source, require filterStartTimeStamp & filterEndTimeStamp, + populated from output of previous run + 8 Modified since filter strategy with source, require filterStartTimeStamp & filterEndTimeStamp + populated from the filter strategy IncrementalStartTime & IncrementalEndTime + 9 Sleep for 2 minutes before finishing + +*/ +BEGIN + + IF testMode IS NULL + THEN + returnMsg := 'No testMode set'; + return_status := 1; + RETURN; +END IF; + + IF runCount IS NULL + THEN + runCount := 1; +ELSE + runCount := runCount + 1; +END IF; + + IF testMode = 1 + THEN + RAISE NOTICE '%', 'Test print statement logging'; + rowsInserted := 1; + rowsDeleted := 2; + rowsModified := 4; + returnMsg := 'Test returnMsg logging'; + return_status := 0; + RETURN; +END IF; + + IF testMode = 2 THEN return_status := 1; RETURN; END IF; + + IF testMode = 3 + THEN + returnMsg := 'Intentional SQL Exception From Inside Proc'; + RAISE EXCEPTION '%', returnMsg; +END IF; + + IF testMode = 4 AND testInOutParam != 'after' AND runCount > 1 + THEN + returnMsg := 'Expected value "after" for testInOutParam on run count = ' || runCount || ', but was ' || testInOutParam; + return_status := 1; + RETURN; +END IF; + + IF testMode = 5 AND testInOutParam != 'before' AND runCount > 1 + THEN + returnMsg := 'Expected value "before" for testInOutParam on run count = ' || runCount || ', but was ' || testInOutParam; + return_status := 1; + RETURN; +END IF; + + IF testMode = 6 + THEN + IF filterRunId IS NULL + THEN + returnMsg := 'Required filterRunId value not supplied'; + return_status := 1; + RETURN; +END IF; + IF runCount > 1 AND (previousFilterRunId IS NULL OR previousFilterRunId >= filterRunId) + THEN + returnMsg := 'Required filterRunId was not persisted from previous run.'; + return_status := 1; + RETURN; +END IF; + previousFilterRunId := filterRunId; +END IF; + + IF testMode = 7 + THEN + IF runCount > 1 AND (filterStartTimeStamp IS NULL AND filterEndTimeStamp IS NULL) + THEN + returnMsg := 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; + return_status := 1; + RETURN; +END IF; + filterStartTimeStamp := localtimestamp; + filterEndTimeStamp := localtimestamp; +END IF; + + IF testMode = 8 + THEN + IF runCount > 1 AND ((previousFilterStartTimeStamp IS NULL AND previousFilterEndTimeStamp IS NULL) + OR (filterStartTimeStamp IS NULL AND filterEndTimeStamp IS NULL)) + THEN + returnMsg := 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; + return_status := 1; + RETURN; +END IF; + previousFilterStartTimeStamp := coalesce(filterStartTimeStamp, localtimestamp); + previousFilterEndTimeStamp := coalesce(filterEndTimeStamp, localtimestamp); +END IF; + + IF testMode = 9 + THEN + -- Sleep for 2 minutes + SELECT pg_sleep(120); + return_status := 1; + RETURN; +END IF; + + -- set value for persistence tests + IF testInOutParam != '' + THEN + testInOutParam := 'after'; +END IF; + + return_status := 0; + RETURN; + +END; +$BODY$ +LANGUAGE plpgsql; + +CREATE OR REPLACE FUNCTION etltest.etltest + (IN transformrunid integer + , IN containerid entityid DEFAULT NULL::character varying + , INOUT rowsinserted integer DEFAULT 0 + , INOUT rowsdeleted integer DEFAULT 0 + , INOUT rowsmodified integer DEFAULT 0 + , INOUT returnmsg character varying DEFAULT 'default message'::character varying + , IN debug character varying DEFAULT ''::character varying + , IN filterrunid integer DEFAULT NULL::integer + , INOUT filterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone + , INOUT filterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone + , INOUT previousfilterrunid integer DEFAULT (-1) + , INOUT previousfilterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone + , INOUT previousfilterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone + --, INOUT procVersion decimal DEFAULT 0 + , IN testmode integer DEFAULT (-1) + , INOUT testinoutparam character varying DEFAULT ''::character varying + , INOUT runcount integer DEFAULT 1 + , OUT return_status integer) + RETURNS record AS +$BODY$ + +/* + Test modes + 1 normal operation + 2 return code > 0 + 3 raise error + 4 input/output parameter persistence + 5 override of persisted input/output parameter + 6 Run filter strategy, require filterRunId. Test persistence. + 7 Modified since filter strategy, no source, require filterStartTimeStamp & filterEndTimeStamp, + populated from output of previous run + 8 Modified since filter strategy with source, require filterStartTimeStamp & filterEndTimeStamp + populated from the filter strategy IncrementalStartTime & IncrementalEndTime + 9 Sleep for 2 minutes before finishing + +*/ +BEGIN + + IF testMode IS NULL + THEN + returnMsg := 'No testMode set'; + return_status := 1; + RETURN; +END IF; + + IF runCount IS NULL + THEN + runCount := 1; +ELSE + runCount := runCount + 1; +END IF; + + IF testMode = 1 + THEN + RAISE NOTICE '%', 'Test print statement logging'; + rowsInserted := 1; + rowsDeleted := 2; + rowsModified := 4; + returnMsg := 'Test returnMsg logging'; + return_status := 0; + RETURN; +END IF; + + IF testMode = 2 THEN return_status := 1; RETURN; END IF; + + IF testMode = 3 + THEN + returnMsg := 'Intentional SQL Exception From Inside Proc'; + RAISE EXCEPTION '%', returnMsg; +END IF; + + IF testMode = 4 AND testInOutParam != 'after' AND runCount > 1 + THEN + returnMsg := 'Expected value "after" for testInOutParam on run count = ' || runCount || ', but was ' || testInOutParam; + return_status := 1; + RETURN; +END IF; + + IF testMode = 5 AND testInOutParam != 'before' AND runCount > 1 + THEN + returnMsg := 'Expected value "before" for testInOutParam on run count = ' || runCount || ', but was ' || testInOutParam; + return_status := 1; + RETURN; +END IF; + + IF testMode = 6 + THEN + IF filterRunId IS NULL + THEN + returnMsg := 'Required filterRunId value not supplied'; + return_status := 1; + RETURN; +END IF; + IF runCount > 1 AND (previousFilterRunId IS NULL OR previousFilterRunId >= filterRunId) + THEN + returnMsg := 'Required filterRunId was not persisted from previous run.'; + return_status := 1; + RETURN; +END IF; + previousFilterRunId := filterRunId; +END IF; + + IF testMode = 7 + THEN + IF runCount > 1 AND (filterStartTimeStamp IS NULL AND filterEndTimeStamp IS NULL) + THEN + returnMsg := 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; + return_status := 1; + RETURN; +END IF; + filterStartTimeStamp := localtimestamp; + filterEndTimeStamp := localtimestamp; +END IF; + + IF testMode = 8 + THEN + IF runCount > 1 AND ((previousFilterStartTimeStamp IS NULL AND previousFilterEndTimeStamp IS NULL) + OR (filterStartTimeStamp IS NULL AND filterEndTimeStamp IS NULL)) + THEN + returnMsg := 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; + return_status := 1; + RETURN; +END IF; + previousFilterStartTimeStamp := coalesce(filterStartTimeStamp, localtimestamp); + previousFilterEndTimeStamp := coalesce(filterEndTimeStamp, localtimestamp); +END IF; + + IF testMode = 9 + THEN + -- Sleep for 30 seconds minutes + SELECT pg_sleep(30); + return_status := 1; + RETURN; +END IF; + + -- set value for persistence tests + IF testInOutParam != '' + THEN + testInOutParam := 'after'; +END IF; + + return_status := 0; + RETURN; + +END; +$BODY$ +LANGUAGE plpgsql; \ No newline at end of file diff --git a/modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-24.000-24.001.sql b/modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-24.000-24.001.sql deleted file mode 100644 index 618e9b3437..0000000000 --- a/modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-24.000-24.001.sql +++ /dev/null @@ -1,148 +0,0 @@ -CREATE OR REPLACE FUNCTION etltest.etltest - (IN transformrunid integer - , IN containerid entityid DEFAULT NULL::character varying - , INOUT rowsinserted integer DEFAULT 0 - , INOUT rowsdeleted integer DEFAULT 0 - , INOUT rowsmodified integer DEFAULT 0 - , INOUT returnmsg character varying DEFAULT 'default message'::character varying - , IN debug character varying DEFAULT ''::character varying - , IN filterrunid integer DEFAULT NULL::integer - , INOUT filterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone - , INOUT filterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone - , INOUT previousfilterrunid integer DEFAULT (-1) - , INOUT previousfilterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone - , INOUT previousfilterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone - --, INOUT procVersion decimal DEFAULT 0 - , IN testmode integer DEFAULT (-1) - , INOUT testinoutparam character varying DEFAULT ''::character varying - , INOUT runcount integer DEFAULT 1 - , OUT return_status integer) - RETURNS record AS -$BODY$ - -/* - Test modes - 1 normal operation - 2 return code > 0 - 3 raise error - 4 input/output parameter persistence - 5 override of persisted input/output parameter - 6 Run filter strategy, require filterRunId. Test persistence. - 7 Modified since filter strategy, no source, require filterStartTimeStamp & filterEndTimeStamp, - populated from output of previous run - 8 Modified since filter strategy with source, require filterStartTimeStamp & filterEndTimeStamp - populated from the filter strategy IncrementalStartTime & IncrementalEndTime - 9 Sleep for 2 minutes before finishing - -*/ -BEGIN - - IF testMode IS NULL - THEN - returnMsg := 'No testMode set'; - return_status := 1; - RETURN; -END IF; - - IF runCount IS NULL - THEN - runCount := 1; -ELSE - runCount := runCount + 1; -END IF; - - IF testMode = 1 - THEN - RAISE NOTICE '%', 'Test print statement logging'; - rowsInserted := 1; - rowsDeleted := 2; - rowsModified := 4; - returnMsg := 'Test returnMsg logging'; - return_status := 0; - RETURN; -END IF; - - IF testMode = 2 THEN return_status := 1; RETURN; END IF; - - IF testMode = 3 - THEN - returnMsg := 'Intentional SQL Exception From Inside Proc'; - RAISE EXCEPTION '%', returnMsg; -END IF; - - IF testMode = 4 AND testInOutParam != 'after' AND runCount > 1 - THEN - returnMsg := 'Expected value "after" for testInOutParam on run count = ' || runCount || ', but was ' || testInOutParam; - return_status := 1; - RETURN; -END IF; - - IF testMode = 5 AND testInOutParam != 'before' AND runCount > 1 - THEN - returnMsg := 'Expected value "before" for testInOutParam on run count = ' || runCount || ', but was ' || testInOutParam; - return_status := 1; - RETURN; -END IF; - - IF testMode = 6 - THEN - IF filterRunId IS NULL - THEN - returnMsg := 'Required filterRunId value not supplied'; - return_status := 1; - RETURN; -END IF; - IF runCount > 1 AND (previousFilterRunId IS NULL OR previousFilterRunId >= filterRunId) - THEN - returnMsg := 'Required filterRunId was not persisted from previous run.'; - return_status := 1; - RETURN; -END IF; - previousFilterRunId := filterRunId; -END IF; - - IF testMode = 7 - THEN - IF runCount > 1 AND (filterStartTimeStamp IS NULL AND filterEndTimeStamp IS NULL) - THEN - returnMsg := 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; - return_status := 1; - RETURN; -END IF; - filterStartTimeStamp := localtimestamp; - filterEndTimeStamp := localtimestamp; -END IF; - - IF testMode = 8 - THEN - IF runCount > 1 AND ((previousFilterStartTimeStamp IS NULL AND previousFilterEndTimeStamp IS NULL) - OR (filterStartTimeStamp IS NULL AND filterEndTimeStamp IS NULL)) - THEN - returnMsg := 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; - return_status := 1; - RETURN; -END IF; - previousFilterStartTimeStamp := coalesce(filterStartTimeStamp, localtimestamp); - previousFilterEndTimeStamp := coalesce(filterEndTimeStamp, localtimestamp); -END IF; - - IF testMode = 9 - THEN - -- Sleep for 2 minutes - SELECT pg_sleep(120); - return_status := 1; - RETURN; -END IF; - - -- set value for persistence tests - IF testInOutParam != '' - THEN - testInOutParam := 'after'; -END IF; - - return_status := 0; - RETURN; - -END; -$BODY$ -LANGUAGE plpgsql; \ No newline at end of file diff --git a/modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-24.001-24.002.sql b/modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-24.001-24.002.sql deleted file mode 100644 index 5f546a7f8d..0000000000 --- a/modules/ETLtest/resources/schemas/dbscripts/postgresql/etltest-24.001-24.002.sql +++ /dev/null @@ -1,148 +0,0 @@ -CREATE OR REPLACE FUNCTION etltest.etltest - (IN transformrunid integer - , IN containerid entityid DEFAULT NULL::character varying - , INOUT rowsinserted integer DEFAULT 0 - , INOUT rowsdeleted integer DEFAULT 0 - , INOUT rowsmodified integer DEFAULT 0 - , INOUT returnmsg character varying DEFAULT 'default message'::character varying - , IN debug character varying DEFAULT ''::character varying - , IN filterrunid integer DEFAULT NULL::integer - , INOUT filterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone - , INOUT filterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone - , INOUT previousfilterrunid integer DEFAULT (-1) - , INOUT previousfilterstarttimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone - , INOUT previousfilterendtimestamp timestamp without time zone DEFAULT NULL::timestamp without time zone - --, INOUT procVersion decimal DEFAULT 0 - , IN testmode integer DEFAULT (-1) - , INOUT testinoutparam character varying DEFAULT ''::character varying - , INOUT runcount integer DEFAULT 1 - , OUT return_status integer) - RETURNS record AS -$BODY$ - -/* - Test modes - 1 normal operation - 2 return code > 0 - 3 raise error - 4 input/output parameter persistence - 5 override of persisted input/output parameter - 6 Run filter strategy, require filterRunId. Test persistence. - 7 Modified since filter strategy, no source, require filterStartTimeStamp & filterEndTimeStamp, - populated from output of previous run - 8 Modified since filter strategy with source, require filterStartTimeStamp & filterEndTimeStamp - populated from the filter strategy IncrementalStartTime & IncrementalEndTime - 9 Sleep for 2 minutes before finishing - -*/ -BEGIN - - IF testMode IS NULL - THEN - returnMsg := 'No testMode set'; - return_status := 1; - RETURN; -END IF; - - IF runCount IS NULL - THEN - runCount := 1; -ELSE - runCount := runCount + 1; -END IF; - - IF testMode = 1 - THEN - RAISE NOTICE '%', 'Test print statement logging'; - rowsInserted := 1; - rowsDeleted := 2; - rowsModified := 4; - returnMsg := 'Test returnMsg logging'; - return_status := 0; - RETURN; -END IF; - - IF testMode = 2 THEN return_status := 1; RETURN; END IF; - - IF testMode = 3 - THEN - returnMsg := 'Intentional SQL Exception From Inside Proc'; - RAISE EXCEPTION '%', returnMsg; -END IF; - - IF testMode = 4 AND testInOutParam != 'after' AND runCount > 1 - THEN - returnMsg := 'Expected value "after" for testInOutParam on run count = ' || runCount || ', but was ' || testInOutParam; - return_status := 1; - RETURN; -END IF; - - IF testMode = 5 AND testInOutParam != 'before' AND runCount > 1 - THEN - returnMsg := 'Expected value "before" for testInOutParam on run count = ' || runCount || ', but was ' || testInOutParam; - return_status := 1; - RETURN; -END IF; - - IF testMode = 6 - THEN - IF filterRunId IS NULL - THEN - returnMsg := 'Required filterRunId value not supplied'; - return_status := 1; - RETURN; -END IF; - IF runCount > 1 AND (previousFilterRunId IS NULL OR previousFilterRunId >= filterRunId) - THEN - returnMsg := 'Required filterRunId was not persisted from previous run.'; - return_status := 1; - RETURN; -END IF; - previousFilterRunId := filterRunId; -END IF; - - IF testMode = 7 - THEN - IF runCount > 1 AND (filterStartTimeStamp IS NULL AND filterEndTimeStamp IS NULL) - THEN - returnMsg := 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; - return_status := 1; - RETURN; -END IF; - filterStartTimeStamp := localtimestamp; - filterEndTimeStamp := localtimestamp; -END IF; - - IF testMode = 8 - THEN - IF runCount > 1 AND ((previousFilterStartTimeStamp IS NULL AND previousFilterEndTimeStamp IS NULL) - OR (filterStartTimeStamp IS NULL AND filterEndTimeStamp IS NULL)) - THEN - returnMsg := 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; - return_status := 1; - RETURN; -END IF; - previousFilterStartTimeStamp := coalesce(filterStartTimeStamp, localtimestamp); - previousFilterEndTimeStamp := coalesce(filterEndTimeStamp, localtimestamp); -END IF; - - IF testMode = 9 - THEN - -- Sleep for 30 seconds minutes - SELECT pg_sleep(30); - return_status := 1; - RETURN; -END IF; - - -- set value for persistence tests - IF testInOutParam != '' - THEN - testInOutParam := 'after'; -END IF; - - return_status := 0; - RETURN; - -END; -$BODY$ -LANGUAGE plpgsql; \ No newline at end of file diff --git a/modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-0.000-21.000.sql b/modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-0.000-25.000.sql similarity index 70% rename from modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-0.000-21.000.sql rename to modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-0.000-25.000.sql index 3b566e9aa2..91a91b33d1 100644 --- a/modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-0.000-21.000.sql +++ b/modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-0.000-25.000.sql @@ -721,5 +721,267 @@ IF @testInOutParam IS NOT NULL AND @testInOutParam != '' SET @testInOutParam = ' RETURN 0 +END +GO + +/* 24.xxx SQL scripts */ + +ALTER PROCEDURE etltest.etlTest + @transformRunId int, + @containerId entityid = NULL OUTPUT, + @rowsInserted int = 0 OUTPUT, + @rowsDeleted int = 0 OUTPUT, + @rowsModified int = 0 OUTPUT, + @returnMsg varchar(100) = 'default message' OUTPUT, + @debug varchar(1000) = '', + @filterRunId int = null, + @filterStartTimeStamp datetime = null OUTPUT, + @filterEndTimeStamp datetime = null OUTPUT, + @testMode int, + @testInOutParam varchar(10) = null OUTPUT, + @runCount int = 1 OUTPUT, + @previousFilterRunId int = -1 OUTPUT, + @previousFilterStartTimeStamp datetime = null OUTPUT, + @previousFilterEndTimeStamp datetime = null OUTPUT + AS +BEGIN + +/* + Test modes + 1 normal operation + 2 return code > 0 + 3 raise error + 4 input/output parameter persistence + 5 override of persisted input/output parameter + 6 Run filter strategy, require filterRunId. Test persistence. + 7 Modified since filter strategy, no source, require filterStartTimeStamp & filterEndTimeStamp, + populated from output of previous run + 8 Modified since filter strategy with source, require filterStartTimeStamp & filterEndTimeStamp + populated from the filter strategy IncrementalStartTime & IncrementalEndTime + 9 Sleep for 2 minutes before finishing +*/ + +IF @testMode IS NULL +BEGIN + SET @returnMsg = 'No testMode set' + RETURN 1 +END + +IF @runCount IS NULL + SET @runCount = 1; +ELSE + SET @runCount = @runCount + 1; + +IF @testMode = 1 +BEGIN + print 'Test print statement logging' + SET @rowsInserted = 1 + SET @rowsDeleted = 2 + SET @rowsModified = 4 + SET @returnMsg = 'Test returnMsg logging' + RETURN 0 +END + +IF @testMode = 2 RETURN 1 + +IF @testMode = 3 +BEGIN + SET @returnMsg = 'Intentional SQL Exception From Inside Proc' + RAISERROR(@returnMsg, 11, 1) +END + +IF @testMode = 4 AND @testInOutParam != 'after' AND @runCount > 1 +BEGIN + SET @returnMsg = 'Expected value "after" for @testInOutParam on run count = ' + convert(varchar, @runCount) + ', but was ' + @testInOutParam + RETURN 1 +END + +IF @testMode = 5 AND @testInOutParam != 'before' AND @runCount > 1 +BEGIN + SET @returnMsg = 'Expected value "before" for @testInOutParam on run count = ' + convert(varchar, @runCount) + ', but was ' + @testInOutParam + RETURN 1 +END + +IF @testMode = 6 +BEGIN + IF @filterRunId IS NULL +BEGIN + SET @returnMsg = 'Required @filterRunId value not supplied' + RETURN 1 +END + IF @runCount > 1 AND (@previousFilterRunId IS NULL OR @previousFilterRunId >= @filterRunId) +BEGIN + SET @returnMsg = 'Required @filterRunId was not persisted from previous run.' + RETURN 1 +END + SET @previousFilterRunId = @filterRunId +END + +IF @testMode = 7 +BEGIN + IF @runCount > 1 AND (@filterStartTimeStamp IS NULL AND @filterEndTimeStamp IS NULL) +BEGIN + SET @returnMsg = 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; +RETURN 1; +END; + SET @filterStartTimeStamp = CURRENT_TIMESTAMP; + SET @filterEndTimeStamp = CURRENT_TIMESTAMP; +END; + +IF @testMode = 8 + +BEGIN + IF @runCount > 1 AND ((@previousFilterStartTimeStamp IS NULL AND @previousFilterEndTimeStamp IS NULL) + OR (@filterStartTimeStamp IS NULL AND @filterEndTimeStamp IS NULL)) +BEGIN + SET @returnMsg = 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; +RETURN 1; +END; + SET @previousFilterStartTimeStamp = coalesce(@filterStartTimeStamp, CURRENT_TIMESTAMP); + SET @previousFilterEndTimeStamp = coalesce(@filterEndTimeStamp, CURRENT_TIMESTAMP); +END; + +IF @testMode = 9 +BEGIN + -- Sleep for 2 minutes + WAITFOR DELAY '00:02' + RETURN 1; +END; + +-- set value for persistence tests +IF @testInOutParam IS NOT NULL AND @testInOutParam != '' SET @testInOutParam = 'after' + +RETURN 0 + +END +GO + +ALTER PROCEDURE etltest.etlTest + @transformRunId int, + @containerId entityid = NULL OUTPUT, + @rowsInserted int = 0 OUTPUT, + @rowsDeleted int = 0 OUTPUT, + @rowsModified int = 0 OUTPUT, + @returnMsg varchar(100) = 'default message' OUTPUT, + @debug varchar(1000) = '', + @filterRunId int = null, + @filterStartTimeStamp datetime = null OUTPUT, + @filterEndTimeStamp datetime = null OUTPUT, + @testMode int, + @testInOutParam varchar(10) = null OUTPUT, + @runCount int = 1 OUTPUT, + @previousFilterRunId int = -1 OUTPUT, + @previousFilterStartTimeStamp datetime = null OUTPUT, + @previousFilterEndTimeStamp datetime = null OUTPUT + AS +BEGIN + +/* + Test modes + 1 normal operation + 2 return code > 0 + 3 raise error + 4 input/output parameter persistence + 5 override of persisted input/output parameter + 6 Run filter strategy, require filterRunId. Test persistence. + 7 Modified since filter strategy, no source, require filterStartTimeStamp & filterEndTimeStamp, + populated from output of previous run + 8 Modified since filter strategy with source, require filterStartTimeStamp & filterEndTimeStamp + populated from the filter strategy IncrementalStartTime & IncrementalEndTime + 9 Sleep for 2 minutes before finishing +*/ + +IF @testMode IS NULL +BEGIN + SET @returnMsg = 'No testMode set' + RETURN 1 +END + +IF @runCount IS NULL + SET @runCount = 1; +ELSE + SET @runCount = @runCount + 1; + +IF @testMode = 1 +BEGIN + print 'Test print statement logging' + SET @rowsInserted = 1 + SET @rowsDeleted = 2 + SET @rowsModified = 4 + SET @returnMsg = 'Test returnMsg logging' + RETURN 0 +END + +IF @testMode = 2 RETURN 1 + +IF @testMode = 3 +BEGIN + SET @returnMsg = 'Intentional SQL Exception From Inside Proc' + RAISERROR(@returnMsg, 11, 1) +END + +IF @testMode = 4 AND @testInOutParam != 'after' AND @runCount > 1 +BEGIN + SET @returnMsg = 'Expected value "after" for @testInOutParam on run count = ' + convert(varchar, @runCount) + ', but was ' + @testInOutParam + RETURN 1 +END + +IF @testMode = 5 AND @testInOutParam != 'before' AND @runCount > 1 +BEGIN + SET @returnMsg = 'Expected value "before" for @testInOutParam on run count = ' + convert(varchar, @runCount) + ', but was ' + @testInOutParam + RETURN 1 +END + +IF @testMode = 6 +BEGIN + IF @filterRunId IS NULL +BEGIN + SET @returnMsg = 'Required @filterRunId value not supplied' + RETURN 1 +END + IF @runCount > 1 AND (@previousFilterRunId IS NULL OR @previousFilterRunId >= @filterRunId) +BEGIN + SET @returnMsg = 'Required @filterRunId was not persisted from previous run.' + RETURN 1 +END + SET @previousFilterRunId = @filterRunId +END + +IF @testMode = 7 +BEGIN + IF @runCount > 1 AND (@filterStartTimeStamp IS NULL AND @filterEndTimeStamp IS NULL) +BEGIN + SET @returnMsg = 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; +RETURN 1; +END; + SET @filterStartTimeStamp = CURRENT_TIMESTAMP; + SET @filterEndTimeStamp = CURRENT_TIMESTAMP; +END; + +IF @testMode = 8 + +BEGIN + IF @runCount > 1 AND ((@previousFilterStartTimeStamp IS NULL AND @previousFilterEndTimeStamp IS NULL) + OR (@filterStartTimeStamp IS NULL AND @filterEndTimeStamp IS NULL)) +BEGIN + SET @returnMsg = 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; +RETURN 1; +END; + SET @previousFilterStartTimeStamp = coalesce(@filterStartTimeStamp, CURRENT_TIMESTAMP); + SET @previousFilterEndTimeStamp = coalesce(@filterEndTimeStamp, CURRENT_TIMESTAMP); +END; + +IF @testMode = 9 +BEGIN + -- Sleep for 30 seconds + WAITFOR DELAY '00:00:30' + RETURN 1; +END; + +-- set value for persistence tests +IF @testInOutParam IS NOT NULL AND @testInOutParam != '' SET @testInOutParam = 'after' + +RETURN 0 + END GO \ No newline at end of file diff --git a/modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-24.000-24.001.sql b/modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-24.000-24.001.sql deleted file mode 100644 index 2252b1ee61..0000000000 --- a/modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-24.000-24.001.sql +++ /dev/null @@ -1,129 +0,0 @@ -ALTER PROCEDURE etltest.etlTest - @transformRunId int, - @containerId entityid = NULL OUTPUT, - @rowsInserted int = 0 OUTPUT, - @rowsDeleted int = 0 OUTPUT, - @rowsModified int = 0 OUTPUT, - @returnMsg varchar(100) = 'default message' OUTPUT, - @debug varchar(1000) = '', - @filterRunId int = null, - @filterStartTimeStamp datetime = null OUTPUT, - @filterEndTimeStamp datetime = null OUTPUT, - @testMode int, - @testInOutParam varchar(10) = null OUTPUT, - @runCount int = 1 OUTPUT, - @previousFilterRunId int = -1 OUTPUT, - @previousFilterStartTimeStamp datetime = null OUTPUT, - @previousFilterEndTimeStamp datetime = null OUTPUT - AS -BEGIN - -/* - Test modes - 1 normal operation - 2 return code > 0 - 3 raise error - 4 input/output parameter persistence - 5 override of persisted input/output parameter - 6 Run filter strategy, require filterRunId. Test persistence. - 7 Modified since filter strategy, no source, require filterStartTimeStamp & filterEndTimeStamp, - populated from output of previous run - 8 Modified since filter strategy with source, require filterStartTimeStamp & filterEndTimeStamp - populated from the filter strategy IncrementalStartTime & IncrementalEndTime - 9 Sleep for 2 minutes before finishing -*/ - -IF @testMode IS NULL -BEGIN - SET @returnMsg = 'No testMode set' - RETURN 1 -END - -IF @runCount IS NULL - SET @runCount = 1; -ELSE - SET @runCount = @runCount + 1; - -IF @testMode = 1 -BEGIN - print 'Test print statement logging' - SET @rowsInserted = 1 - SET @rowsDeleted = 2 - SET @rowsModified = 4 - SET @returnMsg = 'Test returnMsg logging' - RETURN 0 -END - -IF @testMode = 2 RETURN 1 - -IF @testMode = 3 -BEGIN - SET @returnMsg = 'Intentional SQL Exception From Inside Proc' - RAISERROR(@returnMsg, 11, 1) -END - -IF @testMode = 4 AND @testInOutParam != 'after' AND @runCount > 1 -BEGIN - SET @returnMsg = 'Expected value "after" for @testInOutParam on run count = ' + convert(varchar, @runCount) + ', but was ' + @testInOutParam - RETURN 1 -END - -IF @testMode = 5 AND @testInOutParam != 'before' AND @runCount > 1 -BEGIN - SET @returnMsg = 'Expected value "before" for @testInOutParam on run count = ' + convert(varchar, @runCount) + ', but was ' + @testInOutParam - RETURN 1 -END - -IF @testMode = 6 -BEGIN - IF @filterRunId IS NULL -BEGIN - SET @returnMsg = 'Required @filterRunId value not supplied' - RETURN 1 -END - IF @runCount > 1 AND (@previousFilterRunId IS NULL OR @previousFilterRunId >= @filterRunId) -BEGIN - SET @returnMsg = 'Required @filterRunId was not persisted from previous run.' - RETURN 1 -END - SET @previousFilterRunId = @filterRunId -END - -IF @testMode = 7 -BEGIN - IF @runCount > 1 AND (@filterStartTimeStamp IS NULL AND @filterEndTimeStamp IS NULL) -BEGIN - SET @returnMsg = 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; -RETURN 1; -END; - SET @filterStartTimeStamp = CURRENT_TIMESTAMP; - SET @filterEndTimeStamp = CURRENT_TIMESTAMP; -END; - -IF @testMode = 8 - -BEGIN - IF @runCount > 1 AND ((@previousFilterStartTimeStamp IS NULL AND @previousFilterEndTimeStamp IS NULL) - OR (@filterStartTimeStamp IS NULL AND @filterEndTimeStamp IS NULL)) -BEGIN - SET @returnMsg = 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; -RETURN 1; -END; - SET @previousFilterStartTimeStamp = coalesce(@filterStartTimeStamp, CURRENT_TIMESTAMP); - SET @previousFilterEndTimeStamp = coalesce(@filterEndTimeStamp, CURRENT_TIMESTAMP); -END; - -IF @testMode = 9 -BEGIN - -- Sleep for 2 minutes - WAITFOR DELAY '00:02' - RETURN 1; -END; - --- set value for persistence tests -IF @testInOutParam IS NOT NULL AND @testInOutParam != '' SET @testInOutParam = 'after' - -RETURN 0 - -END -GO diff --git a/modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-24.001-24.002.sql b/modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-24.001-24.002.sql deleted file mode 100644 index 7265524a5e..0000000000 --- a/modules/ETLtest/resources/schemas/dbscripts/sqlserver/etltest-24.001-24.002.sql +++ /dev/null @@ -1,129 +0,0 @@ -ALTER PROCEDURE etltest.etlTest - @transformRunId int, - @containerId entityid = NULL OUTPUT, - @rowsInserted int = 0 OUTPUT, - @rowsDeleted int = 0 OUTPUT, - @rowsModified int = 0 OUTPUT, - @returnMsg varchar(100) = 'default message' OUTPUT, - @debug varchar(1000) = '', - @filterRunId int = null, - @filterStartTimeStamp datetime = null OUTPUT, - @filterEndTimeStamp datetime = null OUTPUT, - @testMode int, - @testInOutParam varchar(10) = null OUTPUT, - @runCount int = 1 OUTPUT, - @previousFilterRunId int = -1 OUTPUT, - @previousFilterStartTimeStamp datetime = null OUTPUT, - @previousFilterEndTimeStamp datetime = null OUTPUT - AS -BEGIN - -/* - Test modes - 1 normal operation - 2 return code > 0 - 3 raise error - 4 input/output parameter persistence - 5 override of persisted input/output parameter - 6 Run filter strategy, require filterRunId. Test persistence. - 7 Modified since filter strategy, no source, require filterStartTimeStamp & filterEndTimeStamp, - populated from output of previous run - 8 Modified since filter strategy with source, require filterStartTimeStamp & filterEndTimeStamp - populated from the filter strategy IncrementalStartTime & IncrementalEndTime - 9 Sleep for 2 minutes before finishing -*/ - -IF @testMode IS NULL -BEGIN - SET @returnMsg = 'No testMode set' - RETURN 1 -END - -IF @runCount IS NULL - SET @runCount = 1; -ELSE - SET @runCount = @runCount + 1; - -IF @testMode = 1 -BEGIN - print 'Test print statement logging' - SET @rowsInserted = 1 - SET @rowsDeleted = 2 - SET @rowsModified = 4 - SET @returnMsg = 'Test returnMsg logging' - RETURN 0 -END - -IF @testMode = 2 RETURN 1 - -IF @testMode = 3 -BEGIN - SET @returnMsg = 'Intentional SQL Exception From Inside Proc' - RAISERROR(@returnMsg, 11, 1) -END - -IF @testMode = 4 AND @testInOutParam != 'after' AND @runCount > 1 -BEGIN - SET @returnMsg = 'Expected value "after" for @testInOutParam on run count = ' + convert(varchar, @runCount) + ', but was ' + @testInOutParam - RETURN 1 -END - -IF @testMode = 5 AND @testInOutParam != 'before' AND @runCount > 1 -BEGIN - SET @returnMsg = 'Expected value "before" for @testInOutParam on run count = ' + convert(varchar, @runCount) + ', but was ' + @testInOutParam - RETURN 1 -END - -IF @testMode = 6 -BEGIN - IF @filterRunId IS NULL -BEGIN - SET @returnMsg = 'Required @filterRunId value not supplied' - RETURN 1 -END - IF @runCount > 1 AND (@previousFilterRunId IS NULL OR @previousFilterRunId >= @filterRunId) -BEGIN - SET @returnMsg = 'Required @filterRunId was not persisted from previous run.' - RETURN 1 -END - SET @previousFilterRunId = @filterRunId -END - -IF @testMode = 7 -BEGIN - IF @runCount > 1 AND (@filterStartTimeStamp IS NULL AND @filterEndTimeStamp IS NULL) -BEGIN - SET @returnMsg = 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; -RETURN 1; -END; - SET @filterStartTimeStamp = CURRENT_TIMESTAMP; - SET @filterEndTimeStamp = CURRENT_TIMESTAMP; -END; - -IF @testMode = 8 - -BEGIN - IF @runCount > 1 AND ((@previousFilterStartTimeStamp IS NULL AND @previousFilterEndTimeStamp IS NULL) - OR (@filterStartTimeStamp IS NULL AND @filterEndTimeStamp IS NULL)) -BEGIN - SET @returnMsg = 'Required filterStartTimeStamp or filterEndTimeStamp were not persisted from previous run.'; -RETURN 1; -END; - SET @previousFilterStartTimeStamp = coalesce(@filterStartTimeStamp, CURRENT_TIMESTAMP); - SET @previousFilterEndTimeStamp = coalesce(@filterEndTimeStamp, CURRENT_TIMESTAMP); -END; - -IF @testMode = 9 -BEGIN - -- Sleep for 30 seconds - WAITFOR DELAY '00:00:30' - RETURN 1; -END; - --- set value for persistence tests -IF @testInOutParam IS NOT NULL AND @testInOutParam != '' SET @testInOutParam = 'after' - -RETURN 0 - -END -GO