Quote config

dbt/adapters/bigquery/impl.py

@@ -194,6 +194,10 @@ def list_relations(cls, profile, schema, model_name=None):
  project=credentials.get('project'),
  schema=schema,
  identifier=table.table_id,
+ quote_policy={
+ 'schema': True,
+ 'identifier': True
+ },
  type=relation_types.get(table.table_type))
  for table in all_tables]
 

dbt/adapters/default/relation.py

@@ -118,7 +118,7 @@ def include(self, database=None, schema=None, identifier=None):
 
  return self.incorporate(include_policy=policy)
 
- def render(self):
+ def render(self, use_table_name=True):
  parts = []
 
  for k in self.PATH_ELEMENTS:
@@ -128,7 +128,10 @@ def render(self):
  if path_part is None:
  continue
  elif k == 'identifier':
- path_part = self.table
+ if use_table_name:
+ path_part = self.table
+ else:
+ path_part = self.identifier
 
  parts.append(
  self.quote_if(

dbt/adapters/postgres/impl.py

@@ -118,10 +118,10 @@ def alter_column_type(cls, profile, schema, table, column_name,
  def list_relations(cls, profile, schema, model_name=None):
  sql = """
  select tablename as name, schemaname as schema, 'table' as type from pg_tables
- where schemaname = '{schema}'
+ where schemaname ilike '{schema}'
  union all
  select viewname as name, schemaname as schema, 'view' as type from pg_views
- where schemaname = '{schema}'
+ where schemaname ilike '{schema}'
  """.format(schema=schema).strip() # noqa
 
  connection, cursor = cls.add_query(profile, sql, model_name,
@@ -133,6 +133,10 @@ def list_relations(cls, profile, schema, model_name=None):
  database=profile.get('dbname'),
  schema=_schema,
  identifier=name,
+ quote_policy={
+ 'schema': True,
+ 'identifier': True
+ },
  type=type)
  for (name, _schema, type) in results]
 

dbt/adapters/snowflake/impl.py

@@ -127,6 +127,10 @@ def list_relations(cls, profile, schema, model_name=None):
  database=profile.get('database'),
  schema=_schema,
  identifier=name,
+ quote_policy={
+ 'schema': True,
+ 'identifier': True
+ },
  type=relation_type_lookup.get(type))
  for (name, _schema, type) in results]
 

dbt/adapters/snowflake/relation.py

@@ -11,7 +11,7 @@ class SnowflakeRelation(DefaultRelation):
  'quote_policy': {
  'database': False,
  'schema': False,
- 'identifier': False,
+ 'identifier': True,
  },
  'include_policy': {
  'database': False,
@@ -61,17 +61,10 @@ def matches(self, database=None, schema=None, identifier=None):
  pass
 
  for k, v in search.items():
- # snowflake upcases unquoted identiifers. so, when
- # comparing unquoted identifiers, use case insensitive
- # matching. when comparing quoted identifiers, use case
- # sensitive matching.
- if self.should_quote(k):
- if self.get_path_part(k) != v:
- return False
-
- else:
- if self.get_path_part(k) != v.upper():
- return False
+ # snowflake upcases unquoted identiifers. so, use
+ # case insensitive matching.
+ if self.get_path_part(k).upper() != v.upper():
+ return False
 
  return True
 

dbt/context/common.py

@@ -273,12 +273,25 @@ def _return(value):
  raise dbt.exceptions.MacroReturn(value)
 
 
-def get_this_relation(db_wrapper, profile, model):
+def get_this_relation(db_wrapper, project, profile, model):
  table_name = dbt.utils.model_immediate_name(
  model, dbt.flags.NON_DESTRUCTIVE)
 
  return db_wrapper.adapter.Relation.create_from_node(
- profile, model, table_name=table_name)
+ profile, model, table_name=table_name,
+ quote_policy=project.get('quoting', {}))
+
+
+def create_relation(relation_type, quoting_config):
+
+ class RelationWithContext(relation_type):
+ @classmethod
+ def create(cls, *args, **kwargs):
+ return relation_type.create(*args,
+ quote_policy=quoting_config,
+ **kwargs)
+
+ return RelationWithContext
 
 
 def generate(model, project, flat_graph, provider=None):
@@ -310,7 +323,8 @@ def generate(model, project, flat_graph, provider=None):
  context = dbt.utils.merge(context, {
  "adapter": db_wrapper,
  "api": {
- "Relation": adapter.Relation,
+ "Relation": create_relation(adapter.Relation,
+ project.get('quoting')),
  "Column": adapter.Column,
  },
  "column": adapter.Column,
@@ -336,7 +350,7 @@ def generate(model, project, flat_graph, provider=None):
  "fromjson": fromjson,
  "tojson": tojson,
  "target": target,
- "this": get_this_relation(db_wrapper, profile, model),
+ "this": get_this_relation(db_wrapper, project, profile, model),
  "try_or_compiler_error": try_or_compiler_error(model)
  })
 

dbt/context/parser.py

