diff --git a/CRM/Civirules/Upgrader.php b/CRM/Civirules/Upgrader.php index 7ecd4edb52179b48a9704f31b3fb1cd1be29d7a3..9e41f584bc052b84508abde47934475691839e3a 100755 --- a/CRM/Civirules/Upgrader.php +++ b/CRM/Civirules/Upgrader.php @@ -54,7 +54,12 @@ class CRM_Civirules_Upgrader extends CRM_Civirules_Upgrader_Base { } // rename columns event_id and event_params in civirule_rule if (CRM_Core_DAO::checkTableExists("civirule_rule")) { - $this->executeSqlFile('sql/upgrade1002.sql'); + CRM_Core_DAO::executeQuery("ALTER TABLE civirule_rule DROP FOREIGN KEY fk_rule_event;"); + CRM_Core_DAO::executeQuery("ALTER TABLE civirule_rule DROP INDEX fk_rule_event_idx;"); + CRM_Core_DAO::executeQuery("ALTER TABLE civirule_rule CHANGE event_id trigger_id INT UNSIGNED;"); + CRM_Core_DAO::executeQuery("ALTER TABLE civirule_rule CHANGE event_params trigger_params TEXT;"); + CRM_Core_DAO::executeQuery("ALTER TABLE civirule_rule ADD CONSTRAINT fk_rule_trigger FOREIGN KEY (trigger_id) REFERENCES civirule_trigger(id);"); + CRM_Core_DAO::executeQuery("ALTER TABLE civirule_rule ADD INDEX fk_rule_trigger_idx (trigger_id);"); } return true; } diff --git a/sql/update1002.sql b/sql/update1002.sql deleted file mode 100644 index a23c5a186d8206f8365b5626d3ea26888bafbf13..0000000000000000000000000000000000000000 --- a/sql/update1002.sql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE civirule_rule DROP FOREIGN KEY fk_rule_event; -ALTER TABLE civirule_rule DROP INDEX fk_rule_event_idx; -ALTER TABLE civirule_rule CHANGE event_id trigger_id INT UNSIGNED; -ALTER TABLE civirule_rule CHANGE event_params trigger_params TEXT; -ALTER TABLE civirule_rule ADD CONSTRAINT fk_rule_trigger - FOREIGN KEY (trigger_id) REFERENCES civirule_trigger(id); -ALTER TABLE civirule_rule ADD INDEX fk_rule_trigger_idx (trigger_id);