Merge branch 'master' of git://github.com/rails/rails

25 files changed, 159 insertions, 139 deletions

diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index c59be264a4..9b28766405 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -142,4 +142,25 @@ class AdapterTest < ActiveRecord::TestCase
       end
     end
   end
+
+  def test_add_limit_offset_should_sanitize_sql_injection_for_limit_without_comas
+    sql_inject = "1 select * from schema"
+      assert_equal " LIMIT 1", @connection.add_limit_offset!("", :limit => sql_inject)
+    if current_adapter?(:MysqlAdapter)
+      assert_equal " LIMIT 7, 1", @connection.add_limit_offset!("", :limit => sql_inject, :offset => 7)
+    else
+      assert_equal " LIMIT 1 OFFSET 7", @connection.add_limit_offset!("", :limit => sql_inject, :offset => 7)
+    end
+  end
+
+  def test_add_limit_offset_should_sanitize_sql_injection_for_limit_with_comas
+    sql_inject = "1, 7 procedure help()"
+    if current_adapter?(:MysqlAdapter)
+      assert_equal " LIMIT 1,7", @connection.add_limit_offset!("", :limit => sql_inject)
+      assert_equal " LIMIT 7, 1", @connection.add_limit_offset!("", :limit => '1 ; DROP TABLE USERS', :offset => 7)
+    else
+      assert_equal " LIMIT 1,7", @connection.add_limit_offset!("", :limit => sql_inject)
+      assert_equal " LIMIT 1,7 OFFSET 7", @connection.add_limit_offset!("", :limit => sql_inject, :offset => 7)
+    end
+  end
 end
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index ffa6d45948..42a891bc3b 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -805,7 +805,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_include_has_many_using_primary_key
-    expected = Firm.find(1).clients_using_primary_key.sort_by &:name
+    expected = Firm.find(1).clients_using_primary_key.sort_by(&:name)
     # Oracle adapter truncates alias to 30 characters
     if current_adapter?(:OracleAdapter)
       firm = Firm.find 1, :include => :clients_using_primary_key, :order => 'clients_using_primary_keys_companies'[0,30]+'.name'
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 608d5a3608..ff799191c2 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -18,10 +18,14 @@ require 'models/developer'
 class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   fixtures :posts, :readers, :people, :comments, :authors, :owners, :pets, :toys, :jobs, :references, :companies
 
-  def test_associate_existing
-    assert_queries(2) { posts(:thinking);people(:david) }
+  # Dummies to force column loads so query counts are clean.
+  def setup
+    Person.create :first_name => 'gummy'
+    Reader.create :person_id => 0, :post_id => 0
+  end
 
-    posts(:thinking).people
+  def test_associate_existing
+    assert_queries(2) { posts(:thinking); people(:david) }
 
     assert_queries(1) do
       posts(:thinking).people << people(:david)
@@ -287,7 +291,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     ], log.last(2)
 
     post.people_with_callbacks = [people(:michael),people(:david), Person.new(:first_name => "Julian"), Person.create!(:first_name => "Roger")]
-    assert_equal (%w(Ted Bob Sam Lary) * 2).sort, log[-12..-5].collect(&:last).sort
+    assert_equal((%w(Ted Bob Sam Lary) * 2).sort, log[-12..-5].collect(&:last).sort)
     assert_equal [
       [:added, :before, "Julian"],
       [:added, :after, "Julian"],
@@ -296,7 +300,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     ], log.last(4)
 
     post.people_with_callbacks.clear
-    assert_equal (%w(Michael David Julian Roger) * 2).sort, log.last(8).collect(&:last).sort
+    assert_equal((%w(Michael David Julian Roger) * 2).sort, log.last(8).collect(&:last).sort)
   end
 
   def test_dynamic_find_should_respect_association_include
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index d5dbb88886..7372f2da1b 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -186,15 +186,6 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_equal account, firm.account
   end
 
