From fc7e592977b9fee99a261724c3be15bd7af70c06 Mon Sep 17 00:00:00 2001
From: Julius Remigio <14811322+juls858@users.noreply.github.com>
Date: Wed, 7 Jun 2023 13:56:49 -0700
Subject: [PATCH] Bug-datashare-models-with-same-prefix (#6)

---
 macros/datashares.sql                         | 30 ++++---------------
 models/datashare/_datashare___create_gold.sql |  6 ++--
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/macros/datashares.sql b/macros/datashares.sql
index 29f663c..e872048 100644
--- a/macros/datashares.sql
+++ b/macros/datashares.sql
@@ -40,21 +40,18 @@
 {#
     Return the DDL statement for a view with the references replaced.
 
-    references_to_replace: a dictionary of references to replace
-    ddl: the DDL statement to replace the references in
-    new_database: the new database to replace the references with
+    references_to_replace: a list of references to replace
+    ddl: the DDL statement to be replaced
+    new_database: the new database name to replace the references with
 #}
+    {% set re = modules.re %}
     {% set outer = namespace(replaced=ddl) %}
     {% for key in references_to_replace %}
-        {%- set original = target.database ~ "." ~ key.upper() -%}
+        {%- set original = re.compile("\\b" ~ target.database ~ "." ~ key ~ "\\b", re.IGNORECASE) -%}
         {%- set replacement  =  new_database ~ "." ~ key -%}
-        {%- set outer.replaced = outer.replaced|replace(original, replacement) -%}
-        {%- set original = target.database ~ "." ~ key.lower() -%}
-        {%- set replacement  =  new_database ~ "." ~ key -%}
-        {%- set outer.replaced = outer.replaced|replace(original, replacement) -%}
+        {% set outer.replaced = original.sub(replacement, outer.replaced) %}
     {%- endfor -%}
     {% set outer.replaced = outer.replaced|replace(target.database.upper() ~ ".", "__SOURCE__.") %}
-    {% set outer.replaced = outer.replaced|replace(target.database.lower() ~ ".", "__SOURCE__.") %}
     {{- outer.replaced -}}
 {%- endmacro -%}
 
@@ -156,19 +153,4 @@
     {%- set combined_ddl = gold_views_ddl + gold_tables_ddl -%}
     {%- do combined_ddl.insert(0, "CREATE DATABASE IF NOT EXISTS __NEW__;") -%}
     {{- "BEGIN\n" ~ (combined_ddl | join("\n")) ~ "\nEND" -}}
-{%- endmacro -%}
-
-{% macro get_exclusion_schema() %}
-{#
-    Return a list of schemas to exclude from the data shares
- #}
-{% set schema = {} %}
-{% for key, value in graph.nodes.items() -%}
-    {%
-    if key.startswith("test.") or value.schema.startswith("_")
-    -%}
-    {% do schema.update({value.schema:None}) %}
-    {%- endif %}
-{%- endfor %}
-{{- schema.keys() | list | tojson  -}}
 {%- endmacro -%}
\ No newline at end of file
diff --git a/models/datashare/_datashare___create_gold.sql b/models/datashare/_datashare___create_gold.sql
index e9cb50f..8439f58 100644
--- a/models/datashare/_datashare___create_gold.sql
+++ b/models/datashare/_datashare___create_gold.sql
@@ -10,13 +10,11 @@
 SELECT
 $${{- fsc_utils.generate_datashare_ddl() -}}$$ AS ddl,
 md5(ddl) AS ddl_hash,
-sysdate() as ddl_created_at,
-{{ fsc_utils.get_exclusion_schema().replace('"',"'") }} as exclusion_schema
+sysdate() as ddl_created_at
 {% else %}
 SELECT
 null as ddl,
 null as ddl_hash,
-null as ddl_created_at,
-null as exclusion_schema
+null as ddl_created_at
 from dual limit 0
 {% endif %}
\ No newline at end of file