# HG changeset patch
# User jbe
# Date 1283199045 -7200
# Node ID 5745db0b1a34d52ee903f6841768cf99471ad155
# Parent  c65002c1a509a4c4dcf5cf5915a898cb690643a3
Removed subqueries which are unneccessary since last bugfix; Update script

diff -r c65002c1a509 -r 5745db0b1a34 core.sql
--- a/core.sql	Mon Aug 30 22:01:08 2010 +0200
+++ b/core.sql	Mon Aug 30 22:10:45 2010 +0200
@@ -1256,61 +1256,55 @@
 ------------------------------------------
 
 
+CREATE VIEW "active_delegation" AS
+  SELECT "delegation".* FROM "delegation"
+  JOIN "member" ON "delegation"."truster_id" = "member"."id"
+  WHERE "member"."active" = TRUE;
+
+COMMENT ON VIEW "active_delegation" IS 'Delegations where the truster_id refers to an active member';
+
+
 CREATE VIEW "global_delegation" AS
-  SELECT
-    "delegation"."id",
-    "delegation"."truster_id",
-    "delegation"."trustee_id"
-  FROM "delegation" JOIN "member"
-  ON "delegation"."truster_id" = "member"."id"
-  WHERE "delegation"."scope" = 'global' AND "member"."active";
+  SELECT * FROM "active_delegation" WHERE "scope" = 'global';
 
 COMMENT ON VIEW "global_delegation" IS 'Global delegations from active members';
 
 
 CREATE VIEW "area_delegation" AS
-  SELECT "subquery".* FROM (
-    SELECT DISTINCT ON ("area"."id", "delegation"."truster_id")
-      "area"."id" AS "area_id",
-      "delegation"."id",
-      "delegation"."truster_id",
-      "delegation"."trustee_id",
-      "delegation"."scope"
-    FROM "area" JOIN "delegation"
-    ON "delegation"."scope" = 'global'
-    OR "delegation"."area_id" = "area"."id"
-    ORDER BY
-      "area"."id",
-      "delegation"."truster_id",
-      "delegation"."scope" DESC
-  ) AS "subquery"
-  JOIN "member" ON "subquery"."truster_id" = "member"."id"
-  WHERE "member"."active";
-
-COMMENT ON VIEW "area_delegation" IS 'Active delegations for areas';
+  SELECT DISTINCT ON ("area"."id", "delegation"."truster_id")
+    "area"."id" AS "area_id",
+    "delegation"."id",
+    "delegation"."truster_id",
+    "delegation"."trustee_id",
+    "delegation"."scope"
+  FROM "area" JOIN "active_delegation" AS "delegation"
+  ON "delegation"."scope" = 'global'
+  OR "delegation"."area_id" = "area"."id"
+  ORDER BY
+    "area"."id",
+    "delegation"."truster_id",
+    "delegation"."scope" DESC;
+
+COMMENT ON VIEW "area_delegation" IS 'Resulting area delegations from active members';
 
 
 CREATE VIEW "issue_delegation" AS
-  SELECT "subquery".* FROM (
-    SELECT DISTINCT ON ("issue"."id", "delegation"."truster_id")
-      "issue"."id"  AS "issue_id",
-      "delegation"."id",
-      "delegation"."truster_id",
-      "delegation"."trustee_id",
-      "delegation"."scope"
-    FROM "issue" JOIN "delegation"
-    ON "delegation"."scope" = 'global'
-    OR "delegation"."area_id" = "issue"."area_id"
-    OR "delegation"."issue_id" = "issue"."id"
-    ORDER BY
-      "issue"."id",
-      "delegation"."truster_id",
-      "delegation"."scope" DESC
-  ) AS "subquery"
-  JOIN "member" ON "subquery"."truster_id" = "member"."id"
-  WHERE "member"."active";
-
-COMMENT ON VIEW "issue_delegation" IS 'Active delegations for issues';
+  SELECT DISTINCT ON ("issue"."id", "delegation"."truster_id")
+    "issue"."id" AS "issue_id",
+    "delegation"."id",
+    "delegation"."truster_id",
+    "delegation"."trustee_id",
+    "delegation"."scope"
+  FROM "issue" JOIN "active_delegation" AS "delegation"
+  ON "delegation"."scope" = 'global'
+  OR "delegation"."area_id" = "issue"."area_id"
+  OR "delegation"."issue_id" = "issue"."id"
+  ORDER BY
+    "issue"."id",
+    "delegation"."truster_id",
+    "delegation"."scope" DESC;
+
+COMMENT ON VIEW "issue_delegation" IS 'Resulting issue delegations from active members';
 
 
 CREATE FUNCTION "membership_weight_with_skipping"
diff -r c65002c1a509 -r 5745db0b1a34 update/core-update.v1.2.5-v1.2.6.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/update/core-update.v1.2.5-v1.2.6.sql	Mon Aug 30 22:10:45 2010 +0200
@@ -0,0 +1,55 @@
+BEGIN;
+ 
+CREATE OR REPLACE VIEW "liquid_feedback_version" AS
+  SELECT * FROM (VALUES ('1.2.6', 1, 2, 6))
+  AS "subquery"("string", "major", "minor", "revision");
+
+CREATE VIEW "active_delegation" AS
+  SELECT "delegation".* FROM "delegation"
+  JOIN "member" ON "delegation"."truster_id" = "member"."id"
+  WHERE "member"."active" = TRUE;
+
+COMMENT ON VIEW "active_delegation" IS 'Delegations where the truster_id refers to an active member';
+
+CREATE OR REPLACE VIEW "global_delegation" AS
+  SELECT * FROM "active_delegation"
+  WHERE "scope" = 'global';
+
+COMMENT ON VIEW "global_delegation" IS 'Global delegations from active members';
+
+CREATE OR REPLACE VIEW "area_delegation" AS
+  SELECT DISTINCT ON ("area"."id", "delegation"."truster_id")
+    "area"."id" AS "area_id",
+    "delegation"."id",
+    "delegation"."truster_id",
+    "delegation"."trustee_id",
+    "delegation"."scope"
+  FROM "area" JOIN "active_delegation" AS "delegation"
+  ON "delegation"."scope" = 'global'
+  OR "delegation"."area_id" = "area"."id"
+  ORDER BY
+    "area"."id",
+    "delegation"."truster_id",
+    "delegation"."scope" DESC;
+
+COMMENT ON VIEW "area_delegation" IS 'Resulting area delegations from active members';
+
+CREATE OR REPLACE VIEW "issue_delegation" AS
+  SELECT DISTINCT ON ("issue"."id", "delegation"."truster_id")
+    "issue"."id" AS "issue_id",
+    "delegation"."id",
+    "delegation"."truster_id",
+    "delegation"."trustee_id",
+    "delegation"."scope"
+  FROM "issue" JOIN "active_delegation" AS "delegation"
+  ON "delegation"."scope" = 'global'
+  OR "delegation"."area_id" = "issue"."area_id"
+  OR "delegation"."issue_id" = "issue"."id"
+  ORDER BY
+    "issue"."id",
+    "delegation"."truster_id",
+    "delegation"."scope" DESC;
+
+COMMENT ON VIEW "issue_delegation" IS 'Resulting issue delegations from active members';
+
+COMMIT;