Skip to content

Update SQL queries in GetIngestDefinition to use COALESCE for no records returned #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bennyaustin merged 1 commit into from
Apr 26, 2026
Merged

Update SQL queries in GetIngestDefinition to use COALESCE for no records returned #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions elt-framework/ControlDB/ELT/Stored Procedures/GetIngestDefinition.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,18 @@ as
CASE
WHEN datediff_big(minute,[LastDeltaDate],@localdate) > [MaxIntervalMinutes]
THEN
'SELECT MIN('+[WatermarkColName]+') AS DataFromTimestamp, MAX('+[WatermarkColName]+') AS DataToTimestamp, count(1) as SourceCount FROM ' + [EntityName] + ' WHERE '
'SELECT COALESCE(MIN('+[WatermarkColName]+'),'''+CONVERT(varchar(30),LastDeltaDate,121)+''') AS DataFromTimestamp, COALESCE(MAX('+[WatermarkColName]+'),'''+CONVERT(varchar(30), DATEADD(minute,[MaxIntervalMinutes],[LastDeltaDate]),121)+''') AS DataToTimestamp, count(1) as SourceCount FROM ' + [EntityName] + ' WHERE '
+ [WatermarkColName] + ' > ' + ''''+CONVERT(varchar(30),LastDeltaDate,121)+''''+ ' AND ' + [WatermarkColName] + ' <= ' + ''''+CONVERT(varchar(30), DATEADD(minute,[MaxIntervalMinutes],[LastDeltaDate]),121)+''''
ELSE
'SELECT MIN('+[WatermarkColName]+') AS DataFromTimestamp, MAX('+[WatermarkColName]+') AS DataToTimestamp, count(1) as SourceCount FROM ' + [EntityName] + ' WHERE '
'SELECT COALESCE(MIN('+[WatermarkColName]+'),'''+CONVERT(varchar(30),[LastDeltaDate],121)+''') AS DataFromTimestamp, COALESCE(MAX('+[WatermarkColName]+'),'''+CONVERT(varchar(30),(@localdate),120)+''') AS DataToTimestamp, count(1) as SourceCount FROM ' + [EntityName] + ' WHERE '
+ [WatermarkColName] + ' > ' + ''''+CONVERT(varchar(30),[LastDeltaDate],121) +''''+ ' AND ' + [WatermarkColName] + ' <= ' + ''''+ CONVERT(varchar(30),(@localdate),120)+''''
END
--Common No Delta
WHEN [EntityName] IS NOT NULL AND [WatermarkColName] IS NULL
THEN 'SELECT ''1900-01-01 00:00:00'' AS DataFromTimestamp, '''+CONVERT(VARCHAR(30),ELT.uf_GetAestDateTime(),120)+''' AS DataToTimestamp, COUNT(*) AS SourceCount FROM ' + [EntityName]
--Running Number
WHEN [EntityName] IS NOT NULL AND [WatermarkColName] IS NOT NULL AND [LastDeltaNumber] IS NOT NULL
THEN 'SELECT MIN('+[WatermarkColName]+') AS DataFromTimestamp,' + ' MAX('+[WatermarkColName]+') AS DataToTimestamp,'+ 'COUNT(*) AS SourceCount FROM ' + [EntityName]
THEN 'SELECT COALESCE(MIN('+[WatermarkColName]+'),'+CONVERT(VARCHAR,[LastDeltaNumber])+') AS DataFromTimestamp,' + ' COALESCE(MAX('+[WatermarkColName]+'),'+CONVERT(VARCHAR,([LastDeltaNumber] + [MaxIntervalNumber]))+') AS DataToTimestamp,'+ 'COUNT(*) AS SourceCount FROM ' + [EntityName]
+ [WatermarkColName] + ' > ' + ''''+CONVERT(VARCHAR,[LastDeltaNumber])+'''' + ' AND ' + [WatermarkColName] + ' <= ' + ''''+CONVERT(VARCHAR,([LastDeltaNumber] + [MaxIntervalNumber]))+''''
ELSE NULL
END
Expand Down Expand Up @@ -206,7 +206,7 @@ UNION

--DEFAULT ANSI SQL for Delta Table
WHEN [EntityName] IS NOT NULL AND [WatermarkColName] IS NOT NULL AND [LastDeltaDate] IS NOT NULL THEN
'SELECT MIN('+[WatermarkColName]+') AS DataFromTimestamp, MAX('+[WatermarkColName]+') AS DataToTimestamp, count(1) as SourceCount FROM '
'SELECT COALESCE(MIN('+[WatermarkColName]+'),'''+CONVERT(varchar(30),II.DataFromTimestamp,121)+''') AS DataFromTimestamp, COALESCE(MAX('+[WatermarkColName]+'),'''+CONVERT(varchar(30),II.[DataToTimestamp],121)+''') AS DataToTimestamp, count(1) as SourceCount FROM '
+ [EntityName] + ' WHERE ' + [WatermarkColName] + '>' + ''''+CONVERT(varchar(30),II.DataFromTimestamp,121)+''''+ ' AND ' + [WatermarkColName] + '<='+ ''''+CONVERT(varchar(30),II.[DataToTimestamp],121)+''''
--Common No Delta
WHEN [EntityName] IS NOT NULL AND [WatermarkColName] IS NULL AND [LastDeltaDate] IS NOT NULL
Expand All @@ -216,12 +216,9 @@ UNION
THEN 'SELECT SELECT ''1900-01-01 00:00:00'' AS DataFromTimestamp, '''+CONVERT(VARCHAR(30),ELT.uf_GetAestDateTime(),120)+''' AS DataToTimestamp, COUNT(*) AS SourceCount FROM ' + [EntityName]
--Running Number
WHEN [EntityName] IS NOT NULL AND [WatermarkColName] IS NOT NULL AND [LastDeltaNumber] IS NOT NULL
THEN 'SELECT MIN('+[WatermarkColName]+') AS DataFromTimestamp,' + ' MAX('+[WatermarkColName]+') AS DataToTimestamp,'+ 'COUNT(*) AS SourceCount FROM ' + [EntityName]
+ [WatermarkColName] + ' > ' + ''''+CONVERT(VARCHAR,II.[DataFromNumber]) +'''' + ' AND ' + [WatermarkColName] + ' <= ' + ''''+CONVERT(VARCHAR,II.[DataToNumber])+''''
ELSE NULL
THEN 'SELECT COALESCE(MIN('+[WatermarkColName]+'),'+CONVERT(VARCHAR,II.[DataFromNumber])+') AS DataFromTimestamp,' + ' COALESCE(MAX('+[WatermarkColName]+'),'+CONVERT(VARCHAR,II.[DataToNumber])+') AS DataToTimestamp,'+ 'COUNT(*) AS SourceCount FROM ' + [EntityName]
END

,II.[ReloadFlag]
, II.[ReloadFlag]
, II.[ADFIngestPipelineRunID]
FROM
[ELT].[IngestDefinition] ID
Expand Down
Loading