liquid_feedback_core
changeset 129:07cfc7c1ce3f v1.4.0_rc2
Bugfix in function "close_voting" related to selection of "area_id" and "unit_id"
Includes update script to v1.4.0_rc2
Includes update script to v1.4.0_rc2
author | jbe |
---|---|
date | Tue May 24 23:13:06 2011 +0200 (2011-05-24) |
parents | 96db76cde218 |
children | 952200ce339b 0fa3c4739ca7 |
files | core.sql update/core-update.v1.4.0_rc1-v1.4.0_rc2.sql |
line diff
1.1 --- a/core.sql Sun Mar 13 13:29:33 2011 +0100 1.2 +++ b/core.sql Tue May 24 23:13:06 2011 +0200 1.3 @@ -7,7 +7,7 @@ 1.4 BEGIN; 1.5 1.6 CREATE VIEW "liquid_feedback_version" AS 1.7 - SELECT * FROM (VALUES ('1.4.0_rc1', 1, 4, -1)) 1.8 + SELECT * FROM (VALUES ('1.4.0_rc2', 1, 4, -1)) 1.9 AS "subquery"("string", "major", "minor", "revision"); 1.10 1.11 1.12 @@ -3405,8 +3405,8 @@ 1.13 "member_id_v" "member"."id"%TYPE; 1.14 BEGIN 1.15 PERFORM "lock_issue"("issue_id_p"); 1.16 - SELECT "id" INTO "area_id_v" FROM "issue" WHERE "id" = "issue_id_p"; 1.17 - SELECT "id" INTO "unit_id_v" FROM "area" WHERE "id" = "area_id_v"; 1.18 + SELECT "area_id" INTO "area_id_v" FROM "issue" WHERE "id" = "issue_id_p"; 1.19 + SELECT "unit_id" INTO "unit_id_v" FROM "area" WHERE "id" = "area_id_v"; 1.20 DELETE FROM "delegating_voter" 1.21 WHERE "issue_id" = "issue_id_p"; 1.22 DELETE FROM "direct_voter"
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/update/core-update.v1.4.0_rc1-v1.4.0_rc2.sql Tue May 24 23:13:06 2011 +0200 2.3 @@ -0,0 +1,161 @@ 2.4 +BEGIN; 2.5 + 2.6 +CREATE OR REPLACE VIEW "liquid_feedback_version" AS 2.7 + SELECT * FROM (VALUES ('1.4.0_rc2', 1, 4, -1)) 2.8 + AS "subquery"("string", "major", "minor", "revision"); 2.9 + 2.10 +CREATE OR REPLACE FUNCTION "close_voting"("issue_id_p" "issue"."id"%TYPE) 2.11 + RETURNS VOID 2.12 + LANGUAGE 'plpgsql' VOLATILE AS $$ 2.13 + DECLARE 2.14 + "area_id_v" "area"."id"%TYPE; 2.15 + "unit_id_v" "unit"."id"%TYPE; 2.16 + "member_id_v" "member"."id"%TYPE; 2.17 + BEGIN 2.18 + PERFORM "lock_issue"("issue_id_p"); 2.19 + SELECT "area_id" INTO "area_id_v" FROM "issue" WHERE "id" = "issue_id_p"; 2.20 + SELECT "unit_id" INTO "unit_id_v" FROM "area" WHERE "id" = "area_id_v"; 2.21 + DELETE FROM "delegating_voter" 2.22 + WHERE "issue_id" = "issue_id_p"; 2.23 + DELETE FROM "direct_voter" 2.24 + WHERE "issue_id" = "issue_id_p" 2.25 + AND "autoreject" = TRUE; 2.26 + DELETE FROM "direct_voter" 2.27 + USING ( 2.28 + SELECT 2.29 + "direct_voter"."member_id" 2.30 + FROM "direct_voter" 2.31 + JOIN "member" ON "direct_voter"."member_id" = "member"."id" 2.32 + LEFT JOIN "privilege" 2.33 + ON "privilege"."unit_id" = "unit_id_v" 2.34 + AND "privilege"."member_id" = "direct_voter"."member_id" 2.35 + WHERE "direct_voter"."issue_id" = "issue_id_p" AND ( 2.36 + "member"."active" = FALSE OR 2.37 + "privilege"."voting_right" ISNULL OR 2.38 + "privilege"."voting_right" = FALSE 2.39 + ) 2.40 + ) AS "subquery" 2.41 + WHERE "direct_voter"."issue_id" = "issue_id_p" 2.42 + AND "direct_voter"."member_id" = "subquery"."member_id"; 2.43 + UPDATE "direct_voter" SET "weight" = 1 2.44 + WHERE "issue_id" = "issue_id_p"; 2.45 + PERFORM "add_vote_delegations"("issue_id_p"); 2.46 + FOR "member_id_v" IN 2.47 + SELECT "interest"."member_id" 2.48 + FROM "interest" 2.49 + JOIN "member" 2.50 + ON "interest"."member_id" = "member"."id" 2.51 + LEFT JOIN "direct_voter" 2.52 + ON "interest"."member_id" = "direct_voter"."member_id" 2.53 + AND "interest"."issue_id" = "direct_voter"."issue_id" 2.54 + LEFT JOIN "delegating_voter" 2.55 + ON "interest"."member_id" = "delegating_voter"."member_id" 2.56 + AND "interest"."issue_id" = "delegating_voter"."issue_id" 2.57 + WHERE "interest"."issue_id" = "issue_id_p" 2.58 + AND "interest"."autoreject" = TRUE 2.59 + AND "member"."active" 2.60 + AND "direct_voter"."member_id" ISNULL 2.61 + AND "delegating_voter"."member_id" ISNULL 2.62 + UNION SELECT "membership"."member_id" 2.63 + FROM "membership" 2.64 + JOIN "member" 2.65 + ON "membership"."member_id" = "member"."id" 2.66 + LEFT JOIN "interest" 2.67 + ON "membership"."member_id" = "interest"."member_id" 2.68 + AND "interest"."issue_id" = "issue_id_p" 2.69 + LEFT JOIN "direct_voter" 2.70 + ON "membership"."member_id" = "direct_voter"."member_id" 2.71 + AND "direct_voter"."issue_id" = "issue_id_p" 2.72 + LEFT JOIN "delegating_voter" 2.73 + ON "membership"."member_id" = "delegating_voter"."member_id" 2.74 + AND "delegating_voter"."issue_id" = "issue_id_p" 2.75 + WHERE "membership"."area_id" = "area_id_v" 2.76 + AND "membership"."autoreject" = TRUE 2.77 + AND "member"."active" 2.78 + AND "interest"."autoreject" ISNULL 2.79 + AND "direct_voter"."member_id" ISNULL 2.80 + AND "delegating_voter"."member_id" ISNULL 2.81 + LOOP 2.82 + INSERT INTO "direct_voter" 2.83 + ("member_id", "issue_id", "weight", "autoreject") VALUES 2.84 + ("member_id_v", "issue_id_p", 1, TRUE); 2.85 + INSERT INTO "vote" ( 2.86 + "member_id", 2.87 + "issue_id", 2.88 + "initiative_id", 2.89 + "grade" 2.90 + ) SELECT 2.91 + "member_id_v" AS "member_id", 2.92 + "issue_id_p" AS "issue_id", 2.93 + "id" AS "initiative_id", 2.94 + -1 AS "grade" 2.95 + FROM "initiative" WHERE "issue_id" = "issue_id_p"; 2.96 + END LOOP; 2.97 + PERFORM "add_vote_delegations"("issue_id_p"); 2.98 + UPDATE "issue" SET 2.99 + "state" = 'calculation', 2.100 + "closed" = now(), 2.101 + "voter_count" = ( 2.102 + SELECT coalesce(sum("weight"), 0) 2.103 + FROM "direct_voter" WHERE "issue_id" = "issue_id_p" 2.104 + ) 2.105 + WHERE "id" = "issue_id_p"; 2.106 + UPDATE "initiative" SET 2.107 + "positive_votes" = "vote_counts"."positive_votes", 2.108 + "negative_votes" = "vote_counts"."negative_votes", 2.109 + "agreed" = CASE WHEN "majority_strict" THEN 2.110 + "vote_counts"."positive_votes" * "majority_den" > 2.111 + "majority_num" * 2.112 + ("vote_counts"."positive_votes"+"vote_counts"."negative_votes") 2.113 + ELSE 2.114 + "vote_counts"."positive_votes" * "majority_den" >= 2.115 + "majority_num" * 2.116 + ("vote_counts"."positive_votes"+"vote_counts"."negative_votes") 2.117 + END 2.118 + FROM 2.119 + ( SELECT 2.120 + "initiative"."id" AS "initiative_id", 2.121 + coalesce( 2.122 + sum( 2.123 + CASE WHEN "grade" > 0 THEN "direct_voter"."weight" ELSE 0 END 2.124 + ), 2.125 + 0 2.126 + ) AS "positive_votes", 2.127 + coalesce( 2.128 + sum( 2.129 + CASE WHEN "grade" < 0 THEN "direct_voter"."weight" ELSE 0 END 2.130 + ), 2.131 + 0 2.132 + ) AS "negative_votes" 2.133 + FROM "initiative" 2.134 + JOIN "issue" ON "initiative"."issue_id" = "issue"."id" 2.135 + JOIN "policy" ON "issue"."policy_id" = "policy"."id" 2.136 + LEFT JOIN "direct_voter" 2.137 + ON "direct_voter"."issue_id" = "initiative"."issue_id" 2.138 + LEFT JOIN "vote" 2.139 + ON "vote"."initiative_id" = "initiative"."id" 2.140 + AND "vote"."member_id" = "direct_voter"."member_id" 2.141 + WHERE "initiative"."issue_id" = "issue_id_p" 2.142 + AND "initiative"."admitted" -- NOTE: NULL case is handled too 2.143 + GROUP BY "initiative"."id" 2.144 + ) AS "vote_counts", 2.145 + "issue", 2.146 + "policy" 2.147 + WHERE "vote_counts"."initiative_id" = "initiative"."id" 2.148 + AND "issue"."id" = "initiative"."issue_id" 2.149 + AND "policy"."id" = "issue"."policy_id"; 2.150 + -- NOTE: "closed" column of issue must be set at this point 2.151 + DELETE FROM "battle" WHERE "issue_id" = "issue_id_p"; 2.152 + INSERT INTO "battle" ( 2.153 + "issue_id", 2.154 + "winning_initiative_id", "losing_initiative_id", 2.155 + "count" 2.156 + ) SELECT 2.157 + "issue_id", 2.158 + "winning_initiative_id", "losing_initiative_id", 2.159 + "count" 2.160 + FROM "battle_view" WHERE "issue_id" = "issue_id_p"; 2.161 + END; 2.162 + $$; 2.163 + 2.164 +COMMIT;