Merge branch 'event_to_trigger' into logger_with_trigger_rename

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;
   }

sql/update1002.sql

-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);

sql/update_1003.sql

-UPDATE `civirules`.`civirule_trigger` SET `class_name`='CRM_CivirulesPostTrigger_Activity' WHERE `class_name` = 'CRM_CivirulesPostEvent_Activity';
-UPDATE `civirules`.`civirule_trigger` SET `class_name`='CRM_CivirulesPostTrigger_Contact' WHERE `class_name` = 'CRM_CivirulesPostEvent_Contact';
-UPDATE `civirules`.`civirule_trigger` SET `class_name`='CRM_CivirulesPostTrigger_GroupContact' WHERE `class_name` = 'CRM_CivirulesPostEvent_GroupContact';
-UPDATE `civirules`.`civirule_trigger` SET `class_name`='CRM_CivirulesCronTrigger_Birthday' WHERE `class_name` = 'CRM_CivirulesCronEvent_Birthday';
-UPDATE `civirules`.`civirule_trigger` SET `class_name`='CRM_CivirulesCronTrigger_GroupMembership' WHERE `class_name` = 'CRM_CivirulesCronEvent_GroupMembership';
\ No newline at end of file
+UPDATE `civirule_trigger` SET `class_name`='CRM_CivirulesPostTrigger_Activity' WHERE `class_name` = 'CRM_CivirulesPostEvent_Activity';
+UPDATE `civirule_trigger` SET `class_name`='CRM_CivirulesPostTrigger_Contact' WHERE `class_name` = 'CRM_CivirulesPostEvent_Contact';
+UPDATE `civirule_trigger` SET `class_name`='CRM_CivirulesPostTrigger_GroupContact' WHERE `class_name` = 'CRM_CivirulesPostEvent_GroupContact';
+UPDATE `civirule_trigger` SET `class_name`='CRM_CivirulesCronTrigger_Birthday' WHERE `class_name` = 'CRM_CivirulesCronEvent_Birthday';
+UPDATE `civirule_trigger` SET `class_name`='CRM_CivirulesCronTrigger_GroupMembership' WHERE `class_name` = 'CRM_CivirulesCronTrigger_GroupMembership';
\ No newline at end of file