-  def test_failing_build_association
-    firm = Firm.new("name" => "GlobalMegaCorp")
-    firm.save
-
-    account = firm.build_account
-    assert !account.save
-    assert_equal ["can't be empty"], account.errors["credit_limit"]
-  end
-
   def test_build_association_twice_without_saving_affects_nothing
     count_of_account = Account.count
     firm = Firm.find(:first)
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb
index 43abcae75e..4ba867dc7c 100644
--- a/activerecord/test/cases/associations/inner_join_association_test.rb
+++ b/activerecord/test/cases/associations/inner_join_association_test.rb
@@ -15,12 +15,12 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase
 
   def test_construct_finder_sql_ignores_empty_joins_hash
     sql = Author.joins({}).to_sql
-    assert_no_match /JOIN/i, sql
+    assert_no_match(/JOIN/i, sql)
   end
 
   def test_construct_finder_sql_ignores_empty_joins_array
     sql = Author.joins([]).to_sql
-    assert_no_match /JOIN/i, sql
+    assert_no_match(/JOIN/i, sql)
   end
 
   def test_find_with_implicit_inner_joins_honors_readonly_without_select
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index e9af5a60d8..8bdf8bcd55 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -52,18 +52,6 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     assert_equal 1, authors(:mary).unique_categorized_posts.find_all_by_title("So I was thinking").size
   end
 
-  def test_polymorphic_has_many
-    assert posts(:welcome).taggings.include?(taggings(:welcome_general))
-  end
-
-  def test_polymorphic_has_one
-    assert_equal taggings(:welcome_general), posts(:welcome).tagging
-  end
-
-  def test_polymorphic_belongs_to
-    assert_equal posts(:welcome), posts(:welcome).taggings.first.taggable
-  end
-
   def test_polymorphic_has_many_going_through_join_model
     assert_equal tags(:general), tag = posts(:welcome).tags.first
     assert_no_queries do
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index 9bc34bd750..d99fb44f01 100644
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -180,6 +180,14 @@ class AssociationProxyTest < ActiveRecord::TestCase
     end
   end
 
+  if RUBY_VERSION < '1.9'
+    def test_splat_does_not_invoke_to_a_on_singular_targets
+      author = posts(:welcome).author
+      author.reload.target.expects(:to_a).never
+      [*author]
+    end
+  end
+
   def setup_dangling_association
     josh = Author.create(:name => "Josh")
     p = Post.create(:title => "New on Edge", :body => "More cool stuff!", :author => josh)
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index e3047fe873..8774ed58aa 100755
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -674,10 +674,10 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_decrement_counter
     Topic.decrement_counter("replies_count", 2)
-    assert_equal -1, Topic.find(2).replies_count
+    assert_equal(-1, Topic.find(2).replies_count)
 
     Topic.decrement_counter("replies_count", 2)
-    assert_equal -2, Topic.find(2).replies_count
+    assert_equal(-2, Topic.find(2).replies_count)
   end
 
   def test_reset_counters
@@ -1533,7 +1533,7 @@ class BasicsTest < ActiveRecord::TestCase
   def test_auto_id
     auto = AutoId.new
     auto.save
-    assert (auto.id > 0)
+    assert(auto.id > 0)
   end
 
   def quote_column_name(name)
@@ -2181,7 +2181,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_inspect_new_instance
-    assert_match /Topic id: nil/, Topic.new.inspect
+    assert_match(/Topic id: nil/, Topic.new.inspect)
   end
 
   def test_inspect_limited_select_instance
@@ -2240,9 +2240,9 @@ class BasicsTest < ActiveRecord::TestCase
     ActiveRecord::Base.benchmark("Debug Topic Count", :level => :debug) { Topic.count }
     ActiveRecord::Base.benchmark("Warn Topic Count",  :level => :warn)  { Topic.count }
     ActiveRecord::Base.benchmark("Error Topic Count", :level => :error) { Topic.count }
