Override id sequence name, since later Postgres versions have changed the naming.

[pr0n] / sql / pr0n.sql

diff --git a/sql/pr0n.sql b/sql/pr0n.sql
index 0bca09ae79eb41c16ad6231f1c2bc06416171962..b8fcf86d0b46e44e0f739557ea45f9d12711a302 100644 (file)
--- a/sql/pr0n.sql
+++ b/sql/pr0n.sql
@@ -3,7 +3,6 @@ CREATE TABLE events (
     "date" character varying NOT NULL,
     name character varying NOT NULL,
     vhost character varying NOT NULL,
     "date" character varying NOT NULL,
     name character varying NOT NULL,
     vhost character varying NOT NULL,

-    last_update timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,

 
     PRIMARY KEY (vhost, event)
 );
 
     PRIMARY KEY (vhost, event)
 );


@@ -13,22 +12,27 @@ CREATE TABLE last_picture_cache (
    vhost varchar NOT NULL,
    event varchar NOT NULL,
    last_picture timestamp without time zone,
    vhost varchar NOT NULL,
    event varchar NOT NULL,
    last_picture timestamp without time zone,

+   last_update timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,

 
    PRIMARY KEY (vhost,event),
 
    PRIMARY KEY (vhost,event),

-   FOREIGN KEY (vhost,event) REFERNECES events(vhost,event)
+   FOREIGN KEY (vhost,event) REFERENCES events(vhost,event)

 );
 
 );
 

+CREATE SEQUENCE imageid_seq;
+

 CREATE TABLE images (
 CREATE TABLE images (

-    id serial NOT NULL PRIMARY KEY,
+    id integer DEFAULT nextval('imageid_seq') NOT NULL PRIMARY KEY,

     vhost character varying NOT NULL,
     event character varying NOT NULL,
     filename character varying NOT NULL,
     vhost character varying NOT NULL,
     event character varying NOT NULL,
     filename character varying NOT NULL,

-    width integer DEFAULT -1 NOT NULL,
-    height integer DEFAULT -1 NOT NULL,
+    width integer,
+    height integer,

     uploadedby character varying NOT NULL,
     "date" timestamp without time zone,
     takenby character varying NOT NULL,
     selected boolean DEFAULT false,
     uploadedby character varying NOT NULL,
     "date" timestamp without time zone,
     takenby character varying NOT NULL,
     selected boolean DEFAULT false,

+    model character varying,
+    lens character varying,

 
     FOREIGN KEY (vhost,event) REFERENCES events (vhost,event)
 );
 
     FOREIGN KEY (vhost,event) REFERENCES events (vhost,event)
 );


@@ -39,12 +43,14 @@ CREATE TABLE deleted_images (
     vhost character varying,
     event character varying NOT NULL,
     filename character varying NOT NULL,
     vhost character varying,
     event character varying NOT NULL,
     filename character varying NOT NULL,

-    width integer DEFAULT -1 NOT NULL,
-    height integer DEFAULT -1 NOT NULL,
+    width integer,
+    height integer,

     uploadedby character varying,
     "date" timestamp without time zone,
     takenby character varying NOT NULL,
     uploadedby character varying,
     "date" timestamp without time zone,
     takenby character varying NOT NULL,

-    selected boolean
+    selected boolean,
+    model character varying,
+    lens character varying

 );
 
 CREATE TABLE fake_files (
 );
 
 CREATE TABLE fake_files (


@@ -67,10 +73,13 @@ CREATE TABLE shadow_files (
 
 CREATE TABLE users (
     username character varying NOT NULL,
 
 CREATE TABLE users (
     username character varying NOT NULL,

-    sha1password character(28) NOT NULL,
-    vhost character varying NOT NULL
+    sha1password character(27) NOT NULL,
+    vhost character varying NOT NULL,
+    digest_ha1_hex character(32)

 );
 
 );
 

+-- Mainly used for manual queries -- usually too slow to be very useful
+-- for web views in the long run.

 CREATE TABLE exif_info (
     image integer NOT NULL REFERENCES images (id) ON DELETE CASCADE,
     key varchar NOT NULL,
 CREATE TABLE exif_info (
     image integer NOT NULL REFERENCES images (id) ON DELETE CASCADE,
     key varchar NOT NULL,


@@ -96,7 +105,7 @@ GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE fake_files TO pr0n;
 GRANT SELECT,UPDATE ON TABLE images_id_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 images_id_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 ON TABLE users TO pr0n;
+GRANT SELECT,UPDATE ON TABLE users TO pr0n;

 GRANT SELECT,INSERT,DELETE ON TABLE exif_info TO pr0n;
 GRANT SELECT,INSERT,DELETE ON TABLE tags TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE last_picture_cache TO pr0n;
 GRANT SELECT,INSERT,DELETE ON TABLE exif_info TO pr0n;
 GRANT SELECT,INSERT,DELETE ON TABLE tags TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE last_picture_cache TO pr0n;