More cross-db macros

- datediff
- replace
- added documentation

Author: aosingh

dbt/include/oracle/macros/utils/dateadd.sql

@@ -17,11 +17,11 @@
 
 {% macro oracle__dateadd(datepart, interval, from_date_or_timestamp) %}
     {%- set single_quote = "\'" -%}
-    {%- set DS_INTERVAL_UNITS = ['DAY', 'HOUR', 'MINUTE', 'SECOND'] -%}
-    {%- set MY_INTERVAL_UNITS = ['YEAR','MONTH'] -%}
-    {%- if datepart.upper() in DS_INTERVAL_UNITS -%}
+    {%- set D2S_INTERVAL_UNITS = ['DAY', 'HOUR', 'MINUTE', 'SECOND'] -%}
+    {%- set M2Y_INTERVAL_UNITS = ['YEAR','MONTH'] -%}
+    {%- if datepart.upper() in D2S_INTERVAL_UNITS -%}
         {{ from_date_or_timestamp }} + NUMTODSINTERVAL({{ interval }}, {{single_quote ~ datepart ~ single_quote}})
-    {%- elif datepart.upper() in MY_INTERVAL_UNITS -%}
+    {%- elif datepart.upper() in M2Y_INTERVAL_UNITS -%}
         {{ from_date_or_timestamp }} + NUMTOYMINTERVAL({{ interval }}, {{single_quote ~ datepart ~ single_quote}})
     {%- elif datepart.upper() == 'QUARTER' -%}
         ADD_MONTHS({{ from_date_or_timestamp }}, 3*{{ interval }})

dbt/include/oracle/macros/utils/datediff.sql

