Fixed macro oracle__alter_relation_add_remove_columns

Author: aosingh

dbt/include/oracle/macros/columns.sql

@@ -22,20 +22,29 @@
   {% if remove_columns is none %}
     {% set remove_columns = [] %}
   {% endif %}
-
-  {% set sql -%}
-
-     alter {{ relation.type }} {{ relation }}
-
-            {% for column in add_columns %}
-               add {{ column.name }} {{ column.data_type }}{{ ',' if not loop.last }}
-            {% endfor %}{{ ',' if add_columns and remove_columns }}
-
-            {% for column in remove_columns %}
-                drop column {{ column.name }}{{ ',' if not loop.last }}
-            {% endfor %}
-
-  {%- endset -%}
-
-  {% do run_query(sql) %}
+{# To avoid ORA-12987: cannot combine drop column with other operations, we execute 2 different SQL for add and drop respectively #}
+
+{% if add_columns|length > 0 %}
+  {% set add_sql %}
+          ALTER {{ relation.type }} {{ relation }}
+              ADD (
+              {% for column in add_columns %}
+                {{ column.name }} {{ column.data_type }}{{ ',' if not loop.last }}
+              {% endfor %}
+              )
+  {% endset %}
+  {% do run_query(add_sql)%}
+{% endif %}
+
+{% if remove_columns|length > 0 %}
+    {% set remove_sql %}
+          ALTER {{ relation.type }} {{ relation }}
+              DROP (
+                {% for column in remove_columns %}
+                  {{ column.name }}{{ ',' if not loop.last }}
+                {% endfor %}
+                ) CASCADE CONSTRAINTS
+   {% endset %}
+   {% do run_query(remove_sql)%}
+{% endif %}
 {% endmacro %}

dbt_adbs_test_project/models/demo/promotion_costs_for_direct_sales_channel_incr_merge_unique_keys.sql

@@ -1,11 +1,12 @@
 {{config(materialized='incremental',
-         on_schema_change='sync_all_columns',
+         on_schema_change='append_new_columns',
          unique_key=['prod_id', 'quantity_sold', 'time_id', 'promo_name'])}}
 WITH direct_sales_promo_cost AS (
     SELECT s.prod_id,
            s.quantity_sold,
            s.amount_sold,
            s.time_id,
+           s.cust_id,
            c.channel_desc,
            p.promo_name,
            p.promo_cost

dbt_adbs_test_project/packages.yml

@@ -1,5 +1,5 @@
 packages:
   - package: dbt-labs/dbt_utils
     version: 0.8.6
-  - git: https://github.com/Snowflake-Labs/dbt_constraints.git
-    revision: dbt-oracle-support
+  - package: Snowflake-Labs/dbt_constraints
+    version: [">=0.4.0", "<0.5.0"]