liquid_feedback_core
changeset 554:3e7ad7233404
Renamed events 'member_removed' and 'suggestion_removed' to 'member_deleted' and 'suggestion_deleted'
author | jbe |
---|---|
date | Sat Sep 16 21:20:38 2017 +0200 (2017-09-16) |
parents | 85f25c413238 |
children | 5d098bcc631a |
files | core.sql update/core-update.v3.2.2-v4.0.0.sql |
line diff
1.1 --- a/core.sql Sat Sep 16 21:16:16 2017 +0200 1.2 +++ b/core.sql Sat Sep 16 21:20:38 2017 +0200 1.3 @@ -1331,9 +1331,9 @@ 1.4 'initiative_revoked', 1.5 'new_draft_created', 1.6 'suggestion_created', 1.7 - 'suggestion_removed', 1.8 + 'suggestion_deleted', 1.9 'member_activated', 1.10 - 'member_removed', 1.11 + 'member_deleted', 1.12 'member_active', 1.13 'member_name_updated', 1.14 'member_profile_updated', 1.15 @@ -1439,7 +1439,7 @@ 1.16 "text_value" ISNULL AND 1.17 "old_text_value" ISNULL )), 1.18 CONSTRAINT "constr_for_suggestion_removal" CHECK ( 1.19 - "event" != 'suggestion_removed' OR ( 1.20 + "event" != 'suggestion_deleted' OR ( 1.21 "member_id" ISNULL AND 1.22 "other_member_id" ISNULL AND 1.23 "scope" ISNULL AND 1.24 @@ -1458,7 +1458,7 @@ 1.25 CONSTRAINT "constr_for_value_less_member_event" CHECK ( 1.26 "event" NOT IN ( 1.27 'member_activated', 1.28 - 'member_removed', 1.29 + 'member_deleted', 1.30 'member_profile_updated', 1.31 'member_image_updated' 1.32 ) OR ( 1.33 @@ -1728,7 +1728,7 @@ 1.34 --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN 1.35 -- "event_v" := 'unit_created'; 1.36 --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN 1.37 - -- "event_v" := 'unit_removed'; 1.38 + -- "event_v" := 'unit_deleted'; 1.39 ELSIF OLD != NEW THEN 1.40 "event_v" := 'unit_updated'; 1.41 ELSE 1.42 @@ -1761,7 +1761,7 @@ 1.43 --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN 1.44 -- "event_v" := 'area_created'; 1.45 --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN 1.46 - -- "event_v" := 'area_removed'; 1.47 + -- "event_v" := 'area_deleted'; 1.48 ELSIF OLD != NEW THEN 1.49 "event_v" := 'area_updated'; 1.50 ELSE 1.51 @@ -1794,7 +1794,7 @@ 1.52 --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN 1.53 -- "event_v" := 'policy_created'; 1.54 --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN 1.55 - -- "event_v" := 'policy_removed'; 1.56 + -- "event_v" := 'policy_deleted'; 1.57 ELSIF OLD != NEW THEN 1.58 "event_v" := 'policy_updated'; 1.59 ELSE 1.60 @@ -1995,7 +1995,7 @@ 1.61 "unit_id", "area_id", "policy_id", "issue_id", "state", 1.62 "initiative_id", "suggestion_id" 1.63 ) VALUES ( 1.64 - 'suggestion_removed', 1.65 + 'suggestion_deleted', 1.66 "area_row"."unit_id", "issue_row"."area_id", 1.67 "issue_row"."policy_id", 1.68 "initiative_row"."issue_id", "issue_row"."state", 1.69 @@ -2055,7 +2055,7 @@ 1.70 (NEW."activated" ISNULL OR NEW."deleted" NOTNULL) 1.71 THEN 1.72 INSERT INTO "event" ("event", "member_id") 1.73 - VALUES ('member_removed', NEW."id"); 1.74 + VALUES ('member_deleted', NEW."id"); 1.75 END IF; 1.76 END IF; 1.77 RETURN NULL;
2.1 --- a/update/core-update.v3.2.2-v4.0.0.sql Sat Sep 16 21:16:16 2017 +0200 2.2 +++ b/update/core-update.v3.2.2-v4.0.0.sql Sat Sep 16 21:20:38 2017 +0200 2.3 @@ -4,9 +4,9 @@ 2.4 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'area_updated'; 2.5 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'policy_created'; 2.6 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'policy_updated'; 2.7 -ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'suggestion_removed'; 2.8 +ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'suggestion_deleted'; 2.9 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_activated'; 2.10 -ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_removed'; 2.11 +ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_deleted'; 2.12 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_active'; 2.13 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_name_updated'; 2.14 ALTER TYPE "event_type" ADD VALUE IF NOT EXISTS 'member_profile_updated'; 2.15 @@ -784,7 +784,7 @@ 2.16 "text_value" ISNULL AND 2.17 "old_text_value" ISNULL )); 2.18 ALTER TABLE "event" ADD CONSTRAINT "constr_for_suggestion_removal" CHECK ( 2.19 - "event" != 'suggestion_removed' OR ( 2.20 + "event" != 'suggestion_deleted' OR ( 2.21 "member_id" ISNULL AND 2.22 "other_member_id" ISNULL AND 2.23 "scope" ISNULL AND 2.24 @@ -803,7 +803,7 @@ 2.25 ALTER TABLE "event" ADD CONSTRAINT "constr_for_value_less_member_event" CHECK ( 2.26 "event" NOT IN ( 2.27 'member_activated', 2.28 - 'member_removed', 2.29 + 'member_deleted', 2.30 'member_profile_updated', 2.31 'member_image_updated' 2.32 ) OR ( 2.33 @@ -997,7 +997,7 @@ 2.34 --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN 2.35 -- "event_v" := 'unit_created'; 2.36 --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN 2.37 - -- "event_v" := 'unit_removed'; 2.38 + -- "event_v" := 'unit_deleted'; 2.39 ELSIF OLD != NEW THEN 2.40 "event_v" := 'unit_updated'; 2.41 ELSE 2.42 @@ -1030,7 +1030,7 @@ 2.43 --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN 2.44 -- "event_v" := 'area_created'; 2.45 --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN 2.46 - -- "event_v" := 'area_removed'; 2.47 + -- "event_v" := 'area_deleted'; 2.48 ELSIF OLD != NEW THEN 2.49 "event_v" := 'area_updated'; 2.50 ELSE 2.51 @@ -1063,7 +1063,7 @@ 2.52 --ELSIF OLD."active" = FALSE AND NEW."active" = TRUE THEN 2.53 -- "event_v" := 'policy_created'; 2.54 --ELSIF OLD."active" = TRUE AND NEW."active" = FALSE THEN 2.55 - -- "event_v" := 'policy_removed'; 2.56 + -- "event_v" := 'policy_deleted'; 2.57 ELSIF OLD != NEW THEN 2.58 "event_v" := 'policy_updated'; 2.59 ELSE 2.60 @@ -1236,7 +1236,7 @@ 2.61 "unit_id", "area_id", "policy_id", "issue_id", "state", 2.62 "initiative_id", "suggestion_id" 2.63 ) VALUES ( 2.64 - 'suggestion_removed', 2.65 + 'suggestion_deleted', 2.66 "area_row"."unit_id", "issue_row"."area_id", 2.67 "issue_row"."policy_id", 2.68 "initiative_row"."issue_id", "issue_row"."state", 2.69 @@ -1296,7 +1296,7 @@ 2.70 (NEW."activated" ISNULL OR NEW."deleted" NOTNULL) 2.71 THEN 2.72 INSERT INTO "event" ("event", "member_id") 2.73 - VALUES ('member_removed', NEW."id"); 2.74 + VALUES ('member_deleted', NEW."id"); 2.75 END IF; 2.76 END IF; 2.77 RETURN NULL;