Skip to content

Commit 6b04f3f

Browse files
committed
fix save_test_history macro to work when a model depends_on a source with the same name
* Without checking the node_type, a model could match a source with the same name and the macro would error out trying to get the database on that node which is not present for a source * Fixes issue: re-data/re-data#371
1 parent ecdf5e5 commit 6b04f3f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

macros/run_end/save_results_history.sql

+7-6
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040

4141
{% if any_refs %}
4242
{% set name = any_refs[0] %}
43-
{% set node_name = re_data.priv_full_name_from_depends(el.node, name) %}
43+
{% set node_name = re_data.priv_full_name_from_depends(el.node, name, "model") %}
4444
{% set schema = graph.nodes.get(node_name)['schema'] %}
4545
{% set database = graph.nodes.get(node_name)['database'] %}
46-
{% set table_name = (database + '.' + schema + '.' + name) | lower %}
47-
46+
{% set table_name = (database + '.' + schema + '.' + name) | lower %}
47+
4848
{% elif any_source %}
4949
{% set package_name = any_source[0][0] %}
5050
{% set name = any_source[0][1] %}
51-
{% set node_name = re_data.priv_full_name_from_depends(el.node, name) %}
51+
{% set node_name = re_data.priv_full_name_from_depends(el.node, name, "source") %}
5252
{% set schema = graph.sources.get(node_name)['schema'] %}
5353
{% set database = graph.sources.get(node_name)['database'] %}
5454
{% set table_name = (database + '.' + schema + '.' + name) | lower %}
@@ -98,11 +98,12 @@
9898

9999
{% endmacro %}
100100

101-
{% macro priv_full_name_from_depends(node, name) %}
101+
{% macro priv_full_name_from_depends(node, name, type) %}
102102

103103
{% for full_name in node.depends_on.nodes %}
104104
{% set node_name = full_name.split('.')[-1] %}
105-
{% if node_name == name %}
105+
{% set node_type = full_name.split('.')[0] %}
106+
{% if node_name == name and node_type == type %}
106107
{{ return(full_name) }}
107108
{% endif %}
108109
{% endfor %}

0 commit comments

Comments
 (0)