Fix inline comments (--) on the last line of an incremental model (partition replacement) (#991)

tnk-ysk · mikealfare · web-flow · commit bf30b66bab0e · 2023-11-08T11:26:14.000-05:00
* Fix inline comments on the last line
* Add changes
* Add test for comment

---------

Co-authored-by: Mike Alfare &lt;13974384+mikealfare@users.noreply.github.com&gt;
diff --git a/.changes/unreleased/Fixes-20231105-125740.yaml b/.changes/unreleased/Fixes-20231105-125740.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix inline comments (--) on the last line of an incremental model
+time: 2023-11-05T12:57:40.289399+09:00
+custom:
+  Author: tnk-ysk
+  Issue: "896"
diff --git a/dbt/include/bigquery/macros/materializations/incremental_strategy/insert_overwrite.sql b/dbt/include/bigquery/macros/materializations/incremental_strategy/insert_overwrite.sql
@@ -70,7 +70,7 @@
             {{ wrap_with_time_ingestion_partitioning_sql(partition_by, sql, True) }}
           {%- else -%}
             {{sql}}
-          {%- endif -%}
+          {%- endif %}
 
         )
       {%- endset -%}
diff --git a/tests/functional/adapter/incremental/incremental_strategy_fixtures.py b/tests/functional/adapter/incremental/incremental_strategy_fixtures.py
@@ -306,6 +306,7 @@
 {% if is_incremental() %}
 where date_day in ({{ config.get("partitions") | join(",") }})
 {% endif %}
+-- Test comment to prevent recurrence of https://github.com/dbt-labs/dbt-bigquery/issues/896
 """.lstrip()
 
 overwrite_range_sql = """

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@`
`70`	`70`	`{{ wrap_with_time_ingestion_partitioning_sql(partition_by, sql, True) }}`
`71`	`71`	`{%- else -%}`
`72`	`72`	`{{sql}}`
`73`		`- {%- endif -%}`
	`73`	`+ {%- endif %}`
`74`	`74`
`75`	`75`	`)`
`76`	`76`	`{%- endset -%}`