PR feedback

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 - Extend catalog and manifest to also support Snowflake, BigQuery, and Redshift
 - Add a 'generated_at' field to both the manifest and the catalog.
-- Verison 2 of schema.yml, which allows users to create table and column comments that end up in the manifest
+- Version 2 of schema.yml, which allows users to create table and column comments that end up in the manifest
 
 ## dbt 0.10.2 (unreleased, codename: Betsy Ross)
 

dbt/exceptions.py

@@ -369,3 +369,15 @@ def raise_patch_targets_not_found(patches):
  patch_list
  )
  )
+
+
+def raise_duplicate_patch_name(name, patch_1, patch_2):
+ raise_compiler_error(
+ 'dbt found two schema.yml entries for the same model named {}. The '
+ 'first patch was specified in {} and the second in {}. Models and '
+ 'their associated columns may only be described a single time.'.format(
+ name,
+ patch_1,
+ patch_2,
+ )
+ )

dbt/loader.py

@@ -143,16 +143,8 @@ def load_all(cls, root_project, all_projects, macros=None):
 
  for name, patch in project_patches.items():
  if name in patches:
- dbt.exceptions.raise_compiler_error(
- 'dbt found two schema.yml entries for the same model '
- 'named {}. The first patch was specified in {} and '
- 'the second in {}. Models and their associated '
- 'columns may only be described a single time.'.format(
- name,
- patch.original_file_path,
- patches[name].original_file_path,
- )
- )
+ dbt.exceptions.raise_duplicate_patch_name(name, patch,
+ patches[name])
  patches[name] = patch
  return tests, patches