-    assert_no_match /Debug Topic Count/, log.string
-    assert_match /Warn Topic Count/, log.string
-    assert_match /Error Topic Count/, log.string
+    assert_no_match(/Debug Topic Count/, log.string)
+    assert_match(/Warn Topic Count/, log.string)
+    assert_match(/Error Topic Count/, log.string)
   ensure
     ActiveRecord::Base.logger = original_logger
   end
@@ -2253,8 +2253,8 @@ class BasicsTest < ActiveRecord::TestCase
     ActiveRecord::Base.logger = Logger.new(log)
     ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => true) { ActiveRecord::Base.logger.debug "Loud" }
     ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => false)  { ActiveRecord::Base.logger.debug "Quiet" }
-    assert_no_match /Loud/, log.string
-    assert_match /Quiet/, log.string
+    assert_no_match(/Loud/, log.string)
+    assert_match(/Quiet/, log.string)
   ensure
     ActiveRecord::Base.logger = original_logger
   end
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index ff2322ac15..dc7f82b001 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -43,6 +43,11 @@ class CallbackDeveloper < ActiveRecord::Base
   end
 end
 
+class CallbackDeveloperWithFalseValidation < CallbackDeveloper
+  before_validation proc { |model| model.history << [:before_validation, :returning_false]; return false }
+  before_validation proc { |model| model.history << [:before_validation, :should_never_get_here] }
+end
+
 class ParentDeveloper < ActiveRecord::Base
   set_table_name 'developers'
   attr_accessor :after_save_called
@@ -139,7 +144,7 @@ class CallbackCancellationDeveloper < ActiveRecord::Base
   attr_reader   :after_save_called, :after_create_called, :after_update_called, :after_destroy_called
   attr_accessor :cancel_before_save, :cancel_before_create, :cancel_before_update, :cancel_before_destroy
 
-  before_save    { !@cancel_before_save    }
+  before_save    {defined?(@cancel_before_save) ? !@cancel_before_save : false}
   before_create  { !@cancel_before_create  }
   before_update  { !@cancel_before_update  }
   before_destroy { !@cancel_before_destroy }
@@ -437,10 +442,8 @@ class CallbacksTest < ActiveRecord::TestCase
   end
   private :assert_save_callbacks_not_called
 
