Update to my latest code from Dropbox

Author: singingwolfboy

patch.sql

@@ -136,47 +136,3 @@ begin
 end;
 $$ language plpgsql STABLE STRICT;
 
-/*
-create or replace function wiki.get_page_at_revision(page_id int, revision int)
-    returns wiki.page as $$
-#variable_conflict use_variable
-declare
-    latest wiki.page_latest;
-    diff wiki.page_diff;
-    content text;
-    num_lines int;
-    result wiki.page;
-begin
-    IF revision < 1 THEN
-        RAISE 'Revision must be positive (got %)', revision;
-    END IF;
-    SELECT * INTO latest FROM wiki.page_latest WHERE id = page_id;
-    IF NOT FOUND THEN
-        RAISE 'Page % not found', id;
-    END IF;
-    IF revision > latest.revision THEN
-        RAISE 'Revision does not exist (requested %, latest is %)', revision,
-            latest.revision;
-    END IF;
-    IF revision = latest.revision THEN
-        result := latest::wiki.page;
-        RETURN result;
-    END IF;
-    SELECT * INTO diff FROM wiki.page_diff AS pd
-        WHERE pd.page_id = page_id
-        AND pd.revision = revision;
-    IF NOT FOUND THEN
-        RAISE 'Revision % for page % not found', revision, page_id;
-    END IF;
-
-    content := wiki.get_content_at_revision(page_id, revision);
-    num_lines := wiki.get_num_lines_at_revision(page_id, revision);
-    
-    result := (latest.id, latest.title, latest.slug, latest.namespace,
-        content, diff.comment, num_lines, revision, diff.editor, latest.markup,
-        latest.language, diff.created_on);
-    RETURN result;
-end;
-$$ language plpgsql
-STABLE STRICT;
-*/

tables.sql

@@ -24,7 +24,9 @@ CREATE TABLE wiki.page_latest (
     editor_id int REFERENCES wiki.editor(id),
     markup varchar(64) DEFAULT 'plain',
     language varchar(8) NOT NULL,
-    edited_on timestamp DEFAULT now() NOT NULL
+    edited_on timestamp DEFAULT now() NOT NULL,
+    is_locked boolean DEFAULT FALSE NOT NULL,
+    is_deleted boolean DEFAULT FALSE NOT NULL
 );
 
 DROP TABLE IF EXISTS wiki.page_diff CASCADE;
@@ -83,23 +85,3 @@ CREATE OPERATOR && (
     procedure = wiki.hunk_overlap,
     commutator = &&
 );
-
-/*
-DROP TABLE IF EXISTS wiki.page;
-CREATE TABLE wiki.page (LIKE page_latest);
-
-CREATE OR REPLACE FUNCTION wiki.page_latest_to_page(wiki.page_latest)
-    returns wiki.page as $$
-declare
-    result wiki.page;
-begin
-    result := ($1.id, $1.title, $1.slug, $1.namespace, $1.content, $1.comment,
-        $1.num_lines, $1.revision, $1.editor_id, $1.markup, $1.language,
-        $1.edited_on);
-    RETURN result;
-end;
-$$ language plpgsql IMMUTABLE STRICT;
-
-CREATE CAST (wiki.page_latest AS wiki.page)
-    WITH FUNCTION wiki.page_latest_to_page(wiki.page_latest);
-*/

virtual.sql

@@ -12,12 +12,17 @@ CREATE VIEW wiki.page AS
         pd.editor_id,
         pl.markup,
         pl.language,
-        pd.created_on AS edited_on
+        pd.created_on AS edited_on,
+        pl.is_locked
     FROM wiki.page_latest AS pl, wiki.page_diff AS pd
     WHERE pl.id = pd.page_id
+    AND is_deleted = FALSE
   UNION
-    SELECT *
-    FROM wiki.page_latest AS pl;
+    SELECT pl.id, pl.title, pl.slug, pl.namespace, pl.content, pl.comment,
+        pl.num_lines, pl.revision, pl.editor_id, pl.markup, pl.language,
+        pl.edited_on, pl.is_locked
+    FROM wiki.page_latest AS pl
+    WHERE is_deleted = FALSE;
 
 CREATE OR REPLACE FUNCTION wiki.do_update_page_trigger() RETURNS trigger AS $$
 declare
@@ -27,10 +32,14 @@ begin
     IF NOT FOUND THEN
         RAISE 'Page % not found', id;
     END IF;
+    IF latest.is_locked THEN
+        RAISE 'Page % is locked for editing', NEW.id;
+    END IF;
     IF latest.revision = NEW.revision THEN
         PERFORM wiki.update_page(NEW.id, NEW.content, NEW.editor_id, NEW.comment);
     ELSE
-        RAISE notice 'not updating revision % (latest is %)', NEW.revision, latest.revision;
+        RAISE notice 'not updating old revision % of page % (latest revision is %)',
+            NEW.revision, NEW.id, latest.revision;
     END IF;
     RETURN null;
 end;
@@ -40,3 +49,47 @@ CREATE TRIGGER update_page_trigger
     INSTEAD OF UPDATE ON wiki.page 
     FOR EACH ROW
     EXECUTE PROCEDURE wiki.do_update_page_trigger();
+
+CREATE OR REPLACE FUNCTION wiki.do_insert_page_trigger() RETURNS trigger AS $$
+declare
+    num_lines int;
+begin
+    IF NEW.num_lines IS NULL THEN
+        num_lines = array_length(string_to_array(NEW.content, E'\n'), 1);
+    ELSE
+        num_lines = NEW.num_lines;
+    END IF;
+    INSERT INTO wiki.page_latest (id, title, slug, namespace, content, comment,
+        num_lines, editor_id, markup, language) VALUES
+        (NEW.id, NEW.title, NEW.slug, NEW.namespace, NEW.content, NEW.comment,
+        num_lines, NEW.editor_id, NEW.markup, NEW.language);
+    RETURN NEW;
+end;
+$$ language plpgsql;
+
+CREATE TRIGGER insert_page_trigger
+    INSTEAD OF INSERT ON wiki.page
+    FOR EACH ROW
+    EXECUTE PROCEDURE wiki.do_insert_page_trigger();
+
+CREATE OR REPLACE FUNCTION wiki.do_delete_page_trigger() RETURNS trigger AS $$
+declare
+    latest wiki.page_latest;
+begin
+    SELECT * INTO latest FROM wiki.page_latest WHERE id = NEW.id;
+    IF NOT FOUND THEN
+        RAISE 'Page % not found', id;
+    END IF;
+    IF latest.is_deleted THEN
+        RETURN null;
+    ELSE
+        UPDATE wiki.page_latest SET is_deleted = TRUE WHERE id = OLD.id;
+        RETURN OLD;
+    END IF;
+end;
+$$ language plpgsql;
+
+CREATE TRIGGER delete_page_trigger
+    INSTEAD OF DELETE ON wiki.page
+    FOR EACH ROW
+    EXECUTE PROCEDURE wiki.do_delete_page_trigger();