Merge branch 'main' into main

dbt-labs · Apr 12, 2024 · 439cf1b · 439cf1b
2 parents 547bc7f + 790023d
commit 439cf1b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -36,6 +36,7 @@ jobs:
         export DBT_PROFILES_DIR=.
         dbt deps --target ${{ matrix.data-platform }}
         dbt seed --full-refresh --target ${{ matrix.data-platform }}
+        dbt run --target ${{ matrix.data-platform }}
         dbt run-operation prep_external --target ${{ matrix.data-platform }}
         dbt run-operation dbt_external_tables.stage_external_sources --vars 'ext_full_refresh: true' --target ${{ matrix.data-platform }}
         dbt run-operation dbt_external_tables.stage_external_sources --target ${{ matrix.data-platform }}

diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -24,6 +24,12 @@ dispatch:
 seeds:
   +quote_columns: false
 
+models:
+  dbt_external_tables_integration_tests:
+    plugins:
+      snowflake:
+        +enabled: "{{ target.type == 'snowflake' }}"
+
 sources:
   dbt_external_tables_integration_tests:
     plugins:

diff --git a/integration_tests/models/plugins/snowflake/people_alias.sql b/integration_tests/models/plugins/snowflake/people_alias.sql
@@ -0,0 +1,4 @@
+SELECT
+ {{ dbt_utils.star(from=ref('people'), except=['email']) }},
+  email as email_alias
+FROM {{ ref('people') }}
diff --git a/integration_tests/models/plugins/snowflake/snowflake_external.yml b/integration_tests/models/plugins/snowflake/snowflake_external.yml
@@ -25,18 +25,13 @@ sources:
             quote: true
             identifier: email
             expression: split_part(value:email::VARCHAR, '@', 2)
-          - name: email
-            alias: email_alias
-            data_type: varchar(64)          
-        tests: &equal-to-the-people
           - dbt_utils.equality:
               compare_model: ref('people')
               compare_columns:
                 - id
                 - first_name
                 - last_name
                 - email
-                - email_alias
 
       - name: people_csv_partitioned
         external:
@@ -160,4 +155,26 @@ sources:
         tests: *equal-to-the-people
         columns:
           - name: id
-            description: "the unique ID for people"
+            description: "the unique ID for people"
+
+        # test for column aliasing
+      - name: people_csv_aliased
+        external: *csv-people
+        columns:
+          - name: id
+            data_type: int
+          - name: first_name
+            data_type: varchar(64)
+          - name: last_name
+            data_type: varchar(64)
+          - name: email
+            alias: email_alias
+            data_type: varchar(64)
+        tests:
+          - dbt_utils.equality:
+              compare_model: ref('people_alias')
+              compare_columns:
+                - id
+                - first_name
+                - last_name
+                - email_alias