-  def test_zzz_callback_returning_false # must be run last since we modify CallbackDeveloper
-    david = CallbackDeveloper.find(1)
-    CallbackDeveloper.before_validation proc { |model| model.history << [:before_validation, :returning_false]; return false }
-    CallbackDeveloper.before_validation proc { |model| model.history << [:before_validation, :should_never_get_here] }
+  def test_callback_returning_false
+    david = CallbackDeveloperWithFalseValidation.find(1)
     david.save
     assert_equal [
       [ :after_find,            :method ],
diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb
index b4032c23e6..bba216ae19 100644
--- a/activerecord/test/cases/defaults_test.rb
+++ b/activerecord/test/cases/defaults_test.rb
@@ -24,7 +24,7 @@ class DefaultTest < ActiveRecord::TestCase
       assert_instance_of Fixnum, default.positive_integer
       assert_equal 1, default.positive_integer
       assert_instance_of Fixnum, default.negative_integer
-      assert_equal -1, default.negative_integer
+      assert_equal(-1, default.negative_integer)
       assert_instance_of BigDecimal, default.decimal_number
       assert_equal BigDecimal.new("2.78"), default.decimal_number
     end
@@ -33,7 +33,7 @@ class DefaultTest < ActiveRecord::TestCase
   if current_adapter?(:PostgreSQLAdapter)
     def test_multiline_default_text
       # older postgres versions represent the default with escapes ("\\012" for a newline)
-      assert ( "--- []\n\n" == Default.columns_hash['multiline_default'].default ||
+      assert( "--- []\n\n" == Default.columns_hash['multiline_default'].default ||
                "--- []\\012\\012" == Default.columns_hash['multiline_default'].default)
     end
   end
diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index 4961d12a44..a64ccb2120 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -26,6 +26,11 @@ class NumericData < ActiveRecord::Base
 end
 
 class DirtyTest < ActiveRecord::TestCase
+  # Dummy to force column loads so query counts are clean.
+  def setup
+    Person.create :first_name => 'foo'
+  end
+
   def test_attribute_changes
     # New record - no changes.
     pirate = Pirate.new
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index d2451f24c1..9e88ec8016 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -502,6 +502,18 @@ class FinderTest < ActiveRecord::TestCase
     assert_kind_of Time, Topic.find(:first, :conditions => ["id = :id", { :id => 1 }]).written_on
   end
 
+  class SimpleEnumerable
+    include Enumerable
+
+    def initialize(ary)
+      @ary = ary
+    end
+
+    def each(&b)
+      @ary.each(&b)
+    end
+  end
+
   def test_bind_enumerable
     quoted_abc = %(#{ActiveRecord::Base.connection.quote('a')},#{ActiveRecord::Base.connection.quote('b')},#{ActiveRecord::Base.connection.quote('c')})
 
@@ -511,12 +523,11 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal '1,2,3', bind(':a', :a => [1, 2, 3])
     assert_equal quoted_abc, bind(':a', :a => %w(a b c)) # '
 
-    require 'set'
-    assert_equal '1,2,3', bind('?', Set.new([1, 2, 3]))
-    assert_equal quoted_abc, bind('?', Set.new(%w(a b c)))
+    assert_equal '1,2,3', bind('?', SimpleEnumerable.new([1, 2, 3]))
+    assert_equal quoted_abc, bind('?', SimpleEnumerable.new(%w(a b c)))
 
-    assert_equal '1,2,3', bind(':a', :a => Set.new([1, 2, 3]))
-    assert_equal quoted_abc, bind(':a', :a => Set.new(%w(a b c))) # '
+    assert_equal '1,2,3', bind(':a', :a => SimpleEnumerable.new([1, 2, 3]))
+    assert_equal quoted_abc, bind(':a', :a => SimpleEnumerable.new(%w(a b c))) # '
   end
 
   def test_bind_empty_enumerable
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index f965652a9a..e78b522b65 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -244,14 +244,14 @@ class FixturesWithoutInstantiationTest < ActiveRecord::TestCase
   fixtures :topics, :developers, :accounts
 
   def test_without_complete_instantiation
-    assert_nil @first
-    assert_nil @topics
-    assert_nil @developers
-    assert_nil @accounts
+    assert !defined?(@first)
+    assert !defined?(@topics)
+    assert !defined?(@developers)
+    assert !defined?(@accounts)
   end
 
   def test_fixtures_from_root_yml_without_instantiation
-    assert_nil @unknown
+    assert !defined?(@unknown), "@unknown is not defined"
   end
 
   def test_accessor_methods
@@ -279,7 +279,7 @@ class FixturesWithoutInstanceInstantiationTest < ActiveRecord::TestCase
   fixtures :topics, :developers, :accounts
 
   def test_without_instance_instantiation
-    assert_nil @first
+    assert !defined?(@first), "@first is not defined"
     assert_not_nil @topics
     assert_not_nil @developers
     assert_not_nil @accounts
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index e831ebf36c..1fb59d3589 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -7,6 +7,7 @@ require 'config'
 
 require 'test/unit'
 require 'stringio'
+require 'mocha'
 
 require 'active_record'
 require 'active_support/dependencies'
diff --git a/activerecord/test/cases/json_serialization_test.rb b/activerecord/test/cases/json_serialization_test.rb
index 54bc8e2343..a3145d2c04 100644
--- a/activerecord/test/cases/json_serialization_test.rb
+++ b/activerecord/test/cases/json_serialization_test.rb
@@ -27,6 +27,8 @@ class JsonSerializationTest < ActiveRecord::TestCase
     @contact = NamespacedContact.new :name => 'whatever'
     json = @contact.to_json
     assert_match %r{^\{"namespaced_contact":\{}, json
+  ensure
+    NamespacedContact.include_root_in_json = false
   end
 
   def test_should_include_root_in_json
diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index aa7ce2ecb6..fcad3e90d3 100644
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -6,25 +6,6 @@ require 'models/minimalistic'
 
 class SpecialDeveloper < Developer; end
 
-class TopicManualObserver
-  include Singleton
-
-  attr_reader :action, :object, :callbacks
-
-  def initialize
-    Topic.add_observer(self)
-    @callbacks = []
-  end
-
-  def update(callback_method, object)
-    @callbacks << { "callback_method" => callback_method, "object" => object }
-  end
-
-  def has_been_notified?
-    !@callbacks.empty?
-  end
-end
-
 class TopicaAuditor < ActiveRecord::Observer
   observe :topic
 
@@ -85,27 +66,6 @@ class LifecycleTest < ActiveRecord::TestCase
     assert_equal original_count - (1 + topic_to_be_destroyed.replies.size), Topic.count
   end
 
-  def test_after_save
-    ActiveRecord::Base.observers = :topic_manual_observer
-    ActiveRecord::Base.instantiate_observers
-
-    topic = Topic.find(1)
-    topic.title = "hello"
-    topic.save
-
-    assert TopicManualObserver.instance.has_been_notified?
-    assert_equal :after_save, TopicManualObserver.instance.callbacks.last["callback_method"]
-  end
-
-  def test_observer_update_on_save
-    ActiveRecord::Base.observers = TopicManualObserver
-    ActiveRecord::Base.instantiate_observers
-
-    topic = Topic.find(1)
-    assert TopicManualObserver.instance.has_been_notified?
-    assert_equal :after_find, TopicManualObserver.instance.callbacks.first["callback_method"]
-  end
-
   def test_auto_observer
     topic_observer = TopicaAuditor.instance
     assert_nil TopicaAuditor.observed_class
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
index f3b94eb829..6ba84fa57b 100644
--- a/activerecord/test/cases/log_subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -26,8 +26,8 @@ class LogSubscriberTest < ActiveSupport::TestCase
     Developer.all
     wait
     assert_equal 1, @logger.logged(:debug).size
-    assert_match /Developer Load/, @logger.logged(:debug).last
-    assert_match /SELECT .*?FROM .?developers.?/, @logger.logged(:debug).last
+    assert_match(/Developer Load/, @logger.logged(:debug).last)
+    assert_match(/SELECT .*?FROM .?developers.?/, @logger.logged(:debug).last)
   end
 
   def test_cached_queries
@@ -37,7 +37,7 @@ class LogSubscriberTest < ActiveSupport::TestCase
     end
     wait
     assert_equal 2, @logger.logged(:debug).size
-    assert_match /CACHE/, @logger.logged(:debug).last
-    assert_match /SELECT .*?FROM .?developers.?/, @logger.logged(:debug).last
+    assert_match(/CACHE/, @logger.logged(:debug).last)
+    assert_match(/SELECT .*?FROM .?developers.?/, @logger.logged(:debug).last)
   end
-end
\ No newline at end of file
+end
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb
index 3151457440..a3b496a0e6 100644
--- a/activerecord/test/cases/method_scoping_test.rb
+++ b/activerecord/test/cases/method_scoping_test.rb
@@ -382,7 +382,7 @@ class NestedScopingTest < ActiveRecord::TestCase
     Developer.send(:with_scope, :find => { :conditions => "salary < 100000" }) do
       Developer.send(:with_scope, :find => { :offset => 1, :order => 'id asc' }) do
         # Oracle adapter does not generated space after asc therefore trailing space removed from regex
-        assert_sql /ORDER BY  id asc/ do
+        assert_sql(/ORDER BY  id asc/) do
           assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc'))
         end
       end
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index dd32eeeff2..e213986ede 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -477,7 +477,7 @@ if ActiveRecord::Base.connection.supports_migrations?
             assert_not_equal "Z", bob.moment_of_truth.zone
             # US/Eastern is -5 hours from GMT
             assert_equal Rational(-5, 24), bob.moment_of_truth.offset
-            assert_match /\A-05:?00\Z/, bob.moment_of_truth.zone #ruby 1.8.6 uses HH:MM, prior versions use HHMM
+            assert_match(/\A-05:?00\Z/, bob.moment_of_truth.zone) #ruby 1.8.6 uses HH:MM, prior versions use HHMM
             assert_equal DateTime::ITALY, bob.moment_of_truth.start
           end
         end
@@ -493,7 +493,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
         ActiveRecord::Migration.add_column :people, :intelligence_quotient, :tinyint
         Person.reset_column_information
-        assert_match /tinyint/, Person.columns_hash['intelligence_quotient'].sql_type
+        assert_match(/tinyint/, Person.columns_hash['intelligence_quotient'].sql_type)
       ensure
         ActiveRecord::Migration.remove_column :people, :intelligence_quotient rescue nil
       end
@@ -1104,13 +1104,25 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal migrations[0].name, 'InnocentJointable'
     end
 
+    def test_relative_migrations
+      $".delete_if do |fname|
+        fname == (MIGRATIONS_ROOT + "/valid/1_people_have_last_names.rb")
+      end
+      Object.send(:remove_const, :PeopleHaveLastNames)
+
+      Dir.chdir(MIGRATIONS_ROOT) do
+        ActiveRecord::Migrator.up("valid/", 1)
+      end
+
+      assert defined?(PeopleHaveLastNames)
+    end
+
     def test_only_loads_pending_migrations
       # migrate up to 1
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
 
       # now unload the migrations that have been defined
-      PeopleHaveLastNames.unloadable
-      ActiveSupport::Dependencies.remove_unloadable_constants!
+      Object.send(:remove_const, :PeopleHaveLastNames)
 
       ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", nil)
 
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 894d96346e..6c2b4fa3a7 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -83,8 +83,8 @@ class NamedScopeTest < ActiveRecord::TestCase
   end
 
   def test_scopes_are_composable
-    assert_equal (approved = Topic.find(:all, :conditions => {:approved => true})), Topic.approved
-    assert_equal (replied = Topic.find(:all, :conditions => 'replies_count > 0')), Topic.replied
+    assert_equal((approved = Topic.find(:all, :conditions => {:approved => true})), Topic.approved)
+    assert_equal((replied = Topic.find(:all, :conditions => 'replies_count > 0')), Topic.replied)
     assert !(approved == replied)
     assert !(approved & replied).empty?
 
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index 3710f8e40b..91349689bc 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -10,6 +10,10 @@ require 'models/post'
 class QueryCacheTest < ActiveRecord::TestCase
   fixtures :tasks, :topics, :categories, :posts, :categories_posts
 
+  def setup
+    Task.connection.clear_query_cache
+  end
+
   def test_find_queries
     assert_queries(2) { Task.find(1); Task.find(1) }
   end
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index 2c9158aa7b..67818622d7 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -22,12 +22,6 @@ class ReflectionTest < ActiveRecord::TestCase
     assert_equal "Subscriber", Subscriber.model_name.human
   end
 
-  def test_column_null_not_null
-    subscriber = Subscriber.find(:first)
-    assert subscriber.column_for_attribute("name").null
-    assert !subscriber.column_for_attribute("nick").null
-  end
-
   def test_read_attribute_names
     assert_equal(
       %w( id title author_name author_email_address bonus_time written_on last_read content approved replies_count parent_id parent_title type ).sort,
diff --git a/activerecord/test/cases/schema_authorization_test_postgresql.rb b/activerecord/test/cases/schema_authorization_test_postgresql.rb
index ba7754513d..2860f1ad48 100644
--- a/activerecord/test/cases/schema_authorization_test_postgresql.rb
+++ b/activerecord/test/cases/schema_authorization_test_postgresql.rb
@@ -66,6 +66,15 @@ class SchemaAuthorizationTest < ActiveRecord::TestCase
       end
     end
   end
+  
+  def test_tables_in_current_schemas
+    assert !@connection.tables.include?(TABLE_NAME)
+    USERS.each do |u|
+      set_session_auth u
+      assert @connection.tables.include?(TABLE_NAME)
+      set_session_auth
+    end
+  end
 
   private
     def set_session_auth auth = nil
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index aca70b4238..c550030329 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -51,6 +51,7 @@ class TransactionTest < ActiveRecord::TestCase
     assert !Topic.find(2).approved?, "Second should have been unapproved"
   ensure
     class << Topic.connection
+      remove_method :commit_db_transaction
       alias :commit_db_transaction :real_commit_db_transaction rescue nil
     end
   end
@@ -382,28 +383,53 @@ class TransactionTest < ActiveRecord::TestCase
 
   private
     def add_exception_raising_after_save_callback_to_topic
-      Topic.class_eval "def after_save_for_transaction; raise 'Make the transaction rollback' end"
+      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+        remove_method(:after_save_for_transaction)
+        def after_save_for_transaction
+          raise 'Make the transaction rollback'
+        end
+      eoruby
     end
 
     def remove_exception_raising_after_save_callback_to_topic
-      Topic.class_eval "def after_save_for_transaction; end"
+      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+        remove_method :after_save_for_transaction
+        def after_save_for_transaction; end
+      eoruby
     end
 
     def add_exception_raising_after_create_callback_to_topic
-      Topic.class_eval "def after_create_for_transaction; raise 'Make the transaction rollback' end"
+      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+        remove_method(:after_create_for_transaction)
+        def after_create_for_transaction
+          raise 'Make the transaction rollback'
+        end
+      eoruby
     end
 
     def remove_exception_raising_after_create_callback_to_topic
-      Topic.class_eval "def after_create_for_transaction; end"
+      Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+        remove_method :after_create_for_transaction
+        def after_create_for_transaction; end
+      eoruby
     end
 
     %w(validation save destroy).each do |filter|
       define_method("add_cancelling_before_#{filter}_with_db_side_effect_to_topic") do
-        Topic.class_eval "def before_#{filter}_for_transaction() Book.create; false end"
+        Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+          remove_method :before_#{filter}_for_transaction
+          def before_#{filter}_for_transaction
+            Book.create
+            false
+          end
+        eoruby
       end
 
       define_method("remove_cancelling_before_#{filter}_with_db_side_effect_to_topic") do
-        Topic.class_eval "def before_#{filter}_for_transaction; end"
+        Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+          remove_method :before_#{filter}_for_transaction
+          def before_#{filter}_for_transaction; end
+        eoruby
       end
     end
 end
diff --git a/activerecord/test/cases/validations/i18n_validation_test.rb b/activerecord/test/cases/validations/i18n_validation_test.rb
index a0ff35f948..38fa2b821d 100644
--- a/activerecord/test/cases/validations/i18n_validation_test.rb
+++ b/activerecord/test/cases/validations/i18n_validation_test.rb
@@ -47,25 +47,6 @@ class I18nValidationTest < ActiveRecord::TestCase
     @topic.valid?
   end
 
-  # validates_uniqueness_of w/o mocha
-
-  def test_validates_associated_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:taken => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:taken => 'global message'}}}
-
-    Topic.validates_uniqueness_of :title
-    unique_topic.valid?
-    assert_equal ['custom message'], unique_topic.errors[:replies]
-  end
-
-  def test_validates_associated_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:taken => 'global message'}}}
-
-    Topic.validates_uniqueness_of :title
-    unique_topic.valid?
-    assert_equal ['global message'], unique_topic.errors[:replies]
-  end
-
   # validates_associated w/ mocha
 
   def test_validates_associated_generates_message