Fixed old migration with broken devise helpers

keithpitt · Jan 15, 2013 · d45cd02 · d45cd02
1 parent e1fd9f6
commit d45cd02
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 21 deletions.
diff --git a/db/migrate/20110907054629_devise_create_users.rb b/db/migrate/20110907054629_devise_create_users.rb
@@ -1,16 +1,26 @@
 class DeviseCreateUsers < ActiveRecord::Migration
   def self.up
     create_table(:users) do |t|
-      t.database_authenticatable :null => false
-      t.recoverable
-      t.rememberable
-      t.trackable
+      ## Database authenticatable
+      t.string :email,              :null => false, :default => ""
+      t.string :encrypted_password, :null => false, :default => ""
 
-      # t.encryptable
-      # t.confirmable
-      # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
-      t.token_authenticatable
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
 
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, :default => 0
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      # Token authenticatable
+      t.string :authentication_token
 
       t.timestamps
     end

diff --git a/db/schema.rb b/db/schema.rb
@@ -17,34 +17,34 @@
     t.integer  "version_id"
     t.string   "name"
     t.string   "number"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "dependencies", ["version_id"], :name => "index_dependencies_on_version_id"
 
   create_table "downloads", :force => true do |t|
     t.integer  "version_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "downloads", ["version_id"], :name => "index_downloads_on_version_id"
 
   create_table "users", :force => true do |t|
-    t.string   "email",                                 :default => "", :null => false
-    t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
+    t.string   "email",                  :default => "", :null => false
+    t.string   "encrypted_password",     :default => "", :null => false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                         :default => 0
+    t.integer  "sign_in_count",          :default => 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
     t.string   "authentication_token"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
     t.string   "username"
     t.boolean  "admin"
   end
@@ -59,8 +59,8 @@
     t.string   "name"
     t.string   "homepage"
     t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
     t.string   "authors"
     t.string   "email"
     t.string   "slug"
@@ -76,8 +76,8 @@
     t.integer  "vendor_id"
     t.integer  "user_id"
     t.string   "number"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
     t.string   "package"
     t.text     "vendor_spec"
     t.integer  "downloads_count", :default => 0