# HG changeset patch
# User jbe
# Date 1505589638 -7200
# Node ID 3e7ad723340482b53318e1959220d67fa6c3e521
# Parent  85f25c413238c1ea75f8c5993a510b0377eeb483
Renamed events 'member_removed' and 'suggestion_removed' to 'member_deleted' and 'suggestion_deleted'

diff -r 85f25c413238 -r 3e7ad7233404 core.sql
--- a/core.sql	Sat Sep 16 21:16:16 2017 +0200
+++ b/core.sql	Sat Sep 16 21:20:38 2017 +0200
@@ -1331,9 +1331,9 @@
         'initiative_revoked',
         'new_draft_created',
         'suggestion_created',
-        'suggestion_removed',
+        'suggestion_deleted',
         'member_activated',
-        'member_removed',
+        'member_deleted',
         'member_active',
         'member_name_updated',
         'member_profile_updated',
@@ -1439,7 +1439,7 @@
             "text_value"      ISNULL  AND
             "old_text_value"  ISNULL )),
         CONSTRAINT "constr_for_suggestion_removal" CHECK (
-          "event" != 'suggestion_removed' OR (
+          "event" != 'suggestion_deleted' OR (
             "member_id"       ISNULL AND
             "other_member_id" ISNULL  AND
             "scope"           ISNULL  AND
@@ -1458,7 +1458,7 @@
         CONSTRAINT "constr_for_value_less_member_event" CHECK (
           "event" NOT IN (
             'member_activated',
-            'member_removed',
+            'member_deleted',
             'member_profile_updated',
             'member_image_updated'
           ) OR (
@@ -1728,7 +1728,7 @@
         --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN
         --  "event_v" := 'unit_created';
         --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN
-        --  "event_v" := 'unit_removed';
+        --  "event_v" := 'unit_deleted';
         ELSIF OLD != NEW THEN
           "event_v" := 'unit_updated';
         ELSE
@@ -1761,7 +1761,7 @@
         --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN
         --  "event_v" := 'area_created';
         --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN
-        --  "event_v" := 'area_removed';
+        --  "event_v" := 'area_deleted';
         ELSIF OLD != NEW THEN
           "event_v" := 'area_updated';
         ELSE
@@ -1794,7 +1794,7 @@
         --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN
         --  "event_v" := 'policy_created';
         --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN
-        --  "event_v" := 'policy_removed';
+        --  "event_v" := 'policy_deleted';
         ELSIF OLD != NEW THEN
           "event_v" := 'policy_updated';
         ELSE
@@ -1995,7 +1995,7 @@
             "unit_id", "area_id", "policy_id", "issue_id", "state",
             "initiative_id", "suggestion_id"
           ) VALUES (
-            'suggestion_removed',
+            'suggestion_deleted',
             "area_row"."unit_id", "issue_row"."area_id",
             "issue_row"."policy_id",
             "initiative_row"."issue_id", "issue_row"."state",
@@ -2055,7 +2055,7 @@
           (NEW."activated" ISNULL OR NEW."deleted" NOTNULL)
         THEN
           INSERT INTO "event" ("event", "member_id")
-            VALUES ('member_removed', NEW."id");
+            VALUES ('member_deleted', NEW."id");
         END IF;
       END IF;
       RETURN NULL;
diff -r 85f25c413238 -r 3e7ad7233404 update/core-update.v3.2.2-v4.0.0.sql
--- a/update/core-update.v3.2.2-v4.0.0.sql	Sat Sep 16 21:16:16 2017 +0200
+++ b/update/core-update.v3.2.2-v4.0.0.sql	Sat Sep 16 21:20:38 2017 +0200
@@ -4,9 +4,9 @@
 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'area_updated';
 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'policy_created';
 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'policy_updated';
-ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'suggestion_removed';
+ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'suggestion_deleted';
 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_activated';
-ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_removed';
+ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_deleted';
 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_active';
 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_name_updated';
 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_profile_updated';
@@ -784,7 +784,7 @@
             "text_value"      ISNULL  AND
             "old_text_value"  ISNULL ));
 ALTER TABLE "event" ADD CONSTRAINT "constr_for_suggestion_removal" CHECK (
-          "event" != 'suggestion_removed' OR (
+          "event" != 'suggestion_deleted' OR (
             "member_id"       ISNULL AND
             "other_member_id" ISNULL  AND
             "scope"           ISNULL  AND
@@ -803,7 +803,7 @@
 ALTER TABLE "event" ADD CONSTRAINT "constr_for_value_less_member_event" CHECK (
           "event" NOT IN (
             'member_activated',
-            'member_removed',
+            'member_deleted',
             'member_profile_updated',
             'member_image_updated'
           ) OR (
@@ -997,7 +997,7 @@
         --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN
         --  "event_v" := 'unit_created';
         --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN
-        --  "event_v" := 'unit_removed';
+        --  "event_v" := 'unit_deleted';
         ELSIF OLD != NEW THEN
           "event_v" := 'unit_updated';
         ELSE
@@ -1030,7 +1030,7 @@
         --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN
         --  "event_v" := 'area_created';
         --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN
-        --  "event_v" := 'area_removed';
+        --  "event_v" := 'area_deleted';
         ELSIF OLD != NEW THEN
           "event_v" := 'area_updated';
         ELSE
@@ -1063,7 +1063,7 @@
         --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN
         --  "event_v" := 'policy_created';
         --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN
-        --  "event_v" := 'policy_removed';
+        --  "event_v" := 'policy_deleted';
         ELSIF OLD != NEW THEN
           "event_v" := 'policy_updated';
         ELSE
@@ -1236,7 +1236,7 @@
             "unit_id", "area_id", "policy_id", "issue_id", "state",
             "initiative_id", "suggestion_id"
           ) VALUES (
-            'suggestion_removed',
+            'suggestion_deleted',
             "area_row"."unit_id", "issue_row"."area_id",
             "issue_row"."policy_id",
             "initiative_row"."issue_id", "issue_row"."state",
@@ -1296,7 +1296,7 @@
           (NEW."activated" ISNULL OR NEW."deleted" NOTNULL)
         THEN
           INSERT INTO "event" ("event", "member_id")
-            VALUES ('member_removed', NEW."id");
+            VALUES ('member_deleted', NEW."id");
         END IF;
       END IF;
       RETURN NULL;