Merge remote branch 'remotes/deployment/master' into live

[selectricity] / db / create.sql

diff --git a/db/create.sql b/db/create.sql
index c28dd36c48e616c427b1ef8dcc3f8737c11d8288..2acf948b6ab57958f97ad5f8e30db30f799e37e5 100644 (file)
--- a/db/create.sql
+++ b/db/create.sql
@@ -114,32 +114,6 @@ create table sessions (
  index      session_index (sessid)
 );
 
-# 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;
-
-#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,