@@ -0,0 +1,37 @@
+{#
+ Copyright (c) 2022, Oracle and/or its affiliates.
+ Copyright (c) 2020, Vitor Avancini
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+#}
+{# Returns difference (in integer) between 2 dates #}
+{% macro oracle__datediff(first_date, second_date, datepart) %}
+    {%- set single_quote = "\'" -%}
+    {%- set D2S_INTERVAL_UNITS = ['DAY', 'HOUR', 'MINUTE', 'SECOND'] -%}
+    {% if datepart.upper() in D2S_INTERVAL_UNITS %}
+        ROUND((CAST({{ second_date }} AS DATE) - CAST({{ first_date }} AS DATE)) *
+               decode(upper({{single_quote ~ datepart ~ single_quote}}),
+                      'HOUR', 24,
+                      'MINUTE', 24*60,
+                      'SECOND', 24*60*60,
+                      1))
+    {% elif datepart.upper() == 'WEEK' %}
+        ROUND((CAST({{ second_date }} AS DATE) - CAST({{ first_date }} AS DATE))/7)
+    {% elif datepart.upper() == 'MONTH' %}
+        ROUND((MONTHS_BETWEEN(CAST({{second_date}} AS DATE), CAST({{first_date}} AS DATE))))
+    {% elif datepart.upper() == 'QUARTER' %}
+        ROUND((MONTHS_BETWEEN(CAST({{second_date}} AS DATE), CAST({{first_date}} AS DATE))/3))
+    {% elif datepart.upper() == 'YEAR' %}
+        ROUND((MONTHS_BETWEEN(CAST({{second_date}} AS DATE), CAST({{first_date}} AS DATE))/12))
+    {% endif %}
+{% endmacro %}

dbt/include/oracle/macros/utils/datetrunc.sql

@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 #}
-
+{# Returns date with the 'datepart' portion truncated #}
 {% macro oracle__date_trunc(datepart, date) %}
     {% if datepart.upper() == 'QUARTER' %}
         {% set datepart = 'Q' %}

dbt/include/oracle/macros/utils/last_day.sql

@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 #}
-
+{# Returns last day of the quarter, year or month #}
 {% macro oracle__last_day(date, datepart) %}
     {{dbt.dateadd('day', '-1', dbt.dateadd(datepart, '1', dbt.date_trunc(datepart, date)))}}
 {% endmacro %}

tests/functional/adapter/utils/test_common_utils.py

@@ -27,10 +27,12 @@
 from dbt.tests.adapter.utils.test_right import BaseRight
 from dbt.tests.adapter.utils.test_cast_bool_to_text import BaseCastBoolToText
 from dbt.tests.adapter.utils.test_replace import BaseReplace
+from dbt.tests.adapter.utils.test_length import BaseLength
 
 from dbt.tests.adapter.utils.fixture_cast_bool_to_text import models__test_cast_bool_to_text_yml
 from dbt.tests.adapter.utils.fixture_escape_single_quotes import models__test_escape_single_quotes_yml
 from dbt.tests.adapter.utils.fixture_string_literal import models__test_string_literal_yml
+from dbt.tests.adapter.utils.fixture_replace import models__test_replace_yml
 
 
 # Oracle requires FROM DUAL
@@ -68,6 +70,29 @@
 from data
 """
 
+models__test_replace_sql = """
+with data as (
+
+    select
+
+        string_text,
+        coalesce(search_chars, '') as old_chars,
+        coalesce(replace_chars, '') as new_chars,
+        result
+
+    from {{ ref('data_replace') }}
+
+)
+
+select
+
+    {{ replace('string_text', 'old_chars', 'new_chars') }} as actual,
+    result as expected
+
+from data
+"""
+
+
 class TestCastBoolToText(BaseCastBoolToText):
 
     @pytest.fixture(scope="class")
@@ -131,5 +156,18 @@ class TestStringRight(BaseRight):
     pass
 
 
-# class TestStringReplace(BaseReplace):
-#     pass
+class TestStringReplace(BaseReplace):
+
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {
+            "test_replace.yml": models__test_replace_yml,
+            "test_replace.sql": self.interpolate_macro_namespace(
+                models__test_replace_sql, "replace"
+            ),
+        }
+
+
+class TestStringLength(BaseLength):
+    pass
+

tests/functional/adapter/utils/test_dateutils.py

@@ -19,8 +19,10 @@
 from dbt.tests.adapter.utils.test_dateadd import BaseDateAdd
 from dbt.tests.adapter.utils.test_last_day import BaseLastDay
 from dbt.tests.adapter.utils.test_date_trunc import BaseDateTrunc
+from dbt.tests.adapter.utils.test_datediff import BaseDateDiff
 
 from dbt.tests.adapter.utils.fixture_dateadd import models__test_dateadd_yml
+from dbt.tests.adapter.utils.fixture_datediff import models__test_datediff_yml
 
 seeds__data_date_trunc_csv = """updated_at,day,month
 2018-01-05 12:00:00,2017-12-31 00:00:00,2018-01-01 00:00:00
@@ -56,6 +58,48 @@
 """
 
 
+seeds__data_datediff_csv = """first_date,second_date,datepart,result
+2018-01-01 01:00:00,2018-01-02 01:00:00,day,1
+2018-01-01 01:00:00,2018-02-01 01:00:00,month,1
+2018-01-01 01:00:00,2019-01-01 01:00:00,year,1
+2018-01-01 01:00:00,2018-01-01 02:00:00,hour,1
+2018-01-01 01:00:00,2018-01-01 02:01:00,minute,61
+2018-01-01 01:00:00,2018-01-01 02:00:01,second,3601
+2019-12-31 00:00:00,2019-12-27 00:00:00,week,-1
+2019-12-31 00:00:00,2019-12-30 00:00:00,week,0
+2019-12-31 00:00:00,2020-01-02 00:00:00,week,0
+2019-12-31 00:00:00,2020-01-06 02:00:00,week,1
+,2018-01-01 02:00:00,hour,
+2018-01-01 02:00:00,,hour,
+"""
+
+
+models__test_datediff_sql = """
+with data as (
+
+    select * from {{ ref('data_datediff') }}
+
+)
+
+select
+
+    case
+        when datepart = 'second' then {{ datediff('first_date', 'second_date', 'second') }}
+        when datepart = 'minute' then {{ datediff('first_date', 'second_date', 'minute') }}
+        when datepart = 'hour' then {{ datediff('first_date', 'second_date', 'hour') }}
+        when datepart = 'day' then {{ datediff('first_date', 'second_date', 'day') }}
+        when datepart = 'week' then {{ datediff('first_date', 'second_date', 'week') }}
+        when datepart = 'month' then {{ datediff('first_date', 'second_date', 'month') }}
+        when datepart = 'year' then {{ datediff('first_date', 'second_date', 'year') }}
+        else null
+    end as actual,
+    result as expected
+
+from data
+
+"""
+
+
 class TestDateAdd(BaseDateAdd):
 
     @pytest.fixture(scope="class")
@@ -81,3 +125,19 @@ def seeds(self):
 
 class TestLastDay(BaseLastDay):
     pass
+
+
+class TestDateDiff(BaseDateDiff):
+
+    @pytest.fixture(scope="class")
+    def seeds(self):
+        return {"data_datediff.csv": seeds__data_datediff_csv}
+
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {
+            "test_datediff.yml": models__test_datediff_yml,
+            "test_datediff.sql": self.interpolate_macro_namespace(
+                models__test_datediff_sql, "datediff"
+            ),
+        }