Merge pull request #121 from fishtown-analytics/feature/fix-right-bug

made changes to right() function
dbt-labs · Feb 26, 2019 · 3be8b25 · 3be8b25
2 parents ce8daeb + 1c3934a
commit 3be8b25
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/integration_tests/data/cross_db/data_right.csv b/integration_tests/data/cross_db/data_right.csv
@@ -1,4 +1,5 @@
 string_text,length_expression,output
 abcdef,3,def
 fishtown,4,town
-december,5,ember
+december,5,ember
+december,0,
diff --git a/integration_tests/models/cross_db_utils/test_right.sql b/integration_tests/models/cross_db_utils/test_right.sql
@@ -7,6 +7,6 @@ with data as (
 select
 
     {{ dbt_utils.right('string_text', 'length_expression') }} as actual,
-    output as expected
+    coalesce(output, '') as expected
 
 from data
diff --git a/macros/cross_db_utils/right.sql b/macros/cross_db_utils/right.sql
@@ -13,9 +13,26 @@
 
 {% macro bigquery__right(string_text, length_expression) %}
 
-    substr(
-        {{ string_text }},
-        -1 * ({{ length_expression }})
-    )
+    case when {{ length_expression }} = 0 
+        then ''
+    else 
+        substr(
+            {{ string_text }},
+            -1 * ({{ length_expression }})
+        )
+    end
+
+{%- endmacro -%}
+
+{% macro snowflake__right(string_text, length_expression) %}
+
+    case when {{ length_expression }} = 0 
+        then ''
+    else 
+        right(
+            {{ string_text }},
+            {{ length_expression }}
+        )
+    end
 
 {%- endmacro -%}