wip

plugins/bigquery/dbt/adapters/bigquery/impl.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from typing import Dict, List, Optional, Any, Set
-from hologram import JsonSchemaMixin
+from hologram import JsonSchemaMixin, ValidationError
 
 import dbt.deprecations
 import dbt.exceptions
@@ -41,9 +41,9 @@
 
 
 @dataclass
-class PartitionConfig(Dict[str, Any], JsonSchemaMixin):
+class PartitionConfig(JsonSchemaMixin):
     field: str
-    data_type: str
+    data_type: str = 'date'
     range: Optional[Dict[str, any]] = None
 
     def render(self, alias: Optional[str] = None):
@@ -59,12 +59,9 @@ def render(self, alias: Optional[str] = None):
     @classmethod
     def _parse(cls, raw_partition_by) -> Optional['PartitionConfig']:
         if isinstance(raw_partition_by, dict):
-            if raw_partition_by.get('field'):
-                if raw_partition_by.get('data_type'):
-                    return cls(**raw_partition_by)
-                else:  # assume date type as default
-                    return cls(**raw_partition_by, data_type='date')
-            else:
+            try:
+                return cls.from_dict(raw_partition_by)
+            except ValidationError:
                 dbt.exceptions.raise_compiler_error(
                     'Config `partition_by` is missing required item `field`'
                 )
@@ -91,18 +88,17 @@ def _parse(cls, raw_partition_by) -> Optional['PartitionConfig']:
                 partition_by = raw_partition_by
                 data_type = 'date'
 
-            inferred_partition_by = {
-                'field': partition_by,
-                'data_type': data_type
-            }
+            inferred_partition_by = cls(
+                field=partition_by,
+                data_type=data_type
+            )
 
             dbt.deprecations.warn(
                 'bq-partition-by-string',
                 raw_partition_by=raw_partition_by,
                 inferred_partition_by=inferred_partition_by
             )
-
-            return cls(**inferred_partition_by)
+            return inferred_partition_by
         else:
             return None
 

plugins/bigquery/dbt/include/bigquery/macros/adapters.sql

@@ -64,12 +64,12 @@
   {%- set raw_labels = config.get('labels', []) -%}
   {%- set sql_header = config.get('sql_header', none) -%}
 
-  {%- set partition_by_dict = adapter.parse_partition_by(raw_partition_by) -%}
+  {%- set partition_config = adapter.parse_partition_by(raw_partition_by) -%}
 
   {{ sql_header if sql_header is not none }}
 
   create or replace table {{ relation }}
-  {{ partition_by(partition_by_dict) }}
+  {{ partition_by(partition_config.to_dict()) }}
   {{ cluster_by(raw_cluster_by) }}
   {{ bigquery_table_options(
       persist_docs=raw_persist_docs,