Mostly worked on the candidate adding feature to include pictures and

[selectricity-live] / db / create.sql

diff --git a/db/create.sql b/db/create.sql
index 0b9b74e94e926b2b75128d4fa003f131995ad85c..bbc054ae19ac33601dc5ab6709fc0a630a71c71c 100644 (file)
--- a/db/create.sql
+++ b/db/create.sql
@@ -1,18 +1,3 @@
-# CREATE users TABLE
-#####################################
-
-#drop table if exists users;
-#create table users (
-# id int NOT NULL auto_increment,
-# login varchar(80) default NULL,
-# password varchar(40) default NULL,
-# primary key (id)
-#);
-
-## Create a default system user to own stage directions
-## and similar. Users cannot log in.
-#insert into users ( id, login ) values ( 1, "System Defaults" );
-
 # CREATE elections TABLE
 #####################################
 
@@ -21,10 +6,13 @@ create table elections (
  id int NOT NULL auto_increment,
  name varchar(100) NOT NULL, 
  description TEXT NOT NULL, 
- anonymous tinyint NOT NULL DEFAULT 0, 
- startdate datetime NOT NULL, 
- enddate datetime, 
- primary key (id)
+ anonymous tinyint NOT NULL DEFAULT 1, 
+ startdate datetime, 
+ enddate datetime NOT NULL, 
+ active tinyint NOT NULL DEFAULT 0,
+ user_id int NOT NULL,
+ primary key (id),
+ constraint fk_user_election foreign key (user_id) references users(id)
 );
 
 # CREATE candidates TABLE
@@ -35,7 +23,10 @@ create table candidates (
  id int NOT NULL auto_increment,
  election_id int NOT NULL,
  name varchar(100) NOT NULL, 
- picture blob NOT NULL, 
+ description text NULL,
+ picture_filename varchar(200),
+ picture_data blob, 
+ picture_type varchar(100), 
  primary key (id)
 );