@@ -612,15 +612,20 @@ module Shoulda # :nodoc: # # should_have_indices :email, :name, [:commentable_type, :commentable_id] # should_have_index :age + # should_have_index :ssn, :unique => true # def should_have_indices(*columns) + unique = get_options!(columns, :unique) == true table = model_class.table_name - indices = ::ActiveRecord::Base.connection.indexes(table).map(&:columns) + indices = ::ActiveRecord::Base.connection.indexes(table) columns.each do |column| - should "have index on #{table} for #{column.inspect}" do + expected_uniqueness = unique ? 'unique' : 'non-unique' + should "have #{expected_uniqueness} index on #{table} for #{column.inspect}" do columns = [column].flatten.map(&:to_s) - assert_contains(indices, columns) + index = indices.detect {|ind| ind.columns == columns } + assert index, "#{table} does not have an index for #{column.inspect}" + assert_equal index.unique, unique, "Expected #{expected_uniqueness} index but was #{unique ? 'non-unique' : 'unique'}." end end end lib/shoulda/active_record/macros.rb @@ -9,7 +9,7 @@ class CreateUsers < ActiveRecord::Migration add_index :users, :email add_index :users, :name add_index :users, :age - add_index :users, [:email, :name] + add_index :users, [:email, :name], :unique => true end def self.down test/rails_root/db/migrate/001_create_users.rb @@ -12,7 +12,8 @@ class UserTest < Test::Unit::TestCase should_have_one :address should_have_one :address, :dependent => :destroy - should_have_indices :email, :name, [:email, :name] + should_have_indices :email, :name + should_have_index [:email, :name], :unique => true should_have_index :age should_have_named_scope :old, :conditions => "age > 50" test/unit/user_test.rb 18229ed735ca64e20cf510b2cf23c8d113a36b39 Lawrence Pit lawrencepit lawrence.pit@gmail.com http://github.com/thoughtbot/shoulda/commit/7ba69b344ead4dff1e98c598570a49d2dbc3cf7b 7ba69b344ead4dff1e98c598570a49d2dbc3cf7b 2009-01-09T19:33:46-08:00 2009-01-09T18:13:58-08:00 Added check for uniqueness to should_have_indices [#129] 2e4ef8329f5dded5cfb1eef08be1dcfbb063f106 Ryan McGeary rmm5t ryanongit@mcgeary.org