Merge remote-tracking branch 'origin/event_to_trigger' into logger_with_trigger_rename

sql/insertCiviruleTrigger.sql

 INSERT INTO civirule_trigger (name, label, object_name, op, class_name, created_date, created_user_id)
 VALUES
-  ('new_activity', 'Activity is added', 'Activity', 'create', 'CRM_CivirulesPostEvent_Activity',  CURDATE(), 1),
-  ('changed_activity', 'Activity is changed', 'Activity', 'edit', 'CRM_CivirulesPostEvent_Activity', CURDATE(), 1),
-  ('deleted_activity', 'Activity is deleted', 'Activity', 'delete', 'CRM_CivirulesPostEvent_Activity', CURDATE(), 1),
+  ('new_activity', 'Activity is added', 'Activity', 'create', 'CRM_CivirulesPostTrigger_Activity',  CURDATE(), 1),
+  ('changed_activity', 'Activity is changed', 'Activity', 'edit', 'CRM_CivirulesPostTrigger_Activity', CURDATE(), 1),
+  ('deleted_activity', 'Activity is deleted', 'Activity', 'delete', 'CRM_CivirulesPostTrigger_Activity', CURDATE(), 1),
   ('new_address', 'Address is added', 'Address', 'create', null,  CURDATE(), 1),
   ('changed_address', 'Address is changed', 'Address', 'edit', null, CURDATE(), 1),
   ('deleted_address', 'Address is deleted', 'Address', 'delete', null, CURDATE(), 1),
   ('new_case', 'Case is added', 'Case', 'create', null,  CURDATE(), 1),
   ('changed_case', 'Case is changed', 'Case', 'edit', null, CURDATE(), 1),
   ('deleted_case', 'Case is deleted', 'Case', 'delete', null, CURDATE(), 1),
-  ('new_contact', 'Contact of any type is added', 'Contact', 'create', 'CRM_CivirulesPostEvent_Contact',  CURDATE(), 1),
-  ('changed_contact', 'Contact of any type is changed', 'Contact', 'edit', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('deleted_contact', 'Contact of any type is deleted', 'Contact', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('trashed_contact', 'Contact of any type is trashed', 'Contact', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('restored_contact', 'Contact of any type is restored', 'Contact', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('new_individual', 'Individual is added', 'Individual', 'create', 'CRM_CivirulesPostEvent_Contact',  CURDATE(), 1),
-  ('changed_individual', 'Individual is changed', 'Individual', 'edit', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('deleted_individual', 'Individual is deleted', 'Individual', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('trashed_individual', 'Individual is trashed', 'Individual', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('restored_individual', 'Individual is restored', 'Individual', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('new_household', 'Household is added', 'Household', 'create', 'CRM_CivirulesPostEvent_Contact',  CURDATE(), 1),
-  ('changed_household', 'Household is changed', 'Household', 'edit', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('deleted_household', 'Household is deleted', 'Household', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('trashed_household', 'Household is trashed', 'Household', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('restored_household', 'Household is restored', 'Household', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('new_organization', 'Organization is added', 'Organization', 'create', 'CRM_CivirulesPostEvent_Contact',  CURDATE(), 1),
-  ('changed_organization', 'Organization is changed', 'Organization', 'edit', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('deleted_organization', 'Organization is deleted', 'Organization', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('trashed_organization', 'Organization is trashed', 'Organization', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
-  ('restored_organization', 'Organization is restored', 'Organization', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1);
+  ('new_contact', 'Contact of any type is added', 'Contact', 'create', 'CRM_CivirulesPostTrigger_Contact',  CURDATE(), 1),
+  ('changed_contact', 'Contact of any type is changed', 'Contact', 'edit', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('deleted_contact', 'Contact of any type is deleted', 'Contact', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('trashed_contact', 'Contact of any type is trashed', 'Contact', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('restored_contact', 'Contact of any type is restored', 'Contact', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('new_individual', 'Individual is added', 'Individual', 'create', 'CRM_CivirulesPostTrigger_Contact',  CURDATE(), 1),
+  ('changed_individual', 'Individual is changed', 'Individual', 'edit', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('deleted_individual', 'Individual is deleted', 'Individual', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('trashed_individual', 'Individual is trashed', 'Individual', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('restored_individual', 'Individual is restored', 'Individual', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('new_household', 'Household is added', 'Household', 'create', 'CRM_CivirulesPostTrigger_Contact',  CURDATE(), 1),
+  ('changed_household', 'Household is changed', 'Household', 'edit', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('deleted_household', 'Household is deleted', 'Household', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('trashed_household', 'Household is trashed', 'Household', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('restored_household', 'Household is restored', 'Household', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('new_organization', 'Organization is added', 'Organization', 'create', 'CRM_CivirulesPostTrigger_Contact',  CURDATE(), 1),
+  ('changed_organization', 'Organization is changed', 'Organization', 'edit', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('deleted_organization', 'Organization is deleted', 'Organization', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('trashed_organization', 'Organization is trashed', 'Organization', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1),
+  ('restored_organization', 'Organization is restored', 'Organization', 'delete', 'CRM_CivirulesPostTrigger_Contact', CURDATE(), 1);
 
 INSERT INTO civirule_trigger (name, label, object_name, op, class_name, created_date, created_user_id)
 VALUES
@@ -52,8 +52,8 @@ VALUES
   ('new_group', 'Group is added', 'Group', 'create', null,  CURDATE(), 1),
   ('changed_group', 'Group is changed', 'Group', 'edit', null, CURDATE(), 1),
   ('deleted_group', 'Group is deleted', 'Group', 'delete', null, CURDATE(), 1),
-  ('new_group_contact', 'Contact is added to Group', 'GroupContact', 'create', 'CRM_CivirulesPostEvent_GroupContact',  CURDATE(), 1),
-  ('deleted_group_contact', 'Contact is removed from Group', 'GroupContact', 'delete', 'CRM_CivirulesPostEvent_GroupContact', CURDATE(), 1),
+  ('new_group_contact', 'Contact is added to Group', 'GroupContact', 'create', 'CRM_CivirulesPostTrigger_GroupContact',  CURDATE(), 1),
+  ('deleted_group_contact', 'Contact is removed from Group', 'GroupContact', 'delete', 'CRM_CivirulesPostTrigger_GroupContact', CURDATE(), 1),
   ('new_membership', 'Membership is added', 'Membership', 'create', null,  CURDATE(), 1),
   ('changed_membership', 'Membership is changed', 'Membership', 'edit', null, CURDATE(), 1),
   ('deleted_membership', 'Membership is deleted', 'Membership', 'delete', null, CURDATE(), 1),

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;