Skip to content

Commit d3988b9

Browse files
chadbaldwinchadbaldwin
authored
Update dbo.uf_DateCalc.UserDefinedFunction.sql
1 parent fda9cc6 commit d3988b9

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎dbo.uf_DateCalc.UserDefinedFunction.sql‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,36 @@ BEGIN;
2525
SELECT Code = x.Code
2626
, [Label] = CONVERT(varchar(100), x.[Period])
2727
, BeginDate = CONVERT(datetime2, x.BeginDate)
28-
, EndDateInclusiveDT = DATEADD(MILLISECOND, -3, DATEADD(DAY, 1, CONVERT(datetime, x.EndDate)))
28+
, EndDateInclusiveDT = DATEADD(MILLISECOND, -3, DATEADD(DAY, 1, CONVERT(datetime , x.EndDate)))
2929
, EndDateInclusiveDT2 = DATEADD(NANOSECOND, -100, DATEADD(DAY, 1, CONVERT(datetime2, x.EndDate))) -- +1 day -1 tick
3030
, EndDateExclusive = DATEADD(DAY, 1, CONVERT(datetime2, x.EndDate))
3131
FROM cte_Dates t
3232
CROSS APPLY (
33-
VALUES ('CD' , 'Current Day' , @SeedDate , @SeedDate )
34-
, ('CM' , 'Current Month' , DATEADD(mm, t.DiffMM, 0) , DATEADD(dd, -1, DATEADD(mm, t.DiffMM + 1, 0)) )
35-
, ('CMTD' , 'Current Month To Date' , DATEADD(mm, t.DiffMM, 0) , @SeedDate )
36-
, ('CQ' , 'Current Quarter' , DATEADD(qq, t.DiffQQ, 0) , DATEADD(dd, -1, DATEADD(qq, t.DiffQQ + 1, 0)) )
37-
, ('CQTD' , 'Current Quarter to Date' , DATEADD(qq, t.DiffQQ, 0) , @SeedDate )
38-
, ('CY' , 'Current Year' , DATEADD(yy, t.DiffYY, 0) , DATEADD(dd, -1, DATEADD(yy, t.DiffYY + 1, 0)) )
39-
, ('CYTD' , 'Current Year To Date' , DATEADD(yy, t.DiffYY, 0) , @SeedDate )
33+
VALUES ('CD' , 'Current Day' , @SeedDate , @SeedDate )
34+
, ('CM' , 'Current Month' , DATEADD(mm, t.DiffMM, 0) , DATEADD(dd, -1, DATEADD(mm, t.DiffMM + 1, 0)) )
35+
, ('CMTD' , 'Current Month To Date' , DATEADD(mm, t.DiffMM, 0) , @SeedDate )
36+
, ('CQ' , 'Current Quarter' , DATEADD(qq, t.DiffQQ, 0) , DATEADD(dd, -1, DATEADD(qq, t.DiffQQ + 1, 0)) )
37+
, ('CQTD' , 'Current Quarter to Date' , DATEADD(qq, t.DiffQQ, 0) , @SeedDate )
38+
, ('CY' , 'Current Year' , DATEADD(yy, t.DiffYY, 0) , DATEADD(dd, -1, DATEADD(yy, t.DiffYY + 1, 0)) )
39+
, ('CYTD' , 'Current Year To Date' , DATEADD(yy, t.DiffYY, 0) , @SeedDate )
4040

41-
, ('PD' , 'Previous Day' , DATEADD(dd, -1, @SeedDate) , DATEADD(dd, -1, @SeedDate) )
42-
-- , ('PW' , 'Previous Week' , DATEADD(wk, y.DiffWK - 1, 0) , DATEADD(dd, -1, DATEADD(wk, y.DiffWK, 0)) ) -- Removed temporarily - for some reason defaults to Monday as first day of week, despite DATEFIRST setting
43-
, ('PM' , 'Previous Month' , DATEADD(mm, t.DiffMM - 1, 0) , DATEADD(dd, -1, DATEADD(mm, t.DiffMM, 0)) )
44-
, ('PMTD' , 'Previous Month to Date' , DATEADD(mm, t.DiffMM - 1, 0) , DATEADD(mm, -1, @SeedDate) )
45-
, ('PQ' , 'Previous Quarter' , DATEADD(qq, t.DiffQQ - 1, 0) , DATEADD(dd, -1, DATEADD(qq, t.DiffQQ, 0)) )
46-
, ('PQTD' , 'Previous Quarter to Date' , DATEADD(qq, t.DiffQQ - 1, 0) , DATEADD(qq, -1, @SeedDate) )
47-
, ('PYQ' , 'Previous Year Quarter' , DATEADD(qq, t.DiffQQ - 4, 0) , DATEADD(dd, -1, DATEADD(qq, t.DiffQQ - 3, 0)) )
48-
, ('PYQTD' , 'Previous Year Quarter to Date' , DATEADD(qq, t.DiffQQ - 4, 0) , DATEADD(yy, -1, @SeedDate) )
49-
, ('PY' , 'Previous Year' , DATEADD(yy, t.DiffYY - 1, 0) , DATEADD(dd, -1, DATEADD(yy, t.DiffYY, 0)) )
50-
, ('PYTD' , 'Previous Year to Date' , DATEADD(yy, t.DiffYY - 1, 0) , DATEADD(yy, -1, @SeedDate) )
41+
, ('PD' , 'Previous Day' , DATEADD(dd, -1, @SeedDate) , DATEADD(dd, -1, @SeedDate) )
42+
-- , ('PW' , 'Previous Week' , DATEADD(wk, y.DiffWK - 1, 0) , DATEADD(dd, -1, DATEADD(wk, y.DiffWK, 0)) ) -- Removed temporarily - for some reason defaults to Monday as first day of week, despite DATEFIRST setting
43+
, ('PM' , 'Previous Month' , DATEADD(mm, t.DiffMM - 1, 0) , DATEADD(dd, -1, DATEADD(mm, t.DiffMM, 0)) )
44+
, ('PMTD' , 'Previous Month to Date' , DATEADD(mm, t.DiffMM - 1, 0) , DATEADD(mm, -1, @SeedDate) )
45+
, ('PQ' , 'Previous Quarter' , DATEADD(qq, t.DiffQQ - 1, 0) , DATEADD(dd, -1, DATEADD(qq, t.DiffQQ, 0)) )
46+
, ('PQTD' , 'Previous Quarter to Date' , DATEADD(qq, t.DiffQQ - 1, 0) , DATEADD(qq, -1, @SeedDate) )
47+
, ('PYQ' , 'Previous Year Quarter' , DATEADD(qq, t.DiffQQ - 4, 0) , DATEADD(dd, -1, DATEADD(qq, t.DiffQQ - 3, 0)) )
48+
, ('PYQTD' , 'Previous Year Quarter to Date' , DATEADD(qq, t.DiffQQ - 4, 0) , DATEADD(yy, -1, @SeedDate) )
49+
, ('PY' , 'Previous Year' , DATEADD(yy, t.DiffYY - 1, 0) , DATEADD(dd, -1, DATEADD(yy, t.DiffYY, 0)) )
50+
, ('PYTD' , 'Previous Year to Date' , DATEADD(yy, t.DiffYY - 1, 0) , DATEADD(yy, -1, @SeedDate) )
5151
) x(Code, [Period], BeginDate, EndDate)
5252
WHERE x.Code = @DateCode OR @DateCode IS NULL
5353
UNION
5454
SELECT Code = UPPER(@DateCode)
5555
, [Label] = CONCAT_WS(' ', CASE LEFT(@DateCode, 1) WHEN 'L' THEN 'Last' WHEN 'P' THEN 'Previous' ELSE NULL END, t.[Value], 'days')
5656
, BeginDate = CONVERT(datetime2, x.BeginDate)
57-
, EndDateInclusiveDT = DATEADD(MILLISECOND, -3, DATEADD(DAY, 1, CONVERT(datetime, x.EndDate)))
57+
, EndDateInclusiveDT = DATEADD(MILLISECOND, -3, DATEADD(DAY, 1, CONVERT(datetime , x.EndDate)))
5858
, EndDateInclusiveDT2 = DATEADD(NANOSECOND, -100, DATEADD(DAY, 1, CONVERT(datetime2, x.EndDate))) -- +1 day -1 tick
5959
, EndDateExclusive = DATEADD(DAY, 1, CONVERT(datetime2, x.EndDate))
6060
FROM (

0 commit comments

Comments
 (0)