Testing cross-db macros

- Changed the implementation of datediff macro
- Added newline at the end of file

Author: aosingh

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

@@ -20,4 +20,4 @@
         WHEN {{ bool_expression }} THEN 'true'
         ELSE 'false'
     END
-{% endmacro %}
+{% endmacro %}

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

@@ -28,4 +28,4 @@
     {% elif datepart.upper() == 'WEEK' %}
         {{ from_date_or_timestamp }} + 7*{{ interval }}
     {%- endif -%}
-{% endmacro %}
+{% endmacro %}

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

@@ -14,24 +14,26 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 #}
-{# Returns difference (in integer) between 2 dates #}
+{# Returns difference (as an integer) in 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))))
+    {% if datepart.upper() == 'YEAR' %}
+        ROUND(MONTHS_BETWEEN(TRUNC(CAST({{second_date}} AS DATE), 'YEAR'), TRUNC(CAST({{first_date}} AS DATE), 'YEAR'))/12)
     {% 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))
+        ROUND(MONTHS_BETWEEN(TRUNC(CAST({{second_date}} AS DATE), 'Q'), TRUNC(CAST({{first_date}} AS DATE), 'Q'))/3)
+    {% elif datepart.upper() == 'MONTH'%}
+        ROUND(MONTHS_BETWEEN(TRUNC(CAST({{second_date}} AS DATE), 'MONTH'), TRUNC(CAST({{first_date}} AS DATE), 'MONTH')))
+    {% elif datepart.upper() == 'WEEK' %}
+        ROUND((TRUNC(CAST({{ second_date }} AS DATE), 'DAY') - TRUNC(CAST({{ first_date }} AS DATE), 'DAY'))/7)
+    {% elif datepart.upper() == 'DAY' %}
+        ROUND(TRUNC(CAST({{ second_date }} AS DATE), 'DD') - TRUNC(CAST({{ first_date }} AS DATE), 'DD'))
+    {% elif datepart.upper() == 'HOUR' %}
+        ROUND((TRUNC(CAST({{ second_date }} AS DATE), 'HH') - TRUNC(CAST({{ first_date }} AS DATE), 'HH'))*24)
+    {% elif datepart.upper() == 'MINUTE' %}
+        ROUND((TRUNC(CAST({{ second_date }} AS DATE), 'MI') - TRUNC(CAST({{ first_date }} AS DATE), 'MI'))*24*60)
+    {% elif datepart.upper() == 'SECOND' %}
+        EXTRACT(DAY FROM (CAST({{ second_date }} AS TIMESTAMP) - CAST({{ first_date }} AS TIMESTAMP)))*24*60*60
+        +EXTRACT(HOUR FROM (CAST({{ second_date }} AS TIMESTAMP) - CAST({{ first_date }} AS TIMESTAMP)))*60*60
+        +EXTRACT(MINUTE FROM (CAST({{ second_date }} AS TIMESTAMP) - CAST({{ first_date }} AS TIMESTAMP)))*60
+        +EXTRACT(SECOND FROM (CAST({{ second_date }} AS TIMESTAMP) - CAST({{ first_date }} AS TIMESTAMP)))
     {% endif %}
 {% endmacro %}

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

@@ -24,4 +24,4 @@
     {% endif %}
     {%- set single_quote = "\'" -%}
     TRUNC({{date}}, {{single_quote ~ datepart ~ single_quote}})
-{% endmacro %}
+{% endmacro %}

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

@@ -17,4 +17,4 @@
 
 {% macro oracle__except() %}
     MINUS
-{% endmacro %}
+{% endmacro %}

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

@@ -18,4 +18,4 @@
 {% macro oracle__hash(field, method='MD5') %}
     {%- set single_quote = "\'" -%}
     STANDARD_HASH({{field}}, {{single_quote ~ method  ~ single_quote }})
-{% endmacro %}
+{% endmacro %}

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

@@ -17,4 +17,4 @@
 {# 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 %}
+{% endmacro %}

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

@@ -17,4 +17,4 @@
 
 {% macro oracle__position(substring_text, string_text) %}
     INSTR({{ string_text }}, {{ substring_text }})
-{% endmacro %}
+{% endmacro %}

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

@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 #}
-
+{# Returns N rightmost characters from a string #}
 {% macro oracle__right(string_text, length_expression) %}
 
     case when {{ length_expression }} = 0
@@ -26,4 +26,4 @@
         )
     end
 
-{%- endmacro -%}
+{%- endmacro -%}

tests/functional/adapter/utils/test_dateutils.py

@@ -96,7 +96,45 @@
     result as expected
 
 from data
-
+-- Also test correct casting of literal values.
+union all 
+    select {{ datediff("TO_TIMESTAMP('1999-12-31 23:59:59.999999', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "TO_TIMESTAMP('2000-01-01 00:00:00.000000', 'YYYY-MM-DD HH24:MI:SS.FF')", 
+                       "minute") }} as actual, 
+                       1 as expected FROM DUAL
+
+union all 
+    select {{ datediff("TO_TIMESTAMP('1999-12-31 23:59:59.999999', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "TO_TIMESTAMP('2000-01-01 00:00:00.000000', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                        "hour") }} as actual, 
+                        1 as expected FROM DUAL
+                        
+union all 
+    select {{ datediff("TO_TIMESTAMP('1999-12-31 23:59:59.999999', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "TO_TIMESTAMP('2000-01-01 00:00:00.000000', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "day") }} as actual, 
+                       1 as expected FROM DUAL
+                       
+union all 
+    select {{ datediff("TO_TIMESTAMP('1999-12-31 23:59:59.999999', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "TO_TIMESTAMP('2000-01-03 00:00:00.000000', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "week") }} as actual, 
+                       1 as expected FROM DUAL
+union all 
+    select {{ datediff("TO_TIMESTAMP('1999-12-31 23:59:59.999999', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "TO_TIMESTAMP('2000-01-01 00:00:00.000000', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "month") }} as actual, 
+                       1 as expected FROM DUAL
+union all 
+    select {{ datediff("TO_TIMESTAMP('1999-12-31 23:59:59.999999', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "TO_TIMESTAMP('2000-01-01 00:00:00.000000', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "quarter") }} as actual, 
+                       1 as expected FROM DUAL
+union all 
+    select {{ datediff("TO_TIMESTAMP('1999-12-31 23:59:59.999999', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "TO_TIMESTAMP('2000-01-01 00:00:00.000000', 'YYYY-MM-DD HH24:MI:SS.FF')",
+                       "year") }} as actual, 
+                       1 as expected FROM DUAL
 """