X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=sql%2Fpr0n.sql;h=10cca1c49b9ef0a9a92200d62200dde93f2044e2;hp=5f89f6c91e03c8bf62e76684a3718612d8c53218;hb=9a8d0492f4b5a4722470bbf1ce9e9ead695f5f7e;hpb=3bde4ccddbb9473fff56752d7100332d48affa1a

diff --git a/sql/pr0n.sql b/sql/pr0n.sql
index 5f89f6c..10cca1c 100644
--- a/sql/pr0n.sql
+++ b/sql/pr0n.sql
@@ -18,8 +18,10 @@ CREATE TABLE last_picture_cache (
    FOREIGN KEY (vhost,event) REFERENCES events(vhost,event)
 );
 
+CREATE SEQUENCE imageid_seq;
+
 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,
@@ -71,8 +73,8 @@ CREATE TABLE shadow_files (
 
 CREATE TABLE users (
     username character varying NOT NULL,
-    sha1password character(28) NOT NULL,
-    vhost character varying NOT NULL
+    vhost character varying NOT NULL,
+    cryptpassword character varying NOT NULL
 );
 
 -- Mainly used for manual queries -- usually too slow to be very useful
@@ -88,21 +90,12 @@ CREATE TABLE exif_info (
 CREATE INDEX exif_info_key ON exif_info ( key );
 CLUSTER exif_info_key ON exif_info;
 
-CREATE TABLE tags (
-    image integer NOT NULL REFERENCES images (id) ON DELETE CASCADE,
-    tag varchar NOT NULL,
-
-    PRIMARY KEY ( image, tag )
-);
-CREATE INDEX tags_tag ON tags ( tag );
-
 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 images_id_seq 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 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;