Skip to content

Use dynamic schema names rather than hardcoded ones #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbeatty10 merged 7 commits into from
Nov 22, 2024
Merged

Use dynamic schema names rather than hardcoded ones #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c0ac2bc
Disable two CI tests
dbeatty10 Nov 22, 2024
14413f1
Use a dynamic schema name based off the target schema rather than a h…
dbeatty10 Nov 22, 2024
ead8c74
Restore one of the CI tests
dbeatty10 Nov 22, 2024
cc475fc
Try updating the expected output
dbeatty10 Nov 22, 2024
15e1b0f
Update expected model given upstream changes
dbeatty10 Nov 22, 2024
32098da
Restore the other CI test
dbeatty10 Nov 22, 2024
23dcd9e
Update expected model given upstream changes
dbeatty10 Nov 22, 2024
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
2 changes: 1 addition & 1 deletion integration_tests/macros/operations/create_source_table.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% set target_schema=api.Relation.create(
database=target.database,
schema="codegen_integration_tests__data_source_schema"
schema=target.schema ~ "__data_source_schema"
) %}


Expand Down
2 changes: 1 addition & 1 deletion integration_tests/models/model_without_import_ctes.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ with my_first_cte as (
my_second_cte as (
select
1 as id
from codegen_integration_tests__data_source_schema.codegen_integration_tests__data_source_table
from {{ target.schema }}__data_source_schema.codegen_integration_tests__data_source_table
union all
select
2 as id
Expand Down
1 change: 1 addition & 0 deletions integration_tests/models/source.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ version: 2

sources:
- name: codegen_integration_tests__data_source_schema
schema: "{{ target.schema ~ '__data_source_schema' }}"
tables:
- name: codegen_integration_tests__data_source_table
columns:
Expand Down
11 changes: 2 additions & 9 deletions integration_tests/tests/test_generate_model_import_ctes.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@
materialized='table',
) }}{% endraw %}

with codegen_integration_tests__data_source_schema_codegen_integration_tests__data_source_table as (

select * from codegen_integration_tests__data_source_schema.codegen_integration_tests__data_source_table
-- CAUTION: It's best practice to use the ref or source function instead of a direct reference

),

data__a_relation as (
with data__a_relation as (

select * from {% raw %}{{ ref('data__a_relation') }}{% endraw %}

Expand Down Expand Up @@ -108,7 +101,7 @@ my_first_cte as (
my_second_cte as (
select
1 as id
from codegen_integration_tests__data_source_schema_codegen_integration_tests__data_source_table
from {% raw %}{{ target.schema }}{% endraw %}__data_source_schema.codegen_integration_tests__data_source_table
union all
select
2 as id
Expand Down
11 changes: 2 additions & 9 deletions integration_tests/tests/test_generate_model_import_ctes_leading.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,7 @@
materialized='table',
) }}{% endraw %}

with codegen_integration_tests__data_source_schema_codegen_integration_tests__data_source_table as (

select * from codegen_integration_tests__data_source_schema.codegen_integration_tests__data_source_table
-- CAUTION: It's best practice to use the ref or source function instead of a direct reference

)

,data__a_relation as (
with data__a_relation as (

select * from {% raw %}{{ ref('data__a_relation') }}{% endraw %}

Expand Down Expand Up @@ -109,7 +102,7 @@ with codegen_integration_tests__data_source_schema_codegen_integration_tests__da
my_second_cte as (
select
1 as id
from codegen_integration_tests__data_source_schema_codegen_integration_tests__data_source_table
from {% raw %}{{ target.schema }}{% endraw %}__data_source_schema.codegen_integration_tests__data_source_table
union all
select
2 as id
Expand Down