# HG changeset patch # User jbe # Date 1459788673 -7200 # Node ID 4a8d9f00867bab88e9084acde108ee771f3d1fc0 # Parent c1a2954078d711a1af5e7502fbb380fd6d79a18f Use "recipient_id" instead of "member_id" in function "get_initiatives_for_notification" diff -r c1a2954078d7 -r 4a8d9f00867b core.sql --- a/core.sql Mon Apr 04 18:46:44 2016 +0200 +++ b/core.sql Mon Apr 04 18:51:13 2016 +0200 @@ -3120,7 +3120,7 @@ ------------------------- CREATE FUNCTION "get_initiatives_for_notification" - ( "member_id_p" "member"."id"%TYPE ) + ( "recipient_id_p" "member"."id"%TYPE ) RETURNS SETOF "initiative_for_notification" LANGUAGE 'plpgsql' VOLATILE AS $$ DECLARE @@ -3129,10 +3129,10 @@ "last_suggestion_id_v" "suggestion"."id"%TYPE; BEGIN PERFORM "require_transaction_isolation"(); - PERFORM NULL FROM "member" WHERE "id" = "member_id_p" FOR UPDATE; + PERFORM NULL FROM "member" WHERE "id" = "recipient_id_p" FOR UPDATE; FOR "result_row" IN SELECT * FROM "initiative_for_notification" - WHERE "member_id" = "member_id_p" + WHERE "recipient_id" = "recipient_id_p" LOOP SELECT "id" INTO "last_draft_id_v" FROM "draft" WHERE "draft"."initiative_id" = "result_row"."initiative_id" @@ -3143,7 +3143,7 @@ INSERT INTO "initiative_notification_sent" ("member_id", "initiative_id", "last_draft_id", "last_suggestion_id") VALUES ( - "member_id_p", + "recipient_id_p", "result_row"."initiative_id", "last_draft_id_v", "last_suggestion_id_v" ) @@ -3162,12 +3162,12 @@ END LOOP; DELETE FROM "initiative_notification_sent" USING "initiative", "issue" - WHERE "initiative_notification_sent"."member_id" = "member_id_p" + WHERE "initiative_notification_sent"."member_id" = "recipient_id_p" AND "initiative"."id" = "initiative_notification_sent"."initiative_id" AND "issue"."id" = "initiative"."issue_id" AND ( "issue"."closed" NOTNULL OR "issue"."fully_frozen" NOTNULL ); UPDATE "member" SET "notification_counter" = "notification_counter" + 1 - WHERE "id" = "member_id_p"; + WHERE "id" = "recipient_id_p"; RETURN; END; $$; diff -r c1a2954078d7 -r 4a8d9f00867b update/core-update.v3.1.0-v3.2.0.sql --- a/update/core-update.v3.1.0-v3.2.0.sql Mon Apr 04 18:46:44 2016 +0200 +++ b/update/core-update.v3.1.0-v3.2.0.sql Mon Apr 04 18:51:13 2016 +0200 @@ -350,7 +350,7 @@ "subscription"."member_id" NOTNULL ); CREATE FUNCTION "get_initiatives_for_notification" - ( "member_id_p" "member"."id"%TYPE ) + ( "recipient_id_p" "member"."id"%TYPE ) RETURNS SETOF "initiative_for_notification" LANGUAGE 'plpgsql' VOLATILE AS $$ DECLARE @@ -359,10 +359,10 @@ "last_suggestion_id_v" "suggestion"."id"%TYPE; BEGIN PERFORM "require_transaction_isolation"(); - PERFORM NULL FROM "member" WHERE "id" = "member_id_p" FOR UPDATE; + PERFORM NULL FROM "member" WHERE "id" = "recipient_id_p" FOR UPDATE; FOR "result_row" IN SELECT * FROM "initiative_for_notification" - WHERE "member_id" = "member_id_p" + WHERE "recipient_id" = "recipient_id_p" LOOP SELECT "id" INTO "last_draft_id_v" FROM "draft" WHERE "draft"."initiative_id" = "result_row"."initiative_id" @@ -373,7 +373,7 @@ INSERT INTO "initiative_notification_sent" ("member_id", "initiative_id", "last_draft_id", "last_suggestion_id") VALUES ( - "member_id_p", + "recipient_id_p", "result_row"."initiative_id", "last_draft_id_v", "last_suggestion_id_v" ) @@ -392,12 +392,12 @@ END LOOP; DELETE FROM "initiative_notification_sent" USING "initiative", "issue" - WHERE "initiative_notification_sent"."member_id" = "member_id_p" + WHERE "initiative_notification_sent"."member_id" = "recipient_id_p" AND "initiative"."id" = "initiative_notification_sent"."initiative_id" AND "issue"."id" = "initiative"."issue_id" AND ( "issue"."closed" NOTNULL OR "issue"."fully_frozen" NOTNULL ); UPDATE "member" SET "notification_counter" = "notification_counter" + 1 - WHERE "id" = "member_id_p"; + WHERE "id" = "recipient_id_p"; RETURN; END; $$;