Merge pull request #422 from dbt-labs/wrap-strings-quote-update

Author: b-per

integration_tests/models/dbt_project_evaluator_schema_tests/core.yml

@@ -20,7 +20,9 @@ models:
       - name: on_schema_change
         description: this contains the on_schema_change setting for incremental models. This column was sometimes an empty string, so should be tested to detect regressions
         tests:
-          - is_not_empty_string
+          - not_null:
+              config:
+                where: resource_type = 'model'
       - name: model_type
         tests: 
           - dbt_utils.expression_is_true:

integration_tests/models/staging/source_1/schema.yml

@@ -5,7 +5,9 @@ models:
     description: test
     columns:
       - name: id 
-        description: hocus pocus
+        description: >
+          hocus pocus
+          pocus hocus
         tests:
           - unique
   - name: stg_model_3

macros/wrap_string_with_quotes.sql

@@ -1,7 +1,14 @@
 {% macro wrap_string_with_quotes(str) %}
-  {% if not str %}
+  {% if str is none %}
     {{ return('cast(NULL as ' ~ dbt.type_string() ~ ')') }}
   {% else %}
-    {{ return("'" ~ str ~ "'") }}
+    {{ dbt.string_literal(str) }}
   {% endif %}
 {% endmacro %}
+
+{#
+  To be removed when https://github.com/dbt-labs/dbt-bigquery/pull/1089 is merged
+#}
+{% macro bigquery__string_literal(value) -%}
+  '''{{ value }}'''
+{%- endmacro %}

models/marts/core/int_all_graph_resources.sql

@@ -34,7 +34,7 @@ unioned_with_calc as (
         *,
         case 
             when resource_type = 'source' then  {{ dbt.concat(['source_name',"'.'",'name']) }}
-            when version is not null then {{ dbt.concat(['name',"'.v'",'version']) }} 
+            when coalesce(version, '') != '' then {{ dbt.concat(['name',"'.v'",'version']) }} 
             else name 
         end as resource_name,
         case

models/marts/dag/dag.yml

@@ -6,7 +6,7 @@ models:
     tests:
       - is_empty
   - name: fct_duplicate_sources
-    descritption: "This table shows each source database location with more than one node in your dbt project."
+    description: "This table shows each source database location with more than one node in your dbt project."
     tests:
       - is_empty
   - name: fct_marts_or_intermediate_dependent_on_source
@@ -24,7 +24,7 @@ models:
   - name: fct_rejoining_of_upstream_concepts
     description: >
       "All cases where one of the parent's direct children (child) is ALSO the direct child of ANOTHER one of the 
-      parent's direct childen (parent_and_child). Only includes cases where the model "in between" the parent and child 
+      parent's direct children (parent_and_child). Only includes cases where the model "in between" the parent and child 
       has NO other downstream dependencies.
     tests:
       - is_empty

models/marts/dag/fct_hard_coded_references.sql

@@ -11,7 +11,7 @@ final as (
         resource_name as model,
         hard_coded_references
     from models
-    where hard_coded_references is not null
+    where hard_coded_references != ''
 )
 
 select * from final