@@ -18,7 +18,9 @@ def ref(*args):
  dbt.exceptions.ref_invalid_args(model, args)
 
  adapter = get_adapter(profile)
- return adapter.Relation.create_from_node(profile, model)
+ return adapter.Relation.create_from_node(
+ profile, model,
+ quote_policy=project.get('quoting', {}))
 
  return ref
 

dbt/context/runtime.py

@@ -57,7 +57,9 @@ def do_ref(*args):
  identifier=add_ephemeral_model_prefix(
  target_model_name)).quote(identifier=False)
  else:
- return adapter.Relation.create_from_node(profile, target_model)
+ return adapter.Relation.create_from_node(
+ profile, target_model,
+ quote_policy=project.get('quoting', {}))
 
  return do_ref
 

dbt/contracts/graph/parsed.py

@@ -25,6 +25,7 @@
  Required('post-hook'): [hook_contract],
  Required('pre-hook'): [hook_contract],
  Required('vars'): dict,
+ Required('quoting'): dict,
  Required('column_types'): dict,
 }, extra=ALLOW_EXTRA)
 

dbt/include/global_project/macros/materializations/seed/seed.sql

@@ -3,8 +3,8 @@
  {{ adapter_macro('create_csv_table', model) }}
 {%- endmacro %}
 
-{% macro reset_csv_table(model, full_refresh, existing) -%}
- {{ adapter_macro('reset_csv_table', model, full_refresh, existing) }}
+{% macro reset_csv_table(model, full_refresh, old_relation) -%}
+ {{ adapter_macro('reset_csv_table', model, full_refresh, old_relation) }}
 {%- endmacro %}
 
 {% macro load_csv_rows(model) -%}
@@ -16,12 +16,12 @@
  {%- set column_override = model['config'].get('column_types', {}) -%}
 
  {% set sql %}
- create table {{ adapter.quote(model['schema']) }}.{{ adapter.quote(model['name']) }} (
- {% for col_name in agate_table.column_names %}
- {% set inferred_type = adapter.convert_type(agate_table, loop.index0) %}
- {% set type = column_override.get(col_name, inferred_type) %}
- {{ col_name | string }} {{ type }} {% if not loop.last %}, {% endif %}
- {% endfor %}
+ create table {{ this.render(False) }} (
+ {%- for col_name in agate_table.column_names -%}
+ {%- set inferred_type = adapter.convert_type(agate_table, loop.index0) -%}
+ {%- set type = column_override.get(col_name, inferred_type) -%}
+ {{ col_name | string }} {{ type }} {%- if not loop.last -%}, {%- endif -%}
+ {%- endfor -%}
  )
  {% endset %}
 
@@ -33,14 +33,14 @@
 {% endmacro %}
 
 
-{% macro default__reset_csv_table(model, full_refresh, existing) %}
+{% macro default__reset_csv_table(model, full_refresh, old_relation) %}
  {% set sql = "" %}
  {% if full_refresh %}
- {{ drop_if_exists(existing, model['schema'], model['name']) }}
+ {{ adapter.drop_relation(old_relation) }}
  {% set sql = create_csv_table(model) %}
  {% else %}
- {{ adapter.truncate(model['schema'], model['name']) }}
- {% set sql = "truncate table " ~ adapter.quote(model['schema']) ~ "." ~ adapter.quote(model['name']) %}
+ {{ adapter.truncate_relation(old_relation) }}
+ {% set sql = "truncate table " ~ old_relation %}
  {% endif %}
 
  {{ return(sql) }}
@@ -62,7 +62,7 @@
  {% endfor %}
 
  {% set sql %}
- insert into {{ adapter.quote(model['schema']) }}.{{ adapter.quote(model['name']) }} ({{ cols_sql }}) values
+ insert into {{ this.render(False) }} ({{ cols_sql }}) values
  {% for row in chunk -%}
  ({%- for column in agate_table.column_names -%}
  %s
@@ -88,8 +88,14 @@
 
  {%- set identifier = model['name'] -%}
  {%- set full_refresh_mode = (flags.FULL_REFRESH == True) -%}
- {%- set existing = adapter.query_for_existing(schema) -%}
- {%- set existing_type = existing.get(identifier) -%}
+ {%- set existing_relations = adapter.list_relations(schema=schema) -%}
+
+ {%- set old_relation = adapter.get_relation(relations_list=existing_relations,
+ schema=schema, identifier=identifier) -%}
+
+ {%- set exists_as_table = (old_relation is not none and old_relation.is_table) -%}
+ {%- set exists_as_view = (old_relation is not none and old_relation.is_view) -%}
+
  {%- set csv_table = model["agate_table"] -%}
 
  {{ run_hooks(pre_hooks, inside_transaction=False) }}
@@ -99,12 +105,12 @@
 
  -- build model
  {% set create_table_sql = "" %}
- {% if existing_type and existing_type != 'table' %}
+ {% if exists_as_view %}
  {{ dbt.exceptions.raise_compiler_error("Cannot seed to '{}', it is a view".format(identifier)) }}
- {% elif existing_type is none%}
- {% set create_table_sql = create_csv_table(model) %}
+ {% elif exists_as_table %}
+ {% set create_table_sql = reset_csv_table(model, full_refresh_mode, old_relation) %}
  {% else %}
- {% set create_table_sql = reset_csv_table(model, full_refresh_mode, existing) %}
+ {% set create_table_sql = create_csv_table(model) %}
  {% endif %}
 
  {% set status = 'CREATE' if full_refresh_mode else 'INSERT' %}

dbt/include/global_project/macros/materializations/table/table.sql

@@ -6,9 +6,10 @@
  {%- set existing_relations = adapter.list_relations(schema=schema) -%}
  {%- set old_relation = adapter.get_relation(relations_list=existing_relations,
  schema=schema, identifier=identifier) -%}
- {%- set target_relation = api.Relation.create(identifier=identifier, schema=schema, type='table') -%}
+ {%- set target_relation = api.Relation.create(identifier=identifier,
+ schema=schema, type='table') -%}
  {%- set intermediate_relation = api.Relation.create(identifier=tmp_identifier,
-  schema=schema, type='table') -%}
+ schema=schema, type='table') -%}
  {%- set exists_as_table = (old_relation is not none and old_relation.is_table) -%}
  {%- set exists_as_view = (old_relation is not none and old_relation.is_view) -%}
  {%- set create_as_temporary = (exists_as_table and non_destructive_mode) -%}

