Merge from head -- breakage

[selectricity-live] / db / create.sql

diff --git a/db/create.sql b/db/create.sql
old mode 100755 (executable)
new mode 100644 (file)
index e0c264f..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,
  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)
 );
  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,
  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)
 );
  constraint fk_vote_voter foreign key (voter_id) references voters(id),
  primary key (id)
 );


@@ -86,24 +88,41 @@ create table rankings (
 
 # CREATE users TABLE
 #####################################
 
 # CREATE users TABLE
 #####################################

-DROP TABLE IF EXISTS `users`;
-CREATE TABLE `users` (
-  `id` int(11) NOT NULL auto_increment,
-  `login` varchar(80) NOT NULL default '',
-  `salted_password` varchar(40) NOT NULL default '',
-  `email` varchar(60) NOT NULL default '',
-  `firstname` varchar(40) default NULL,
-  `lastname` varchar(40) default NULL,
-  `salt` varchar(40) NOT NULL default '',
-  `verified` int(11) default '0',
-  `role` varchar(40) default NULL,
-  `security_token` varchar(40) default NULL,
-  `token_expiry` datetime default NULL,
-  `created_at` datetime default NULL,
-  `updated_at` datetime default NULL,
-  `logged_in_at` datetime default NULL,
-  `deleted` int(11) default '0',
-  `delete_after` datetime default NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+#DROP TABLE IF EXISTS `users`;
+#CREATE TABLE `users` (
+#  `id` int(11) NOT NULL auto_increment,
+#  `login` varchar(80) NOT NULL default '',
+#  `salted_password` varchar(40) NOT NULL default '',
+#  `email` varchar(60) NOT NULL default '',
+#  `firstname` varchar(40) default NULL,
+#  `lastname` varchar(40) default NULL,
+#  `salt` varchar(40) NOT NULL default '',
+#  `verified` int(11) default '0',
+#  `role` varchar(40) default NULL,
+#  `security_token` varchar(40) default NULL,
+#  `token_expiry` datetime default NULL,
+#  `created_at` datetime default NULL,
+#  `updated_at` datetime default NULL,
+#  `logged_in_at` datetime default NULL,
+#  `deleted` int(11) default '0',
+#  `delete_after` datetime default NULL,
+#  PRIMARY KEY  (`id`)
+#) ENGINE=InnoDB DEFAULT CHARSET=latin1;

 
 

+#Following is the new users table that goes with acts_as_authenticated
+#Is simpler for now, saving the old table while in transition between 
+#the two for ideas on what attributes may be helpful/necessary
+drop table if exists users;
+create table users (
+       id                        int         not null auto_increment,
+       login                     text,
+       ip                        text not null,
+       email                     text,
+       crypted_password          varchar(40),
+       salt                      varchar(40),
+       created_at                datetime,
+       updated_at                datetime,
+       remember_token            text,
+       remember_token_expires_at datetime,
+       primary key(id)
+);