X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=sql%2Fpr0n.sql;h=371e05cf4fdfef765c35318276fef867dad6ac57;hp=10cca1c49b9ef0a9a92200d62200dde93f2044e2;hb=400a1bbb95bf6837807e2819825cddd00c219cf1;hpb=9b0484cc963ef4d7056d644b418ba03cce579bca

diff --git a/sql/pr0n.sql b/sql/pr0n.sql
index 10cca1c..371e05c 100644
--- a/sql/pr0n.sql
+++ b/sql/pr0n.sql
@@ -3,6 +3,7 @@ CREATE TABLE events (
     "date" character varying NOT NULL,
     name character varying NOT NULL,
     vhost character varying NOT NULL,
+    hidden boolean NOT NULL DEFAULT false,
 
     PRIMARY KEY (vhost, event)
 );
@@ -33,8 +34,16 @@ CREATE TABLE images (
     selected boolean DEFAULT false,
     model character varying,
     lens character varying,
+    is_render boolean NOT NULL DEFAULT false,  -- Is this a render of another picture? (If so, don't show it separately.)
+    render_id integer,  -- If not NULL, show this picture instead of ourselves for all JPEG-creation purposes.
 
-    FOREIGN KEY (vhost,event) REFERENCES events (vhost,event)
+    FOREIGN KEY (vhost,event) REFERENCES events (vhost,event),
+    FOREIGN KEY (vhost,event,render_id) REFERENCES images (vhost,event,id),
+
+    -- Redundant with the primary key, but the foreign key needs it.
+    UNIQUE (vhost,event,id),
+
+    CHECK (NOT (is_render AND (render_id IS NOT NULL)))
 );
 CREATE UNIQUE INDEX unique_filenames ON images USING btree (vhost, event, filename);
 
@@ -51,24 +60,8 @@ CREATE TABLE deleted_images (
     selected boolean,
     model character varying,
     lens character varying
-);
-
-CREATE TABLE fake_files (
-    vhost character varying NOT NULL,
-    event character varying NOT NULL,
-    filename character varying NOT NULL,
-    expires_at timestamp without time zone NOT NULL,
-
-    PRIMARY KEY ( vhost, event, filename ),
-    FOREIGN KEY (vhost,event) REFERENCES events (vhost,event)
-);
-
-CREATE TABLE shadow_files (
-    vhost character varying NOT NULL,
-    event character varying NOT NULL,
-    filename character varying NOT NULL,
-    id integer NOT NULL,
-    expires_at timestamp without time zone NOT NULL
+    is_render boolean NOT NULL,
+    render_id integer,
 );
 
 CREATE TABLE users (
@@ -87,15 +80,12 @@ CREATE TABLE exif_info (
     PRIMARY KEY ( image, key )
 );
 
-CREATE INDEX exif_info_key ON exif_info ( key );
-CLUSTER exif_info_key ON exif_info;
+CLUSTER exif_info_pkey ON exif_info;
 
 GRANT INSERT ON TABLE deleted_images TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE events TO pr0n;
-GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE fake_files TO pr0n;
 GRANT SELECT,UPDATE ON TABLE imageid_seq TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE images TO pr0n;
-GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE shadow_files TO pr0n;
 GRANT SELECT,UPDATE ON TABLE users TO pr0n;
 GRANT SELECT,INSERT,DELETE ON TABLE exif_info TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE last_picture_cache TO pr0n;