dbt/main.py

@@ -175,6 +175,7 @@ def invoke_dbt(parsed):
  profile_to_load=parsed.profile,
  args=parsed
  )
+ proj.log_warnings()
  proj.validate()
  except project.DbtProjectError as e:
  logger.info("Encountered an error while reading the project:")

dbt/model.py

@@ -12,7 +12,7 @@ class SourceConfig(object):
  ConfigKeys = DBTConfigKeys
 
  AppendListFields = ['pre-hook', 'post-hook']
- ExtendDictFields = ['vars', 'column_types']
+ ExtendDictFields = ['vars', 'column_types', 'quoting']
  ClobberFields = [
  'schema',
  'enabled',
@@ -77,7 +77,8 @@ def config(self):
  active_config = self.load_config_from_active_project()
 
  if self.active_project['name'] == self.own_project['name']:
- cfg = self._merge(defaults, active_config, self.in_model_config)
+ cfg = self._merge(defaults, active_config,
+ self.in_model_config)
  else:
  own_config = self.load_config_from_own_project()
 

dbt/project.py

@@ -91,6 +91,9 @@ def __init__(self, cfg, profiles, profiles_dir, profile_to_load=None,
  if self.cfg.get('models') is None:
  self.cfg['models'] = {}
 
+ if self.cfg.get('quoting') is None:
+ self.cfg['quoting'] = {}
+
  if self.cfg['models'].get('vars') is None:
  self.cfg['models']['vars'] = {}
 
@@ -223,6 +226,21 @@ def validate(self):
  "Expected project configuration '{}' was not supplied"
  .format('.'.join(e.path)), self)
 
+ def log_warnings(self):
+ target_cfg = self.run_environment()
+ db_type = target_cfg.get('type')
+
+ if db_type == 'snowflake' and self.cfg \
+ .get('quoting', {}) \
+ .get('identifier') is None:
+ logger.warn(
+ 'You are using Snowflake, but you did not specify a '
+ 'quoting strategy for your identifiers. Quoting '
+ 'behavior for Snowflake will change in a future release, '
+ 'so it is recommended that you define this explicitly. '
+ '\n\n'
+ 'For more information, see ADD LINK')
+
  def hashed_name(self):
  if self.cfg.get("name", None) is None:
  return None

dbt/utils.py

@@ -28,6 +28,7 @@
  'vars',
  'column_types',
  'bind',
+ 'quoting',
 ]
 
 

test/integration/001_simple_copy_test/models/compound_sort.sql

@@ -6,4 +6,4 @@
  )
 }}
 
-select * from {{ target.schema }}.seed
+select * from {{ ref('seed') }}

test/integration/001_simple_copy_test/models/disabled.sql

@@ -5,4 +5,4 @@
  )
 }}
 
-select * from {{ target.schema }}.seed
+select * from {{ ref('seed') }}

test/integration/001_simple_copy_test/models/incremental.sql

@@ -5,4 +5,4 @@
  )
 }}
 
-select * from {{ target.schema }}.seed
+select * from {{ ref('seed') }}

test/integration/001_simple_copy_test/models/interleaved_sort.sql

@@ -6,4 +6,4 @@
  )
 }}
 
-select * from {{ target.schema }}.seed
+select * from {{ ref('seed') }}

test/integration/001_simple_copy_test/models/materialized.sql

@@ -5,4 +5,4 @@
 }}
 
 -- this is a unicode character: å
-select * from {{ target.schema }}.seed
+select * from {{ ref('seed') }}

test/integration/001_simple_copy_test/models/view_model.sql

@@ -4,4 +4,4 @@
  )
 }}
 
-select * from {{ target.schema }}.seed
+select * from {{ ref('seed') }}