# HG changeset patch
# User jbe
# Date 1268054634 -3600
# Node ID c78ab22c487037cd5ec8f01c329b655ce650292d
# Parent  28dde4909a35a6dcdf37c26afd094f5f7a4eb83c
Added missing DELETEs in function "delete_private_data"(); Fixed wrong COMMENT statement for table "member_relation_setting"
(includes new file update/core-update.beta23-beta24.sql)

diff -r 28dde4909a35 -r c78ab22c4870 core.sql
--- a/core.sql	Thu Mar 04 00:51:12 2010 +0100
+++ b/core.sql	Mon Mar 08 14:23:54 2010 +0100
@@ -6,7 +6,7 @@
 BEGIN;
 
 CREATE VIEW "liquid_feedback_version" AS
-  SELECT * FROM (VALUES ('beta23', NULL, NULL, NULL))
+  SELECT * FROM (VALUES ('beta24', NULL, NULL, NULL))
   AS "subquery"("string", "major", "minor", "revision");
 
 
@@ -150,7 +150,7 @@
         "value"                 TEXT            NOT NULL );
 CREATE INDEX "setting_key_idx" ON "setting" ("key");
 
-COMMENT ON TABLE "setting" IS 'Place to store a frontend specific settings for members as a string';
+COMMENT ON TABLE "setting" IS 'Place to store a frontend specific setting for members as a string';
 
 COMMENT ON COLUMN "setting"."key" IS 'Name of the setting, preceded by a frontend specific prefix';
 
@@ -177,7 +177,7 @@
         "other_member_id"       INT4            REFERENCES "member" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
         "value"                 TEXT            NOT NULL );
 
-COMMENT ON TABLE "setting" IS 'Place to store a frontend specific settings related to relations between members as a string';
+COMMENT ON TABLE "member_relation_setting" IS 'Place to store a frontend specific setting related to relations between members as a string';
 
 
 CREATE TYPE "member_image_type" AS ENUM ('photo', 'avatar');
@@ -3207,11 +3207,18 @@
         "external_posts"               = NULL,
         "statement"                    = NULL;
       -- "text_search_data" is updated by triggers
-      DELETE FROM "session";
+      UPDATE "member_history" SET "login" = 'login' || "member_id"::text;
       DELETE FROM "invite_code";
+      DELETE FROM "setting";
+      DELETE FROM "setting_map";
+      DELETE FROM "member_relation_setting";
+      DELETE FROM "member_image";
       DELETE FROM "contact";
-      DELETE FROM "setting";
-      DELETE FROM "member_image";
+      DELETE FROM "session";
+      DELETE FROM "area_setting";
+      DELETE FROM "issue_setting";
+      DELETE FROM "initiative_setting";
+      DELETE FROM "suggestion_setting";
       DELETE FROM "direct_voter" USING "issue"
         WHERE "direct_voter"."issue_id" = "issue"."id"
         AND "issue"."closed" ISNULL;
diff -r 28dde4909a35 -r c78ab22c4870 update/core-update.beta23-beta24.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/update/core-update.beta23-beta24.sql	Mon Mar 08 14:23:54 2010 +0100
@@ -0,0 +1,60 @@
+BEGIN;
+
+CREATE OR REPLACE VIEW "liquid_feedback_version" AS
+  SELECT * FROM (VALUES ('beta24', NULL, NULL, NULL))
+  AS "subquery"("string", "major", "minor", "revision");
+
+COMMENT ON TABLE "setting" IS 'Place to store a frontend specific setting for members as a string';
+
+COMMENT ON TABLE "member_relation_setting" IS 'Place to store a frontend specific setting related to relations between members as a string';
+
+CREATE OR REPLACE FUNCTION "delete_private_data"()
+  RETURNS VOID
+  LANGUAGE 'plpgsql' VOLATILE AS $$
+    DECLARE
+      "issue_id_v" "issue"."id"%TYPE;
+    BEGIN
+      UPDATE "member" SET
+        "login"                        = 'login' || "id"::text,
+        "password"                     = NULL,
+        "notify_email"                 = NULL,
+        "notify_email_unconfirmed"     = NULL,
+        "notify_email_secret"          = NULL,
+        "notify_email_secret_expiry"   = NULL,
+        "password_reset_secret"        = NULL,
+        "password_reset_secret_expiry" = NULL,
+        "organizational_unit"          = NULL,
+        "internal_posts"               = NULL,
+        "realname"                     = NULL,
+        "birthday"                     = NULL,
+        "address"                      = NULL,
+        "email"                        = NULL,
+        "xmpp_address"                 = NULL,
+        "website"                      = NULL,
+        "phone"                        = NULL,
+        "mobile_phone"                 = NULL,
+        "profession"                   = NULL,
+        "external_memberships"         = NULL,
+        "external_posts"               = NULL,
+        "statement"                    = NULL;
+      -- "text_search_data" is updated by triggers
+      UPDATE "member_history" SET "login" = 'login' || "member_id"::text;
+      DELETE FROM "invite_code";
+      DELETE FROM "setting";
+      DELETE FROM "setting_map";
+      DELETE FROM "member_relation_setting";
+      DELETE FROM "member_image";
+      DELETE FROM "contact";
+      DELETE FROM "session";
+      DELETE FROM "area_setting";
+      DELETE FROM "issue_setting";
+      DELETE FROM "initiative_setting";
+      DELETE FROM "suggestion_setting";
+      DELETE FROM "direct_voter" USING "issue"
+        WHERE "direct_voter"."issue_id" = "issue"."id"
+        AND "issue"."closed" ISNULL;
+      RETURN;
+    END;
+  $$;
+
+COMMIT;