Merge from jdong

[selectricity] / db / create.sql

diff --git a/db/create.sql b/db/create.sql
old mode 100755 (executable)
new mode 100644 (file)
index cee33a3..7b3fef5
--- a/db/create.sql
+++ b/db/create.sql
@@ -11,7 +11,8 @@ create table elections (
  enddate datetime NOT NULL, 
  active tinyint NOT NULL DEFAULT 0,
  user_id int NULL,
- quickvote tinyint NOT NULL DEFAULT 0,
+ 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)
 );
@@ -68,6 +69,7 @@ create table votes (
  id int NOT NULL auto_increment,
  voter_id int DEFAULT NULL,
  confirmed tinyint NOT NULL DEFAULT 0,
+ time      datetime         DEFAULT NULL,
  constraint fk_vote_voter foreign key (voter_id) references voters(id),
  primary key (id)
 );
@@ -123,4 +125,4 @@ create table users (
        remember_token            text,
        remember_token_expires_at datetime,
        primary key(id)
-);
\ No newline at end of file
+);