Merge pull request #2584 from fishtown-analytics/fix/plus-prefixed-hooks

Fix prefixing support to not render "+pre-hook"

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## dbt 0.17.1 (Release TBD)
 
+
+### Fixes
+- dbt config-version: 2 now properly defers rendering `+pre-hook` and `+post-hook` fields. ([#2583](https:/fishtown-analytics/dbt/issues/2583), [#2854](https:/fishtown-analytics/dbt/pull/2854))
+
+
 ## dbt 0.17.1rc1 (June 19, 2020)
 
 
@@ -16,7 +21,7 @@
 
 Contributors:
  - [@bodschut](https:/bodschut) ([#2550](https:/fishtown-analytics/dbt/pull/2550))
- 
+
 ## dbt 0.17.0 (June 08, 2020)
 
 ### Fixes

core/dbt/config/renderer.py

@@ -78,7 +78,7 @@ def should_render_keypath_v1(self, keypath: Keypath) -> bool:
  if first in {'on-run-start', 'on-run-end', 'query-comment'}:
  return False
  # models have two things to avoid
- if first in {'seeds', 'models', 'snapshots', 'seeds'}:
+ if first in {'seeds', 'models', 'snapshots'}:
  # model-level hooks
  if 'pre-hook' in keypath or 'post-hook' in keypath:
  return False
@@ -102,11 +102,12 @@ def should_render_keypath_v2(self, keypath: Keypath) -> bool:
  return False
 
  if first in {'seeds', 'models', 'snapshots', 'seeds'}:
+ keypath_parts = {
+ (k.lstrip('+') if isinstance(k, str) else k)
+ for k in keypath
+ }
  # model-level hooks
- if 'pre-hook' in keypath or 'post-hook' in keypath:
- return False
- # model-level 'vars' declarations
- if 'vars' in keypath:
+ if 'pre-hook' in keypath_parts or 'post-hook' in keypath_parts:
  return False
 
  return True

test/integration/014_hook_tests/test_model_hooks.py

@@ -226,6 +226,23 @@ def test_postgres_hooks_on_seeds(self):
  self.assertEqual(len(res), 1, 'Expected exactly one item')
 
 
+class TestPrePostModelHooksOnSeedsPlusPrefixed(TestPrePostModelHooksOnSeeds):
+ @property
+ def project_config(self):
+ return {
+ 'config-version': 2,
+ 'data-paths': ['data'],
+ 'models': {},
+ 'seeds': {
+ '+post-hook': [
+ 'alter table {{ this }} add column new_col int',
+ 'update {{ this }} set new_col = 1'
+ ],
+ 'quote_columns': False,
+ },
+ }
+
+
 class TestPrePostModelHooksOnSnapshots(DBTIntegrationTest):
  @property
  def schema(self):

test/integration/048_rpc_test/test_rpc.py

@@ -66,7 +66,7 @@ def is_up(self):
 
  def start(self):
  super().start()
- for _ in range(30):
+ for _ in range(60):
  if self.is_up():
  break
  time.sleep(0.5)