removed unnecessary db index (Rich Thorne, doctorzaius)

thoughtbot · Mar 7, 2010 · be6d552 · be6d552
1 parent a598b9b
commit be6d552
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
+0.8.9 (unreleased)
+------------------
+
+* Removed unnecessary db index. (Rich Thorne, doctorzaius)
+
 0.8.8 (02/25/2010)
 ------------------
+
 * Fixed sign_in and sign_out not setting current_user (Joe Ferris)
 
 0.8.7 (02/21/2010)

diff --git a/generators/clearance/templates/migrations/create_users.rb b/generators/clearance/templates/migrations/create_users.rb
@@ -10,7 +10,6 @@ def self.up
       t.timestamps
     end
 
-    add_index :users, [:id, :confirmation_token]
     add_index :users, :email
     add_index :users, :remember_token
   end

diff --git a/generators/clearance/templates/migrations/update_users.rb b/generators/clearance/templates/migrations/update_users.rb
@@ -21,7 +21,6 @@ def self.up
     existing_indexes = ActiveRecord::Base.connection.indexes(:users)
     index_names = existing_indexes.collect { |each| each.name }
     new_indexes = [
-      [:index_users_on_id_and_confirmation_token, 'add_index :users, [:id, :confirmation_token]'],
       [:index_users_on_email,                     'add_index :users, :email'],
       [:index_users_on_remember_token,            'add_index :users, :remember_token']
     ].delete_if { |each| index_names.include?(each.first.to_s) }

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
@@ -2,6 +2,11 @@
 
 class UserTest < ActiveSupport::TestCase
 
+  # db
+
+  should_have_db_index(:email)
+  should_have_db_index(:remember_token)
+
   # signing up
 
   context "When signing up" do

diff --git a/test/rails_root/config/environment.rb b/test/rails_root/config/environment.rb
@@ -1,6 +1,8 @@
 require File.join(File.dirname(__FILE__), 'boot')
 require 'digest/md5'
 
+RAILS_GEM_VERSION = "2.3.5"
+
 Rails::Initializer.run do |config|
   config.load_paths += Dir.glob(File.join(RAILS_ROOT, 'vendor', 'gems', '*', 'lib'))
   config.time_zone = 'Eastern Time (US & Canada)'