Skip to content
This repository has been archived by the owner on Dec 15, 2023. It is now read-only.

Updating to match current file path naming schemes. #29

Merged
merged 3 commits into from
Oct 27, 2021
Merged

Updating to match current file path naming schemes. #29

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82f3840
making changes to match dbt-core test -> tests naming scheme and upda…
McKnight-42 Oct 21, 2021
8de789b
changed seed-path back to seeds from data
McKnight-42 Oct 26, 2021
1a3edc5
removing some excess spaces in base.yml
McKnight-42 Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pytest_dbt_adapter/projects/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
name: base
paths:
seeds/base.csv: files.seeds.base
data/base.csv: files.seeds.base
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we go from data to seeds? CC @jtcohen6

Copy link
Contributor

@jtcohen6 jtcohen6 Oct 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We did. I guess this works because Matt's also setting seed-paths: ['data'] below—that is, overriding the default value (seeds/) to keep using the old name (data/) instead. I'm wondering if there's a reason to prefer doing it that way, rather than just using the new default name (seeds/)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can change it back, we tried both, and I think got swapped around which was the newer of the name changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed it back to seeds @jtcohen6 if you could please take a look and see if there are any other changes you think would make sense. please let me know.

models/view_model.sql: files.models.base_view
models/table_model.sql: files.models.base_table
models/swappable.sql: files.models.base_materialized_var
models/schema.yml: files.schemas.base
dbt_project_yml:
models:
dbt_test_project:

seed-paths:
- data
facts:
seed:
length: 1
Expand Down
11 changes: 8 additions & 3 deletions pytest_dbt_adapter/projects/data_test_ephemerals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: data_test_ephemeral_models
paths:
seeds/base.csv: files.seeds.base
data/base.csv: files.seeds.base
models/ephemeral.sql: files.models.ephemeral_with_cte
models/passing_model.sql: files.tests.ephemeral.passing
models/failing_model.sql: files.tests.ephemeral.failing
models/schema.yml: files.schemas.base
test/passing.sql: files.tests.ephemeral.passing
test/failing.sql: files.tests.ephemeral.failing
tests/passing.sql: files.tests.ephemeral.passing
tests/failing.sql: files.tests.ephemeral.failing
dbt_project_yml:
test-paths:
- tests
seed-paths:
- data
facts:
seed:
length: 1
Expand Down
9 changes: 7 additions & 2 deletions pytest_dbt_adapter/projects/data_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
name: data_tests
paths:
test/passing.sql: files.tests.passing
test/failing.sql: files.tests.failing
tests/passing.sql: files.tests.passing
tests/failing.sql: files.tests.failing
dbt_project_yml:
test-paths:
- tests
seed-paths:
- data
facts:
test:
length: 2
Expand Down
5 changes: 4 additions & 1 deletion pytest_dbt_adapter/projects/ephemeral.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
name: ephemeral
paths:
seeds/base.csv: files.seeds.base
data/base.csv: files.seeds.base
models/ephemeral.sql: files.models.ephemeral
models/view_model.sql: files.models.ephemeral_view
models/table_model.sql: files.models.ephemeral_table
models/schema.yml: files.schemas.base
dbt_project_yml:
seed-paths:
- data
facts:
seed:
length: 1
Expand Down
55 changes: 29 additions & 26 deletions pytest_dbt_adapter/projects/incremental.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
name: incremental
paths:
seeds/base.csv: files.seeds.base
seeds/added.csv: files.seeds.added
models/incremental.sql: files.models.incremental
models/schema.yml: files.schemas.base
data/base.csv: files.seeds.base
data/added.csv: files.seeds.added
models/incremental.sql: files.models.incremental
models/schema.yml: files.schemas.base
dbt_project_yml:
seed-paths:
- data
facts:
seed:
length: 2
names:
- base
- added
run:
length: 1
names:
- incremental
catalog:
nodes:
length: 3
sources:
length: 1
persisted_relations:
- base
- added
- incremental
base:
rowcount: 10
added:
rowcount: 20
seed:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you have a spacing issue (tabs/spaces maybe) where it it shows up as something is difference. Let's look at cleaning that up before merging. I can help tomorrow

Copy link
Contributor

@kwigley kwigley Oct 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@leahwicz I think these spacing changes are fine for now. It makes this file consistent with other yaml files 👍 in this directory (other files use 4 space indent). We should probably stick to the default 2 spaces for all yaml files, but prefer consistency for now.

length: 2
names:
- base
- added
run:
length: 1
names:
- incremental
catalog:
nodes:
length: 3
sources:
length: 1
persisted_relations:
- base
- added
- incremental
base:
rowcount: 10
added:
rowcount: 20
7 changes: 5 additions & 2 deletions pytest_dbt_adapter/projects/schema_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
name: schema_tests
paths:
seeds/base.csv: files.seeds.base
seeds/schema.yml: files.schemas.test_seed
data/base.csv: files.seeds.base
data/schema.yml: files.schemas.test_seed
models/view_model.sql: files.models.base_view
models/table_model.sql: files.models.base_table
models/schema.yml: files.schemas.base
models/schema_view.yml: files.schemas.test_view
models/schema_table.yml: files.schemas.test_table
dbt_project_yml:
seed-paths:
- data
facts:
seed:
length: 1
Expand Down
9 changes: 6 additions & 3 deletions pytest_dbt_adapter/projects/snapshot_cc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
name: snapshot_strategy_check_cols
paths:
seeds/base.csv: files.seeds.base
seeds/newcolumns.csv: files.seeds.newcolumns
seeds/added.csv: files.seeds.added
data/base.csv: files.seeds.base
data/newcolumns.csv: files.seeds.newcolumns
data/added.csv: files.seeds.added
snapshots/cc_all_snapshot.sql: files.snapshots.check_cols_all
snapshots/cc_date_snapshot.sql: files.snapshots.check_cols_date
snapshots/cc_name_snapshot.sql: files.snapshots.check_cols_name
dbt_project_yml:
seed-paths:
- data
facts:
seed:
length: 3
Expand Down
9 changes: 6 additions & 3 deletions pytest_dbt_adapter/projects/snapshot_ts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
name: snapshot_strategy_timestamp
paths:
seeds/base.csv: files.seeds.base
seeds/newcolumns.csv: files.seeds.newcolumns
seeds/added.csv: files.seeds.added
data/base.csv: files.seeds.base
data/newcolumns.csv: files.seeds.newcolumns
data/added.csv: files.seeds.added
snapshots/ts_snapshot.sql: files.snapshots.timestamp
dbt_project_yml:
seed-paths:
- data
facts:
seed:
length: 3
Expand Down