Merge from jdong; new webstats

[selectricity] / db / create.sql

diff --git a/db/create.sql b/db/create.sql
index a5a2e0a0fb54b1458ae5e1abb8a8394fb0b454d1..2033ed18c838d6ff1182f07f96e4ce70d2e64153 100644 (file)
--- a/db/create.sql
+++ b/db/create.sql
@@ -10,6 +10,8 @@ create table elections (
  startdate datetime, 
  enddate datetime NOT NULL, 
  active tinyint NOT NULL DEFAULT 0,
  startdate datetime, 
  enddate datetime NOT NULL, 
  active tinyint NOT NULL DEFAULT 0,

+ viewable tinyint NOT NULL DEFAULT 1,
+ notices tinyint NOT NULL DEFAULT 0,

  user_id int NULL,
  quickuser varchar(255) NULL, #stores session_id for quickvote creators
  election_method varchar(100) DEFAULT 'ssd',
  user_id int NULL,
  quickuser varchar(255) NULL, #stores session_id for quickvote creators
  election_method varchar(100) DEFAULT 'ssd',


@@ -27,9 +29,20 @@ create table candidates (
  election_id int NOT NULL,
  name varchar(100) NOT NULL, 
  description text NULL,
  election_id int NOT NULL,
  name varchar(100) NOT NULL, 
  description text NULL,

- picture_filename varchar(200),
- picture_data blob, 
- picture_type varchar(100), 
+ primary key (id)
+);
+
+# CREATE pictures TABLE
+#####################################
+
+drop table if exists pictures;
+create table pictures (
+ id int NOT NULL auto_increment,
+ filename varchar(200),
+ data blob, 
+ filetype varchar(100), 
+ candidate_id int NULL,
+ constraint fk_candidate_picture foreign key (candidate_id) references candidates(id),

  primary key (id)
 );
 
  primary key (id)
 );