upd: move cancel and finish button and add confirm question

[motion.git] / sql / schema.sql

diff --git a/sql/schema.sql b/sql/schema.sql
index be4b3d2a0ac4cb94c2ea272dcbbeb130e0225ac0..56055bc15bb434a91f88f21886b30c2918911765 100644 (file)
--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -1,5 +1,8 @@
 DROP TABLE IF EXISTS voter;
-CREATE TABLE voter (id serial NOT NULL, email VARCHAR(255) NOT NULL, PRIMARY KEY(id));
+CREATE TABLE voter (id serial NOT NULL,
+                   email VARCHAR(255) NOT NULL,
+                   host VARCHAR(500) NOT NULL,
+                   PRIMARY KEY(id));
 
 
 DROP TABLE IF EXISTS motion;
@@ -19,12 +22,14 @@ CREATE TABLE motion (id serial NOT NULL,
 CREATE UNIQUE INDEX motion_ident ON motion (identifier);
 
 DROP TABLE IF EXISTS vote;
+DROP TABLE IF EXISTS voteresult;
 DROP TYPE IF EXISTS "vote_type";
 CREATE TYPE "vote_type" AS ENUM ('yes', 'no', 'abstain');
 CREATE TABLE vote (motion_id INTEGER NOT NULL,
                  voter_id INTEGER NOT NULL,
                  result vote_type NOT NULL,
                  entered timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                 proxy_id INTEGER NOT NULL,
                  PRIMARY KEY(motion_id, voter_id));
 
 DROP TABLE IF EXISTS proxy;
@@ -39,6 +44,17 @@ CREATE TABLE proxy (id serial NOT NULL,
 CREATE INDEX proxy_voter ON proxy (voter_id);
 CREATE INDEX proxy_proxy ON proxy (proxy_id);
 
+DROP TABLE IF EXISTS adminlog;
+DROP TYPE IF EXISTS "admin_log";
+CREATE TYPE "admin_log" AS ENUM ('motionmasking', 'proxygranted', 'proxyrevoked', 'proxyrevokedall');
+CREATE TABLE adminlog (id serial NOT NULL,
+                   user_id INTEGER NOT NULL,
+                   action admin_log NOT NULL,
+                   comment text NULL,
+                   action_user_id INTEGER NOT NULL,
+                   actiontime timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                   PRIMARY KEY(id));
+
 DROP TABLE IF EXISTS schema_version;
 CREATE TABLE schema_version (version INTEGER NOT NULL);
-INSERT INTO schema_version(version) VALUES(4);
+INSERT INTO schema_version(version) VALUES(7);