Save xlsx files beside sql files

godatadriven · May 2, 2023 · 01cb727 · 01cb727
1 parent 61747df
commit 01cb727
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/dbt/adapters/excel/impl.py b/dbt/adapters/excel/impl.py
@@ -12,4 +12,4 @@ class ExcelAdapter(DuckDBAdapter):
     def output_excel(self, location):
         import pandas as pd
 
-        pd.read_parquet(location + ".parquet").to_excel(location)
+        pd.read_parquet(location.replace(".xlsx", ".parquet")).to_excel(location)
diff --git a/dbt/include/excel/macros/adapters.sql b/dbt/include/excel/macros/adapters.sql
@@ -11,7 +11,7 @@
 
   {% elif format == 'xlsx' %}
     {% set copy_to %}
-      copy {{ relation }} to '{{ location }}.parquet' (FORMAT 'parquet');
+      copy {{ relation }} to '{{ location.replace(".xlsx", ".parquet") }}' (FORMAT 'parquet');
     {% endset %}
 
   {% else %}

diff --git a/dbt/include/excel/macros/materializations/external.sql b/dbt/include/excel/macros/materializations/external.sql
@@ -1,11 +1,21 @@
 {% materialization external, adapter="excel", supported_languages=['sql', 'python'] %}
 
   {%- set format = render(config.get('format', default='parquet')) -%}
-  {%- set location = render(config.get('location', default=external_location(this, format))) -%}
   {%- set delimiter = render(config.get('delimiter', default=',')) -%}
   {%- set glue_register = config.get('glue_register', default=false) -%}
   {%- set glue_database = render(config.get('glue_database', default='default')) -%}
 
+  {#
+    For xlsx formats the default location is the same directory as the .sql file.
+    If a `location` is passed in the config then this takes priority.
+    For all other formats the `location` parameter is prioritised.
+  #}
+  {% if format == 'xlsx' and config.get('location', 'not passed') == 'not passed' %}
+    {%- set location = render(model.original_file_path.split('.')[0] + '.' + format) -%}
+  {% else %}
+    {%- set location = render(config.get('location', default=external_location(this, format))) -%}
+  {% endif %}
+
   -- set language - python or sql
   {%- set language = model['language'] -%}
 
@@ -53,7 +63,7 @@
   {% endif %}
   {% call statement('main', language='sql') -%}
     create or replace view {{ intermediate_relation.include(database=adapter.use_database()) }} as (
-        select * from '{{ location }}'
+        select * from '{{ location.replace(".xlsx", "") }}'
     );
   {%- endcall %}
 

diff --git a/docs/jaffle_shop_with_dbt_excel/models/customers.sql b/docs/jaffle_shop_with_dbt_excel/models/customers.sql
@@ -2,7 +2,6 @@
 
 config(
   materialized='external',
-  location='./customers.xlsx',
   format="xlsx"
 )