Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add toyaml/fromyaml (#1911) #2036

Merged
merged 1 commit into from
Jan 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion core/dbt/context/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

from dbt.node_types import NodeType


import yaml
# These modules are added to the context. Consider alternative
# approaches which will extend well to potentially many modules
import pytz
Expand Down Expand Up @@ -139,6 +139,21 @@ def tojson(value, default=None, sort_keys=False):
return default


def fromyaml(value, default=None):
try:
return yaml.safe_load(value)
except (AttributeError, ValueError, yaml.YAMLError):
return default


# safe_dump defaults to sort_keys=True, but act like json.dumps (the opposite)
def toyaml(value, default=None, sort_keys=False):
try:
return yaml.safe_dump(data=value, sort_keys=sort_keys)
except (ValueError, yaml.YAMLError):
return default


def log(msg, info=False):
if info:
logger.info(msg)
Expand All @@ -164,6 +179,8 @@ def to_dict(self) -> Dict[str, Any]:
'return': _return,
'fromjson': fromjson,
'tojson': tojson,
'fromyaml': fromyaml,
'toyaml': toyaml,
'log': log,
}
if os.environ.get('DBT_MACRO_DEBUGGING'):
Expand Down
2 changes: 2 additions & 0 deletions core/dbt/contracts/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ class RegistryPackageMetadata(
'execute',
'flags',
'fromjson',
'fromyaml',
'graph',
'invocation_id',
'load_agate_table',
Expand All @@ -128,6 +129,7 @@ class RegistryPackageMetadata(
'target',
'this',
'tojson',
'toyaml',
'try_or_compiler_error',
'var',
'write',
Expand Down
19 changes: 19 additions & 0 deletions test/integration/013_context_var_tests/test_context_members.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
from test.integration.base import DBTIntegrationTest, use_profile


class TestContextVars(DBTIntegrationTest):
@property
def schema(self):
return "context_members_013"

@property
def models(self):
return "context-member-models"

@property
def project_config(self):
return {'test-paths': ['tests']}

@use_profile('postgres')
def test_json_data_tests_postgres(self):
self.assertEqual(len(self.run_dbt(['test'])), 2)
14 changes: 14 additions & 0 deletions test/integration/013_context_var_tests/tests/from_yaml.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{% set simplest = (fromyaml('a: 1') == {'a': 1}) %}
{% set nested_data %}
a:
b:
- c: 1
d: 2
- c: 3
d: 4
{% endset %}
{% set nested = (fromyaml(nested_data) == {'a': {'b': [{'c': 1, 'd': 2}, {'c': 3, 'd': 4}]}}) %}

(select 'simplest' as name {% if simplest %}limit 0{% endif %})
union all
(select 'nested' as name {% if nested %}limit 0{% endif %})
17 changes: 17 additions & 0 deletions test/integration/013_context_var_tests/tests/to_yaml.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

{% set simplest = (toyaml({'a': 1}) == 'a: 1\n') %}
{% set default_sort = (toyaml({'b': 2, 'a': 1}) == 'b: 2\na: 1\n') %}
{% set unsorted = (toyaml({'b': 2, 'a': 1}, sort_keys=False) == 'b: 2\na: 1\n') %}
{% set sorted = (toyaml({'b': 2, 'a': 1}, sort_keys=True) == 'a: 1\nb: 2\n') %}
{% set default_results = (toyaml({'a': adapter}, 'failed') == 'failed') %}

(select 'simplest' as name {% if simplest %}limit 0{% endif %})
union all
(select 'default_sort' as name {% if default_sort %}limit 0{% endif %})
union all
(select 'unsorted' as name {% if unsorted %}limit 0{% endif %})
union all
(select 'sorted' as name {% if sorted %}limit 0{% endif %})
union all
(select 'default_results' as name {% if default_results %}limit 0{% endif %})