Merge head

[selectricity] / db / create.sql

diff --git a/db/create.sql b/db/create.sql
index 7b3fef5600b061a043c5c3972abe066aa75df79f..c28dd36c48e616c427b1ef8dcc3f8737c11d8288 100644 (file)
--- a/db/create.sql
+++ b/db/create.sql
@@ -3,14 +3,17 @@
 
 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),
  election_method varchar(100) DEFAULT 'ssd',
  `type` varchar(100) NOT NULL,
  primary key (id),


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


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


@@ -86,6 +101,19 @@ create table rankings (
  primary key (id)
 );
 
  primary key (id)
 );
 

+# CREATE sessions TABLE
+######################################
+
+drop table if exists sessions;
+create table sessions (
+ id         int(11)      NOT NULL auto_increment,
+ sessid     varchar(255),
+ data       text,
+ updated_at datetime     DEFAULT  NULL,
+ primary    key (id),
+ index      session_index (sessid)
+);
+

 # CREATE users TABLE
 #####################################
 #DROP TABLE IF EXISTS `users`;
 # CREATE users TABLE
 #####################################
 #DROP TABLE IF EXISTS `users`;