Created a partial to DRY the aja voting method. Modified the voter class to

[selectricity-live] / db / create.sql

diff --git a/db/create.sql b/db/create.sql
old mode 100755 (executable)
new mode 100644 (file)
index 0a2f4b5..7d5f405
--- a/db/create.sql
+++ b/db/create.sql
@@ -3,14 +3,18 @@
 
 drop table if exists elections;
 create table elections (
 
 drop table if exists elections;
 create table elections (

- id int NOT NULL auto_increment,
+ id   int NOT NULL auto_increment,

  name varchar(100) NOT NULL, 
  description TEXT NOT NULL, 
  anonymous tinyint NOT NULL DEFAULT 1, 
  startdate datetime, 
  enddate datetime NOT NULL, 
  active tinyint NOT NULL DEFAULT 0,
  name varchar(100) NOT NULL, 
  description TEXT NOT NULL, 
  anonymous tinyint NOT NULL DEFAULT 1, 
  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,
  user_id int NULL,

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

  `type` varchar(100) NOT NULL,
  primary key (id),
  constraint fk_user_election foreign key (user_id) references users(id)
  `type` varchar(100) NOT NULL,
  primary key (id),
  constraint fk_user_election foreign key (user_id) references users(id)


@@ -25,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)
 );
 


@@ -43,6 +58,7 @@ create table voters (
  election_id int NOT NULL, 
  session_id varchar(32) DEFAULT NULL,
  ipaddress varchar(32) DEFAULT NULL,
  election_id int NOT NULL, 
  session_id varchar(32) DEFAULT NULL,
  ipaddress varchar(32) DEFAULT NULL,

+ `type` varchar(100) NOT NULL,

  constraint fk_election_voter foreign key (election_id) references election(id),
  primary key (id)
 );
  constraint fk_election_voter foreign key (election_id) references election(id),
  primary key (id)
 );