Use contract column order in create table (#606)

dbt-labs · Mar 20, 2023 · ea08334 · ea08334
1 parent 1cb3c7c
commit ea08334
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/.changes/unreleased/Features-20230315-120554.yaml b/.changes/unreleased/Features-20230315-120554.yaml
@@ -0,0 +1,6 @@
+kind: Features
+body: Modify create_table_as to use contract column order
+time: 2023-03-15T12:05:54.52431-04:00
+custom:
+  Author: gshank
+  Issue: "579"
diff --git a/dbt/include/bigquery/macros/adapters.sql b/dbt/include/bigquery/macros/adapters.sql
@@ -53,8 +53,9 @@
 
     create or replace table {{ relation }}
       {% if config.get('contract', False) %}
-        {{ get_assert_columns_equivalent(sql) }}
+        {{ get_assert_columns_equivalent(compiled_code) }}
         {{ get_columns_spec_ddl() }}
+        {%- set compiled_code = get_select_subquery(compiled_code) %}
       {% endif %}
     {{ partition_by(partition_config) }}
     {{ cluster_by(raw_cluster_by) }}

diff --git a/tests/functional/adapter/test_constraints.py b/tests/functional/adapter/test_constraints.py
@@ -18,14 +18,18 @@
 create or replace table {0} (
     id integer  not null    ,
     color string  ,
-    date_day date
+    date_day string
 )
 OPTIONS()
 as (
-    select
-        1 as id,
-        'blue' as color,
-        cast('2019-01-01' as date) as date_day
+    select id,
+    color, 
+    date_day from 
+  ( 
+    select 'blue' as color, 
+    1 as id, 
+    '2019-01-01' as date_day
+  ) as model_subq
 );
 """