Skip to content

Commit

Permalink
Merge pull request #157 from fishtown-analytics/fix/tagged-data-test-dag
Browse files Browse the repository at this point in the history
Show tagged data tests in DAG
  • Loading branch information
jtcohen6 authored Dec 17, 2020
2 parents 8422d4c + a45505c commit d97c473
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 17 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
## dbt 0.19.0 (Release TBD)
- Fixed issue where data tests with tags were not showing up in graph viz ([docs#147](https://github.com/fishtown-analytics/dbt-docs/issues/147), [docs#156](https://github.com/fishtown-analytics/dbt-docs/pull/156))

## dbt 0.19.0b1 (October 20, 2020)
- Add select/deselect option in DAG view dropups. ([docs#98](https://github.com/fishtown-analytics/dbt-docs/issues/98), [docs#138](https://github.com/fishtown-analytics/dbt-docs/pull/138))
- Fixed issue where sources with tags were not showing up in graph viz ([docs#93](https://github.com/fishtown-analytics/dbt-docs/issues/93), [docs#139](https://github.com/fishtown-analytics/dbt-docs/pull/139))
- Use `compiled_sql` instead of `injected_sql` for "Compiled" ([docs#146](https://github.com/fishtown-analytics/dbt-docs/issues/146), [docs#148](https://github.com/fishtown-analytics/dbt-docs/issues/148))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ yarn install
webpack
```

To run the dev server, first copy your `manifest.json`, `catalog.json`, and `run_results.json` files to
To run the dev server, first copy your `manifest.json` and `catalog.json` files to
the `src/` directory. Then run:

```bash
Expand Down
19 changes: 11 additions & 8 deletions ci-project/dbt_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@ clean-targets:
- "dbt_modules"
- "logs"

seeds:
+quote_columns: false

models:
jaffle_shop:
+materialized: table
marts:
core:
intermediate:
+materialized: ephemeral
staging:
+materialized: view
+tags: ["staging", "hourly"]
+materialized: table
marts:
core:
intermediate:
+materialized: ephemeral
staging:
+materialized: view
+tags: ["staging", "hourly"]
3 changes: 3 additions & 0 deletions ci-project/models/staging/schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@ sources:
tables:
- name: orders
identifier: "raw_orders"
- name: tagged_source
identifier: "raw_customers"
tags: ['important']
3 changes: 3 additions & 0 deletions ci-project/tests/tagged_data_test.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{{ config(tags = ['important']) }}

select * from {{ ref('stg_customers') }}
2 changes: 1 addition & 1 deletion data/catalog.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/manifest.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion data/run_results.json

This file was deleted.

6 changes: 2 additions & 4 deletions src/app/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,8 @@ angular
var packages = _.unique(_.pluck(_.values(project.nodes), 'package_name'))
var all_tags = [null];
_.each(project.nodes, function(node) {
if (node.resource_type != 'test') {
var tags = node.tags;
all_tags = _.union(all_tags, tags);
};
var tags = node.tags;
all_tags = _.union(all_tags, tags);
});

selectorService.init({packages: packages, tags: all_tags})
Expand Down
1 change: 0 additions & 1 deletion src/app/services/project_service.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ angular
var promises = [
loadFile('manifest', TARGET_PATH + "manifest.json" + cache_bust),
loadFile('catalog', TARGET_PATH + "catalog.json" + cache_bust),
loadFile('run_results', TARGET_PATH + "run_results.json" + cache_bust),
]

$q.all(promises).then(function(files) {
Expand Down

0 comments on commit d97c473

Please sign in to comment.