Revert "try updating json_operations"

This reverts commit c8022c2.
airbytehq · Feb 23, 2022 · c68fc92 · c68fc92
1 parent c8022c2
commit c68fc92
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/...s/bases/base-normalization/dbt-project-template/macros/cross_db_utils/json_operations.sql b/...s/bases/base-normalization/dbt-project-template/macros/cross_db_utils/json_operations.sql
@@ -43,12 +43,11 @@
 {%- endmacro %}
 
 {% macro redshift__format_json_path(json_path_list) -%}
-    {%- set quote = '"' if redshift_super_type() else "'" -%}
     {%- set str_list = [] -%}
     {%- for json_path in json_path_list -%}
-        {%- if str_list.append(json_path.replace(quote, quote + quote)) -%} {%- endif -%}
+        {%- if str_list.append(json_path.replace("'", "''")) -%} {%- endif -%}
     {%- endfor -%}
-    {{ quote ~ str_list|join(quote + "," + quote) ~ quote }}
+    {{ "'" ~ str_list|join("','") ~ "'" }}
 {%- endmacro %}
 
 {% macro snowflake__format_json_path(json_path_list) -%}
@@ -115,14 +114,11 @@
 {%- endmacro %}
 
 {% macro redshift__json_extract(from_table, json_column, json_path_list, normalized_json_path) -%}
-    {%- if from_table|string() != '' -%}
-    {%- set json_column = from_table|string() + "." + json_column|string() -%}
-    {%- endif -%}
-    {%- if redshift_super_type() -%}
-        case when {{ json_column }}.{{ format_json_path(json_path_list) }} != '' then {{ json_column }}.{{ format_json_path(json_path_list) }} end
-    {%- else -%}
+    {%- if from_table|string() == '' %}
         case when json_extract_path_text({{ json_column }}, {{ format_json_path(json_path_list) }}, true) != '' then json_extract_path_text({{ json_column }}, {{ format_json_path(json_path_list) }}, true) end
-    {%- endif -%}
+    {% else %}
+        case when json_extract_path_text({{ from_table }}.{{ json_column }}, {{ format_json_path(json_path_list) }}, true) != '' then json_extract_path_text({{ from_table }}.{{ json_column }}, {{ format_json_path(json_path_list) }}, true) end
+    {% endif -%}
 {%- endmacro %}
 
 {% macro snowflake__json_extract(from_table, json_column, json_path_list, normalized_json_path) -%}
@@ -172,11 +168,7 @@
 {%- endmacro %}
 
 {% macro redshift__json_extract_scalar(json_column, json_path_list, normalized_json_path) -%}
-    {%- if redshift_super_type() -%}
-    case when {{ json_column }}.{{ format_json_path(json_path_list) }} != '' then {{ json_column }}.{{ format_json_path(json_path_list) }} end
-    {%- else -%}
     case when json_extract_path_text({{ json_column }}, {{ format_json_path(json_path_list) }}, true) != '' then json_extract_path_text({{ json_column }}, {{ format_json_path(json_path_list) }}, true) end
-    {%- endif -%}
 {%- endmacro %}
 
 {% macro snowflake__json_extract_scalar(json_column, json_path_list, normalized_json_path) -%}
@@ -218,11 +210,7 @@
 {%- endmacro %}
 
 {% macro redshift__json_extract_array(json_column, json_path_list, normalized_json_path) -%}
-    {%- if redshift_super_type() -%}
-    {{ json_column }}.{{ format_json_path(json_path_list) }}
-    {%- else -%}
     json_extract_path_text({{ json_column }}, {{ format_json_path(json_path_list) }}, true)
-    {%- endif -%}
 {%- endmacro %}
 
 {% macro snowflake__json_extract_array(json_column, json_path_list, normalized_json_path) -%}
@@ -235,4 +223,4 @@
 
 {% macro clickhouse__json_extract_array(json_column, json_path_list, normalized_json_path) -%}
     JSONExtractArrayRaw({{ json_column }}, {{ format_json_path(json_path_list) }})
-{%- endmacro %}
+{%- endmacro %}