obsoleten Trigger auf oe früher löschen

diff --git a/sql/Pg-upgrade2/remove_obsolete_trigger.sql b/sql/Pg-upgrade2/remove_obsolete_trigger.sql
index db802386dca4ac056008d31125d60d38fd3b25a0..796573065d919815098e10ac7c7c1d50f69b2d0a 100644 (file)
--- a/sql/Pg-upgrade2/remove_obsolete_trigger.sql
+++ b/sql/Pg-upgrade2/remove_obsolete_trigger.sql
@@ -1,7 +1,5 @@
 -- @tag: remove_obsolete_trigger
 -- @description: Entfernt veraltete Trigger check_inventory
 -- @tag: remove_obsolete_trigger
 -- @description: Entfernt veraltete Trigger check_inventory

--- @depends: release_3_2_0
--- @encoding: utf-8

 
 -- drop triggers
 DROP TRIGGER IF EXISTS check_inventory           ON oe;
 
 -- drop triggers
 DROP TRIGGER IF EXISTS check_inventory           ON oe;

diff --git a/sql/Pg-upgrade2/taxzone_id_in_oe_delivery_orders.sql b/sql/Pg-upgrade2/taxzone_id_in_oe_delivery_orders.sql
index 00a654e5ab3404c427392f8fc323c923169042ab..5c22135becf8663715f76fc76efcdfe9b97931f1 100644 (file)
--- a/sql/Pg-upgrade2/taxzone_id_in_oe_delivery_orders.sql
+++ b/sql/Pg-upgrade2/taxzone_id_in_oe_delivery_orders.sql
@@ -1,6 +1,6 @@
 -- @tag: taxzone_id_in_oe_delivery_orders
 -- @description: Werte für Inland in Spalte taxzone_id in Tabellen oe und delivery_orders in Foreign Key zu tax_zones konvertieren; NULL-Werte in ap/ar verhindern; Spalten NOT NULL setzen
 -- @tag: taxzone_id_in_oe_delivery_orders
 -- @description: Werte für Inland in Spalte taxzone_id in Tabellen oe und delivery_orders in Foreign Key zu tax_zones konvertieren; NULL-Werte in ap/ar verhindern; Spalten NOT NULL setzen

--- @depends: change_taxzone_id_0
+-- @depends: change_taxzone_id_0 remove_obsolete_trigger

 
 UPDATE oe              SET taxzone_id = (SELECT id FROM tax_zones WHERE description = 'Inland') WHERE (taxzone_id = 0) OR (taxzone_id IS NULL);
 UPDATE delivery_orders SET taxzone_id = (SELECT id FROM tax_zones WHERE description = 'Inland') WHERE (taxzone_id = 0) OR (taxzone_id IS NULL);
 
 UPDATE oe              SET taxzone_id = (SELECT id FROM tax_zones WHERE description = 'Inland') WHERE (taxzone_id = 0) OR (taxzone_id IS NULL);
 UPDATE delivery_orders SET taxzone_id = (SELECT id FROM tax_zones WHERE description = 'Inland') WHERE (taxzone_id = 0) OR (taxzone_id IS NULL);