From 938243feb9ea177b84276821818c9eed66064340 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 19 Nov 2010 16:26:09 -0800
Subject: do not require ruby-debug automatically.  please require it if you
 have declared it as a dependency

---
 activerecord/test/cases/helper.rb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 52f26b71f5..f9bbc5299b 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -13,11 +13,6 @@ require 'active_record'
 require 'active_support/dependencies'
 require 'connection'
 
-begin
-  require 'ruby-debug'
-rescue LoadError
-end
-
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
 
-- 
cgit v1.2.3


From d7db6a88734c3b666f4b85f266d223eff408b294 Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Fri, 19 Nov 2010 18:29:33 +0100
Subject: class inheritable attributes is used no more! all internal use of
 class inheritable has been changed to class_attribute. class inheritable
 attributes has been deprecated.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activerecord/test/cases/associations_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index 93a51d3606..83c605d2bb 100644
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -270,17 +270,17 @@ class OverridingAssociationsTest < ActiveRecord::TestCase
 
   def test_habtm_association_redefinition_callbacks_should_differ_and_not_inherited
     # redeclared association on AR descendant should not inherit callbacks from superclass
-    callbacks = PeopleList.read_inheritable_attribute(:before_add_for_has_and_belongs_to_many)
+    callbacks = PeopleList.before_add_for_has_and_belongs_to_many
     assert_equal([:enlist], callbacks)
-    callbacks = DifferentPeopleList.read_inheritable_attribute(:before_add_for_has_and_belongs_to_many)
+    callbacks = DifferentPeopleList.before_add_for_has_and_belongs_to_many
     assert_equal([], callbacks)
   end
 
   def test_has_many_association_redefinition_callbacks_should_differ_and_not_inherited
     # redeclared association on AR descendant should not inherit callbacks from superclass
-    callbacks = PeopleList.read_inheritable_attribute(:before_add_for_has_many)
+    callbacks = PeopleList.before_add_for_has_many
     assert_equal([:enlist], callbacks)
-    callbacks = DifferentPeopleList.read_inheritable_attribute(:before_add_for_has_many)
+    callbacks = DifferentPeopleList.before_add_for_has_many
     assert_equal([], callbacks)
   end
 
-- 
cgit v1.2.3


From 66c09372f3ef3d4ca2b99d44cf1859d585b9dcb3 Mon Sep 17 00:00:00 2001
From: Alex Rothenberg <alex@alexrothenberg.com>
Date: Tue, 23 Nov 2010 06:10:19 +0800
Subject: Removed ids_in_list_limit in favor of in_clause_length defined in
 database_limits.rb

---
 activerecord/test/cases/associations/eager_test.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index c00b8a1cde..ea86ac29d0 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -80,31 +80,31 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_preloading_has_many_in_multiple_queries_with_more_ids_than_database_can_handle
-    Post.connection.expects(:ids_in_list_limit).at_least_once.returns(5)
+    Post.connection.expects(:in_clause_length).at_least_once.returns(5)
     posts = Post.find(:all, :include=>:comments)
     assert_equal 7, posts.size
   end
 
   def test_preloading_has_many_in_one_queries_when_database_has_no_limit_on_ids_it_can_handle
-    Post.connection.expects(:ids_in_list_limit).at_least_once.returns(nil)
+    Post.connection.expects(:in_clause_length).at_least_once.returns(nil)
     posts = Post.find(:all, :include=>:comments)
     assert_equal 7, posts.size
   end
 
   def test_preloading_habtm_in_multiple_queries_with_more_ids_than_database_can_handle
-    Post.connection.expects(:ids_in_list_limit).at_least_once.returns(5)
+    Post.connection.expects(:in_clause_length).at_least_once.returns(5)
     posts = Post.find(:all, :include=>:categories)
     assert_equal 7, posts.size
   end
 
   def test_preloading_habtm_in_one_queries_when_database_has_no_limit_on_ids_it_can_handle
-    Post.connection.expects(:ids_in_list_limit).at_least_once.returns(nil)
+    Post.connection.expects(:in_clause_length).at_least_once.returns(nil)
     posts = Post.find(:all, :include=>:categories)
     assert_equal 7, posts.size
   end
 
   def test_load_associated_records_in_one_query_when_adapter_has_no_limit
-    Post.connection.expects(:ids_in_list_limit).at_least_once.returns(nil)
+    Post.connection.expects(:in_clause_length).at_least_once.returns(nil)
     Post.expects(:i_was_called).with([1,2,3,4,5,6,7]).returns([1])
     associated_records = Post.send(:associated_records, [1,2,3,4,5,6,7]) do |some_ids|
       Post.i_was_called(some_ids)
@@ -113,7 +113,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_load_associated_records_in_several_queries_when_many_ids_passed
-    Post.connection.expects(:ids_in_list_limit).at_least_once.returns(5)
+    Post.connection.expects(:in_clause_length).at_least_once.returns(5)
     Post.expects(:i_was_called).with([1,2,3,4,5]).returns([1])
     Post.expects(:i_was_called).with([6,7]).returns([6])
     associated_records = Post.send(:associated_records, [1,2,3,4,5,6,7]) do |some_ids|
@@ -123,7 +123,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_load_associated_records_in_one_query_when_a_few_ids_passed
-    Post.connection.expects(:ids_in_list_limit).at_least_once.returns(5)
+    Post.connection.expects(:in_clause_length).at_least_once.returns(5)
     Post.expects(:i_was_called).with([1,2,3]).returns([1])
     associated_records = Post.send(:associated_records, [1,2,3]) do |some_ids|
       Post.i_was_called(some_ids)
-- 
cgit v1.2.3


From 4d31ee1e0e2eccae0c9964214455ff75c647bd7f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 22 Nov 2010 16:14:37 -0800
Subject: removing unused variables

---
 activerecord/test/cases/associations/has_many_associations_test.rb | 3 +--
 .../test/cases/associations/has_many_through_associations_test.rb  | 1 -
 activerecord/test/cases/associations/has_one_associations_test.rb  | 7 +++----
 activerecord/test/cases/associations/inverse_associations_test.rb  | 2 --
 activerecord/test/cases/associations/join_model_test.rb            | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 33c53e695b..fb772bb8e6 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -67,8 +67,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_no_sql_should_be_fired_if_association_already_loaded
-    car = Car.create(:name => 'honda')
-    bulb = car.bulbs.create
+    Car.create(:name => 'honda')
     bulbs = Car.first.bulbs
     bulbs.inspect # to load all instances of bulbs
     assert_no_queries do
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 94e1eb8c89..52432b0428 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -354,7 +354,6 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_has_many_association_through_a_belongs_to_association_where_the_association_doesnt_exist
-    author = authors(:mary)
     post = Post.create!(:title => "TITLE", :body => "BODY")
     assert_equal [], post.author_favorites
   end
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index 6fbeff8aa9..64449df8f5 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -163,7 +163,6 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
 
     firm = ExclusivelyDependentFirm.find(9)
     assert_not_nil firm.account
-    account_id = firm.account.id
     assert_equal [], Account.destroyed_account_ids[firm.id]
 
     firm.destroy
@@ -180,7 +179,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
   def test_dependence_with_restrict
     firm = RestrictedFirm.new(:name => 'restrict')
     firm.save!
-    account = firm.create_account(:credit_limit => 10)
+    firm.create_account(:credit_limit => 10)
     assert_not_nil firm.account
     assert_raise(ActiveRecord::DeleteRestrictionError) { firm.destroy }
   end
@@ -197,8 +196,8 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
   def test_build_association_twice_without_saving_affects_nothing
     count_of_account = Account.count
     firm = Firm.find(:first)
-    account1 = firm.build_account("credit_limit" => 1000)
-    account2 = firm.build_account("credit_limit" => 2000)
+    firm.build_account("credit_limit" => 1000)
+    firm.build_account("credit_limit" => 2000)
 
     assert_equal count_of_account, Account.count
   end
diff --git a/activerecord/test/cases/associations/inverse_associations_test.rb b/activerecord/test/cases/associations/inverse_associations_test.rb
index 081583038f..0491b2d1fa 100644
--- a/activerecord/test/cases/associations/inverse_associations_test.rb
+++ b/activerecord/test/cases/associations/inverse_associations_test.rb
@@ -484,7 +484,6 @@ class InversePolymorphicBelongsToTests < ActiveRecord::TestCase
 
   def test_child_instance_should_be_shared_with_replaced_via_accessor_parent
     face = faces(:confused)
-    old_man = face.polymorphic_man
     new_man = Man.new
 
     assert_not_nil face.polymorphic_man
@@ -499,7 +498,6 @@ class InversePolymorphicBelongsToTests < ActiveRecord::TestCase
 
   def test_child_instance_should_be_shared_with_replaced_via_method_parent
     face = faces(:confused)
-    old_man = face.polymorphic_man
     new_man = Man.new
 
     assert_not_nil face.polymorphic_man
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index 96edcfbb35..1ece961d2e 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -642,7 +642,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
 
   def test_preload_nil_polymorphic_belongs_to
     assert_nothing_raised do
-      taggings = Tagging.find(:all, :include => :taggable, :conditions => ['taggable_type IS NULL'])
+      Tagging.find(:all, :include => :taggable, :conditions => ['taggable_type IS NULL'])
     end
   end
 
-- 
cgit v1.2.3


From ca7b0a0d1a424aec0973fe22c299b8f04e309784 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 10:13:43 -0800
Subject: dup is working better

---
 activerecord/test/cases/base_test.rb        |  4 ---
 activerecord/test/cases/duplication_test.rb | 43 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 activerecord/test/cases/duplication_test.rb

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 26f388ca46..c8efabed30 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1443,10 +1443,6 @@ class BasicsTest < ActiveRecord::TestCase
     ActiveRecord::Base.logger = original_logger
   end
 
-  def test_dup
-    assert !Minimalistic.new.freeze.dup.frozen?
-  end
-
   def test_compute_type_success
     assert_equal Author, ActiveRecord::Base.send(:compute_type, 'Author')
   end
diff --git a/activerecord/test/cases/duplication_test.rb b/activerecord/test/cases/duplication_test.rb
new file mode 100644
index 0000000000..610894a03e
--- /dev/null
+++ b/activerecord/test/cases/duplication_test.rb
@@ -0,0 +1,43 @@
+require "cases/helper"
+require 'models/topic'
+
+module ActiveRecord
+  class DuplicationTest < ActiveRecord::TestCase
+    fixtures :topics
+
+    def test_dup
+      assert !Minimalistic.new.freeze.dup.frozen?
+    end
+
+    def test_dup_not_persisted
+      topic = Topic.first
+      duped = topic.dup
+
+      assert !duped.persisted?, 'topic not persisted'
+      assert duped.new_record?, 'topic is new'
+    end
+
+    def test_dup_has_no_id
+      topic = Topic.first
+      duped = topic.dup
+      assert_nil duped.id
+    end
+
+    def test_clone_persisted
+      topic = Topic.first
+      cloned = topic.clone
+      assert cloned.persisted?, 'topic persisted'
+      assert !cloned.new_record?, 'topic is not new'
+    end
+
+    def test_clone_keeps_frozen
+      topic = Topic.first
+      topic.freeze
+
+      cloned = topic.clone
+      assert cloned.persisted?, 'topic persisted'
+      assert !cloned.new_record?, 'topic is not new'
+      assert cloned.frozen?, 'topic is frozen'
+    end
+  end
+end
-- 
cgit v1.2.3


From 5badf60d128cb958fa7a0e3f140517b71b88c7ac Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 10:58:19 -0800
Subject: dup keeps changes

---
 activerecord/test/cases/duplication_test.rb | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/duplication_test.rb b/activerecord/test/cases/duplication_test.rb
index 610894a03e..f9d614230b 100644
--- a/activerecord/test/cases/duplication_test.rb
+++ b/activerecord/test/cases/duplication_test.rb
@@ -6,7 +6,7 @@ module ActiveRecord
     fixtures :topics
 
     def test_dup
-      assert !Minimalistic.new.freeze.dup.frozen?
+      assert !Topic.new.freeze.dup.frozen?
     end
 
     def test_dup_not_persisted
@@ -26,6 +26,7 @@ module ActiveRecord
     def test_clone_persisted
       topic = Topic.first
       cloned = topic.clone
+      assert topic.persisted?, 'topic persisted'
       assert cloned.persisted?, 'topic persisted'
       assert !cloned.new_record?, 'topic is not new'
     end
@@ -37,7 +38,21 @@ module ActiveRecord
       cloned = topic.clone
       assert cloned.persisted?, 'topic persisted'
       assert !cloned.new_record?, 'topic is not new'
-      assert cloned.frozen?, 'topic is frozen'
+      assert cloned.frozen?, 'topic should be frozen'
+    end
+
+    def test_dup_with_modified_attributes
+      topic = Topic.first
+      topic.author_name = 'Aaron'
+      duped = topic.dup
+      assert_equal 'Aaron', duped.author_name
+    end
+
+    def test_dup_with_changes
+      topic = Topic.first
+      topic.author_name = 'Aaron'
+      duped = topic.dup
+      assert_equal topic.changes, duped.changes
     end
   end
 end
-- 
cgit v1.2.3


From 035d00b665a645a12ecd1f9c70dba06bbd4f6201 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 10:59:23 -0800
Subject: making sure changes to dup will not touch original

---
 activerecord/test/cases/duplication_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/duplication_test.rb b/activerecord/test/cases/duplication_test.rb
index f9d614230b..c6f7e3ef16 100644
--- a/activerecord/test/cases/duplication_test.rb
+++ b/activerecord/test/cases/duplication_test.rb
@@ -54,5 +54,15 @@ module ActiveRecord
       duped = topic.dup
       assert_equal topic.changes, duped.changes
     end
+
+    def test_dup_topics_are_independent
+      topic = Topic.first
+      topic.author_name = 'Aaron'
+      duped = topic.dup
+
+      duped.author_name = 'meow'
+
+      assert_not_equal topic.changes, duped.changes
+    end
   end
 end
-- 
cgit v1.2.3


From 28f4df0908180783f8cf863a8bbb30c1c139bd8d Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 11:10:56 -0800
Subject: testing duped attributes are independent

---
 activerecord/test/cases/duplication_test.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/duplication_test.rb b/activerecord/test/cases/duplication_test.rb
index c6f7e3ef16..1ca6e72db0 100644
--- a/activerecord/test/cases/duplication_test.rb
+++ b/activerecord/test/cases/duplication_test.rb
@@ -41,6 +41,13 @@ module ActiveRecord
       assert cloned.frozen?, 'topic should be frozen'
     end
 
+    def test_clone_is_shallow
+      topic = Topic.first
+      cloned = topic.clone
+      topic.author_name = 'Aaron'
+      assert_equal 'Aaron', cloned.author_name
+    end
+
     def test_dup_with_modified_attributes
       topic = Topic.first
       topic.author_name = 'Aaron'
@@ -64,5 +71,16 @@ module ActiveRecord
 
       assert_not_equal topic.changes, duped.changes
     end
+
+    def test_dup_attributes_are_independent
+      topic = Topic.first
+      duped = topic.dup
+
+      duped.author_name = 'meow'
+      topic.author_name = 'Aaron'
+
+      assert_equal 'Aaron', topic.author_name
+      assert_equal 'meow', duped.author_name
+    end
   end
 end
-- 
cgit v1.2.3


From c5858a6df3efefbab8925623b1e6c064c476fb26 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 11:12:46 -0800
Subject: adding a specific case for clone testing

---
 activerecord/test/cases/clone_test.rb       | 33 +++++++++++++++++++++++++++++
 activerecord/test/cases/duplication_test.rb | 25 ----------------------
 2 files changed, 33 insertions(+), 25 deletions(-)
 create mode 100644 activerecord/test/cases/clone_test.rb

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/clone_test.rb b/activerecord/test/cases/clone_test.rb
new file mode 100644
index 0000000000..d91646efca
--- /dev/null
+++ b/activerecord/test/cases/clone_test.rb
@@ -0,0 +1,33 @@
+require "cases/helper"
+require 'models/topic'
+
+module ActiveRecord
+  class CloneTest < ActiveRecord::TestCase
+    fixtures :topics
+
+    def test_persisted
+      topic = Topic.first
+      cloned = topic.clone
+      assert topic.persisted?, 'topic persisted'
+      assert cloned.persisted?, 'topic persisted'
+      assert !cloned.new_record?, 'topic is not new'
+    end
+
+    def test_stays_frozen
+      topic = Topic.first
+      topic.freeze
+
+      cloned = topic.clone
+      assert cloned.persisted?, 'topic persisted'
+      assert !cloned.new_record?, 'topic is not new'
+      assert cloned.frozen?, 'topic should be frozen'
+    end
+
+    def test_shallow
+      topic = Topic.first
+      cloned = topic.clone
+      topic.author_name = 'Aaron'
+      assert_equal 'Aaron', cloned.author_name
+    end
+  end
+end
diff --git a/activerecord/test/cases/duplication_test.rb b/activerecord/test/cases/duplication_test.rb
index 1ca6e72db0..ecea843bbf 100644
--- a/activerecord/test/cases/duplication_test.rb
+++ b/activerecord/test/cases/duplication_test.rb
@@ -23,31 +23,6 @@ module ActiveRecord
       assert_nil duped.id
     end
 
-    def test_clone_persisted
-      topic = Topic.first
-      cloned = topic.clone
-      assert topic.persisted?, 'topic persisted'
-      assert cloned.persisted?, 'topic persisted'
-      assert !cloned.new_record?, 'topic is not new'
-    end
-
-    def test_clone_keeps_frozen
-      topic = Topic.first
-      topic.freeze
-
-      cloned = topic.clone
-      assert cloned.persisted?, 'topic persisted'
-      assert !cloned.new_record?, 'topic is not new'
-      assert cloned.frozen?, 'topic should be frozen'
-    end
-
-    def test_clone_is_shallow
-      topic = Topic.first
-      cloned = topic.clone
-      topic.author_name = 'Aaron'
-      assert_equal 'Aaron', cloned.author_name
-    end
-
     def test_dup_with_modified_attributes
       topic = Topic.first
       topic.author_name = 'Aaron'
-- 
cgit v1.2.3


From 6a8f1b8b402b31ae43872c9d1f37b931c85799e7 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 11:13:24 -0800
Subject: renaming duplication test to dup test

---
 activerecord/test/cases/dup_test.rb         | 61 +++++++++++++++++++++++++++++
 activerecord/test/cases/duplication_test.rb | 61 -----------------------------
 2 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100644 activerecord/test/cases/dup_test.rb
 delete mode 100644 activerecord/test/cases/duplication_test.rb

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/dup_test.rb b/activerecord/test/cases/dup_test.rb
new file mode 100644
index 0000000000..fa528c4936
--- /dev/null
+++ b/activerecord/test/cases/dup_test.rb
@@ -0,0 +1,61 @@
+require "cases/helper"
+require 'models/topic'
+
+module ActiveRecord
+  class DupTest < ActiveRecord::TestCase
+    fixtures :topics
+
+    def test_dup
+      assert !Topic.new.freeze.dup.frozen?
+    end
+
+    def test_dup_not_persisted
+      topic = Topic.first
+      duped = topic.dup
+
+      assert !duped.persisted?, 'topic not persisted'
+      assert duped.new_record?, 'topic is new'
+    end
+
+    def test_dup_has_no_id
+      topic = Topic.first
+      duped = topic.dup
+      assert_nil duped.id
+    end
+
+    def test_dup_with_modified_attributes
+      topic = Topic.first
+      topic.author_name = 'Aaron'
+      duped = topic.dup
+      assert_equal 'Aaron', duped.author_name
+    end
+
+    def test_dup_with_changes
+      topic = Topic.first
+      topic.author_name = 'Aaron'
+      duped = topic.dup
+      assert_equal topic.changes, duped.changes
+    end
+
+    def test_dup_topics_are_independent
+      topic = Topic.first
+      topic.author_name = 'Aaron'
+      duped = topic.dup
+
+      duped.author_name = 'meow'
+
+      assert_not_equal topic.changes, duped.changes
+    end
+
+    def test_dup_attributes_are_independent
+      topic = Topic.first
+      duped = topic.dup
+
+      duped.author_name = 'meow'
+      topic.author_name = 'Aaron'
+
+      assert_equal 'Aaron', topic.author_name
+      assert_equal 'meow', duped.author_name
+    end
+  end
+end
diff --git a/activerecord/test/cases/duplication_test.rb b/activerecord/test/cases/duplication_test.rb
deleted file mode 100644
index ecea843bbf..0000000000
--- a/activerecord/test/cases/duplication_test.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require "cases/helper"
-require 'models/topic'
-
-module ActiveRecord
-  class DuplicationTest < ActiveRecord::TestCase
-    fixtures :topics
-
-    def test_dup
-      assert !Topic.new.freeze.dup.frozen?
-    end
-
-    def test_dup_not_persisted
-      topic = Topic.first
-      duped = topic.dup
-
-      assert !duped.persisted?, 'topic not persisted'
-      assert duped.new_record?, 'topic is new'
-    end
-
-    def test_dup_has_no_id
-      topic = Topic.first
-      duped = topic.dup
-      assert_nil duped.id
-    end
-
-    def test_dup_with_modified_attributes
-      topic = Topic.first
-      topic.author_name = 'Aaron'
-      duped = topic.dup
-      assert_equal 'Aaron', duped.author_name
-    end
-
-    def test_dup_with_changes
-      topic = Topic.first
-      topic.author_name = 'Aaron'
-      duped = topic.dup
-      assert_equal topic.changes, duped.changes
-    end
-
-    def test_dup_topics_are_independent
-      topic = Topic.first
-      topic.author_name = 'Aaron'
-      duped = topic.dup
-
-      duped.author_name = 'meow'
-
-      assert_not_equal topic.changes, duped.changes
-    end
-
-    def test_dup_attributes_are_independent
-      topic = Topic.first
-      duped = topic.dup
-
-      duped.author_name = 'meow'
-      topic.author_name = 'Aaron'
-
-      assert_equal 'Aaron', topic.author_name
-      assert_equal 'meow', duped.author_name
-    end
-  end
-end
-- 
cgit v1.2.3


From 93d78b831831a1c8e324d4c5404b99e81fe77725 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 11:30:14 -0800
Subject: fixing more dup tests

---
 activerecord/test/cases/base_test.rb | 43 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index c8efabed30..e3f4f2bd08 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -669,36 +669,36 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal true, Topic.find(1).persisted?
   end
 
-  def test_clone
+  def test_dup
     topic = Topic.find(1)
-    cloned_topic = nil
-    assert_nothing_raised { cloned_topic = topic.clone }
-    assert_equal topic.title, cloned_topic.title
-    assert !cloned_topic.persisted?
+    duped_topic = nil
+    assert_nothing_raised { duped_topic = topic.dup }
+    assert_equal topic.title, duped_topic.title
+    assert !duped_topic.persisted?
 
-    # test if the attributes have been cloned
+    # test if the attributes have been duped
     topic.title = "a"
-    cloned_topic.title = "b"
+    duped_topic.title = "b"
     assert_equal "a", topic.title
-    assert_equal "b", cloned_topic.title
+    assert_equal "b", duped_topic.title
 
-    # test if the attribute values have been cloned
+    # test if the attribute values have been duped
     topic.title = {"a" => "b"}
-    cloned_topic = topic.clone
-    cloned_topic.title["a"] = "c"
+    duped_topic = topic.dup
+    duped_topic.title["a"] = "c"
     assert_equal "b", topic.title["a"]
 
-    # test if attributes set as part of after_initialize are cloned correctly
-    assert_equal topic.author_email_address, cloned_topic.author_email_address
+    # test if attributes set as part of after_initialize are duped correctly
+    assert_equal topic.author_email_address, duped_topic.author_email_address
 
     # test if saved clone object differs from original
-    cloned_topic.save
-    assert cloned_topic.persisted?
-    assert_not_equal cloned_topic.id, topic.id
+    duped_topic.save
+    assert duped_topic.persisted?
+    assert_not_equal duped_topic.id, topic.id
 
-    cloned_topic.reload
+    duped_topic.reload
     # FIXME: I think this is poor behavior, and will fix it with #5686
-    assert_equal({'a' => 'c'}.to_s, cloned_topic.title)
+    assert_equal({'a' => 'c'}.to_s, duped_topic.title)
   end
 
   def test_clone_with_aggregate_of_same_name_as_attribute
@@ -721,12 +721,13 @@ class BasicsTest < ActiveRecord::TestCase
     assert_not_equal clone.id, dev.id
   end
 
-  def test_clone_does_not_clone_associations
+  def test_dup_does_not_copy_associations
     author = authors(:david)
     assert_not_equal [], author.posts
+    author.send(:clear_association_cache)
 
-    author_clone = author.clone
-    assert_equal [], author_clone.posts
+    author_dup = author.dup
+    assert_equal [], author_dup.posts
   end
 
   def test_clone_preserves_subtype
-- 
cgit v1.2.3


From 064c28d6c290cb9b6222b2348e38e713b82a89d6 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 11:57:33 -0800
Subject: fixing dup regressions

---
 activerecord/test/cases/base_test.rb        | 32 ++++++++++++++---------------
 activerecord/test/cases/dirty_test.rb       |  8 ++++----
 activerecord/test/cases/dup_test.rb         |  9 +++++---
 activerecord/test/cases/inheritance_test.rb |  2 +-
 4 files changed, 27 insertions(+), 24 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index e3f4f2bd08..c3ba1f0c35 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -701,24 +701,24 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal({'a' => 'c'}.to_s, duped_topic.title)
   end
 
-  def test_clone_with_aggregate_of_same_name_as_attribute
+  def test_dup_with_aggregate_of_same_name_as_attribute
     dev = DeveloperWithAggregate.find(1)
     assert_kind_of DeveloperSalary, dev.salary
 
-    clone = nil
-    assert_nothing_raised { clone = dev.clone }
-    assert_kind_of DeveloperSalary, clone.salary
-    assert_equal dev.salary.amount, clone.salary.amount
-    assert !clone.persisted?
+    dup = nil
+    assert_nothing_raised { dup = dev.dup }
+    assert_kind_of DeveloperSalary, dup.salary
+    assert_equal dev.salary.amount, dup.salary.amount
+    assert !dup.persisted?
 
-    # test if the attributes have been cloned
-    original_amount = clone.salary.amount
+    # test if the attributes have been dupd
+    original_amount = dup.salary.amount
     dev.salary.amount = 1
-    assert_equal original_amount, clone.salary.amount
+    assert_equal original_amount, dup.salary.amount
 
-    assert clone.save
-    assert clone.persisted?
-    assert_not_equal clone.id, dev.id
+    assert dup.save
+    assert dup.persisted?
+    assert_not_equal dup.id, dev.id
   end
 
   def test_dup_does_not_copy_associations
@@ -766,22 +766,22 @@ class BasicsTest < ActiveRecord::TestCase
     assert !cloned_developer.salary_changed?  # ... and cloned instance should behave same
   end
 
-  def test_clone_of_saved_object_marks_attributes_as_dirty
+  def test_dup_of_saved_object_marks_attributes_as_dirty
     developer = Developer.create! :name => 'Bjorn', :salary => 100000
     assert !developer.name_changed?
     assert !developer.salary_changed?
 
-    cloned_developer = developer.clone
+    cloned_developer = developer.dup
     assert cloned_developer.name_changed?     # both attributes differ from defaults
     assert cloned_developer.salary_changed?
   end
 
-  def test_clone_of_saved_object_marks_as_dirty_only_changed_attributes
+  def test_dup_of_saved_object_marks_as_dirty_only_changed_attributes
     developer = Developer.create! :name => 'Bjorn'
     assert !developer.name_changed?           # both attributes of saved object should be threated as not changed
     assert !developer.salary_changed?
 
-    cloned_developer = developer.clone
+    cloned_developer = developer.dup
     assert cloned_developer.name_changed?     # ... but on cloned object should be
     assert !cloned_developer.salary_changed?  # ... BUT salary has non-nil default which should be threated as not changed on cloned instance
   end
diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index b1a54af192..a6738fb654 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -338,13 +338,13 @@ class DirtyTest < ActiveRecord::TestCase
     assert !pirate.changed?
   end
 
-  def test_cloned_objects_should_not_copy_dirty_flag_from_creator
+  def test_dup_objects_should_not_copy_dirty_flag_from_creator
     pirate = Pirate.create!(:catchphrase => "shiver me timbers")
-    pirate_clone = pirate.clone
-    pirate_clone.reset_catchphrase!
+    pirate_dup = pirate.dup
+    pirate_dup.reset_catchphrase!
     pirate.catchphrase = "I love Rum"
     assert pirate.catchphrase_changed?
-    assert !pirate_clone.catchphrase_changed?
+    assert !pirate_dup.catchphrase_changed?
   end
 
   def test_reverted_changes_are_not_dirty
diff --git a/activerecord/test/cases/dup_test.rb b/activerecord/test/cases/dup_test.rb
index fa528c4936..768474e4ac 100644
--- a/activerecord/test/cases/dup_test.rb
+++ b/activerecord/test/cases/dup_test.rb
@@ -31,9 +31,12 @@ module ActiveRecord
     end
 
     def test_dup_with_changes
-      topic = Topic.first
-      topic.author_name = 'Aaron'
-      duped = topic.dup
+      dbtopic = Topic.first
+      topic = Topic.new
+
+      topic.attributes = dbtopic.attributes
+
+      duped = dbtopic.dup
       assert_equal topic.changes, duped.changes
     end
 
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index 31679b2efe..c3da9cdf53 100644
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -16,7 +16,7 @@ class InheritanceTest < ActiveRecord::TestCase
 
   def test_class_with_blank_sti_name
     company = Company.find(:first)
-    company = company.clone
+    company = company.dup
     company.extend(Module.new {
       def read_attribute(name)
         return '  ' if name == 'type'
-- 
cgit v1.2.3


From fe4388eb15d44612710f2fc2f81c90a890278b23 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 12:00:17 -0800
Subject: converting clone test to dup test

---
 activerecord/test/cases/autosave_association_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index b13cb2d7a2..fbf7121468 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -163,15 +163,15 @@ class TestDefaultAutosaveAssociationOnAHasOneAssociation < ActiveRecord::TestCas
     firm.account = Account.find(:first)
     assert_queries(Firm.partial_updates? ? 0 : 1) { firm.save! }
 
-    firm = Firm.find(:first).clone
+    firm = Firm.find(:first).dup
     firm.account = Account.find(:first)
     assert_queries(2) { firm.save! }
 
-    firm = Firm.find(:first).clone
-    firm.account = Account.find(:first).clone
+    firm = Firm.find(:first).dup
+    firm.account = Account.find(:first).dup
     assert_queries(2) { firm.save! }
   end
-  
+
   def test_callbacks_firing_order_on_create
     eye = Eye.create(:iris_attributes => {:color => 'honey'})
     assert_equal [true, false], eye.after_create_callbacks_stack
-- 
cgit v1.2.3


From d717cb29136b8e4f557e6f6ddf076ae3de8476fc Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 13:38:20 -0800
Subject: clone and dup are working on 1.8

---
 activerecord/test/cases/dup_test.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/dup_test.rb b/activerecord/test/cases/dup_test.rb
index 768474e4ac..a1fc639290 100644
--- a/activerecord/test/cases/dup_test.rb
+++ b/activerecord/test/cases/dup_test.rb
@@ -9,6 +9,21 @@ module ActiveRecord
       assert !Topic.new.freeze.dup.frozen?
     end
 
+    def test_not_readonly
+      topic = Topic.first
+
+      duped = topic.dup
+      assert !topic.readonly?, 'should not be readonly'
+    end
+
+    def test_is_readonly
+      topic = Topic.first
+      topic.readonly!
+
+      duped = topic.dup
+      assert topic.readonly?, 'should be readonly'
+    end
+
     def test_dup_not_persisted
       topic = Topic.first
       duped = topic.dup
-- 
cgit v1.2.3


From d33dcba72d19beffc4a359f2fb89659f24122e9a Mon Sep 17 00:00:00 2001
From: Neeraj Singh <neerajdotname@gmail.com>
Date: Tue, 23 Nov 2010 14:58:10 -0500
Subject: Do not send id for quoting twice if the primary key is string.

[#6022 state:resolved]
---
 activerecord/test/cases/relations_test.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 535bcd4396..1682f34a1d 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -14,11 +14,18 @@ require 'models/bird'
 require 'models/car'
 require 'models/engine'
 require 'models/tyre'
+require 'models/minivan'
 
 
 class RelationTest < ActiveRecord::TestCase
   fixtures :authors, :topics, :entrants, :developers, :companies, :developers_projects, :accounts, :categories, :categorizations, :posts, :comments,
-    :tags, :taggings, :cars
+    :tags, :taggings, :cars, :minivans
+
+  def test_do_not_double_quote_string_id
+    van = Minivan.last
+    assert van
+    assert_equal van.id, Minivan.where(:minivan_id => van).to_a.first.minivan_id
+  end
 
   def test_bind_values
     relation = Post.scoped
-- 
cgit v1.2.3


From a551d2ec62f205a755d3b760a9943f20addafe35 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Nov 2010 17:28:26 -0800
Subject: fixing variable names. oops!

---
 activerecord/test/cases/dup_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/dup_test.rb b/activerecord/test/cases/dup_test.rb
index a1fc639290..46abe7792c 100644
--- a/activerecord/test/cases/dup_test.rb
+++ b/activerecord/test/cases/dup_test.rb
@@ -13,7 +13,7 @@ module ActiveRecord
       topic = Topic.first
 
       duped = topic.dup
-      assert !topic.readonly?, 'should not be readonly'
+      assert !duped.readonly?, 'should not be readonly'
     end
 
     def test_is_readonly
@@ -21,7 +21,7 @@ module ActiveRecord
       topic.readonly!
 
       duped = topic.dup
-      assert topic.readonly?, 'should be readonly'
+      assert duped.readonly?, 'should be readonly'
     end
 
     def test_dup_not_persisted
-- 
cgit v1.2.3


From 47f39d26a76430ad50dae79f212d118849b2af40 Mon Sep 17 00:00:00 2001
From: Franck Verrot <franck@verrot.fr>
Date: Wed, 24 Nov 2010 16:32:02 +0800
Subject: Testing that dup is resetting the timestamps

---
 activerecord/test/cases/dup_test.rb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/dup_test.rb b/activerecord/test/cases/dup_test.rb
index 46abe7792c..0236f9b0a1 100644
--- a/activerecord/test/cases/dup_test.rb
+++ b/activerecord/test/cases/dup_test.rb
@@ -51,7 +51,12 @@ module ActiveRecord
 
       topic.attributes = dbtopic.attributes
 
+      #duped has no timestamp values
       duped = dbtopic.dup
+
+      #clear topic timestamp values
+      topic.send(:clear_timestamp_attributes)
+
       assert_equal topic.changes, duped.changes
     end
 
@@ -75,5 +80,24 @@ module ActiveRecord
       assert_equal 'Aaron', topic.author_name
       assert_equal 'meow', duped.author_name
     end
+
+    def test_dup_timestamps_are_cleared
+      topic = Topic.first
+      assert_not_nil topic.updated_at
+      assert_not_nil topic.created_at
+
+      # temporary change to the topic object
+      topic.updated_at -= 3.days
+
+      #dup should not preserve the timestamps if present
+      new_topic = topic.dup
+      assert_nil new_topic.updated_at
+      assert_nil new_topic.created_at
+
+      new_topic.save
+      assert_not_nil new_topic.updated_at
+      assert_not_nil new_topic.created_at
+    end
+
   end
 end
-- 
cgit v1.2.3


From 66212f69acc3d51af10ff76a18ff4c0bfa305ea5 Mon Sep 17 00:00:00 2001
From: Neeraj Singh <neerajdotname@gmail.com>
Date: Thu, 11 Nov 2010 11:41:15 -0500
Subject: If a nested_attribute is being marked for destruction and at the same
 time an attr_accessor value is being assigned then the value being assigned
 is being ignored. This patch is a fix for that issue.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[#5939 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activerecord/test/cases/nested_attributes_test.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 92af53d56f..fb6a239545 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -827,7 +827,7 @@ class TestNestedAttributesWithNonStandardPrimaryKeys < ActiveRecord::TestCase
   fixtures :owners, :pets
 
   def setup
-    Owner.accepts_nested_attributes_for :pets
+    Owner.accepts_nested_attributes_for :pets, :allow_destroy => true
 
     @owner = owners(:ashley)
     @pet1, @pet2 = pets(:chew), pets(:mochi)
@@ -844,6 +844,19 @@ class TestNestedAttributesWithNonStandardPrimaryKeys < ActiveRecord::TestCase
     @owner.update_attributes(@params)
     assert_equal ['Foo', 'Bar'], @owner.pets.map(&:name)
   end
+
+  def test_attr_accessor_of_child_should_be_value_provided_during_update_attributes
+    @owner = owners(:ashley)
+    @pet1 = pets(:chew)
+    assert_equal nil, $current_user
+    attributes = {:pets_attributes => { "1"=> { :id => @pet1.id,
+                                                :name => "Foo2",
+                                                :current_user => "John",
+                                                :_destroy=>true }}}
+    @owner.update_attributes(attributes)
+    assert_equal 'John', $after_destroy_callback_output
+  end
+
 end
 
 class TestHasOneAutosaveAssociationWhichItselfHasAutosaveAssociations < ActiveRecord::TestCase
-- 
cgit v1.2.3


From d8692985feb4db9fe8d113549535b658fe6058e5 Mon Sep 17 00:00:00 2001
From: raggi <jftucker@gmail.com>
Date: Thu, 25 Nov 2010 06:21:55 +0800
Subject: Don't depend on rubygems loading thread (for Mutex)

---
 activerecord/test/cases/locking_test.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index 4ddcdc010b..f9678cb0c5 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -1,3 +1,4 @@
+require 'thread'
 require "cases/helper"
 require 'models/person'
 require 'models/reader'
-- 
cgit v1.2.3


From 28896a9f4ae0830726619bc479f69263acb80e4b Mon Sep 17 00:00:00 2001
From: John Hawthorn <john.hawthorn@gmail.com>
Date: Sun, 28 Nov 2010 20:07:59 -0800
Subject: test case on has_one :through after a destroy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[#6037 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 .../associations/has_one_through_associations_test.rb   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_one_through_associations_test.rb b/activerecord/test/cases/associations/has_one_through_associations_test.rb
index 5d153147f5..ac43e571cb 100644
--- a/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -206,6 +206,23 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_through_belongs_to_after_destroy
+    @member_detail = MemberDetail.new(:extra_data => 'Extra')
+    @member.member_detail = @member_detail
+    @member.save!
+
+    assert_not_nil @member_detail.member_type
+    @member_detail.destroy
+    assert_queries(1) do
+      assert_not_nil @member_detail.member_type(true)
+    end
+
+    @member_detail.member.destroy
+    assert_queries(1) do
+      assert_nil @member_detail.member_type(true)
+    end
+  end
+
   def test_value_is_properly_quoted
     minivan = Minivan.find('m1')
     assert_nothing_raised do
-- 
cgit v1.2.3


From 9f2e885ce8d5cbf6999b22e274ec245d9007131d Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 29 Nov 2010 13:32:02 -0800
Subject: testing attributes applied by default_scope

---
 activerecord/test/cases/relation_scoping_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index dae9721a63..c7f7738248 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -464,6 +464,11 @@ class DefaultScopingTest < ActiveRecord::TestCase
     assert_equal 50000, PoorDeveloperCalledJamis.create!(:name => 'David').salary
   end
 
+  def test_default_scope_attribute
+    jamis = PoorDeveloperCalledJamis.new(:name => 'David')
+    assert_equal 50000, jamis.salary
+  end
+
   def test_scope_composed_by_limit_and_then_offset_is_equal_to_scope_composed_by_offset_and_then_limit
     posts_limit_offset = Post.limit(3).offset(2)
     posts_offset_limit = Post.offset(2).limit(3)
-- 
cgit v1.2.3


From 76a15dd0599779f86bda063bb545bba68c6ff17b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 29 Nov 2010 16:41:02 -0800
Subject: adding more tests surrounding where values hash

---
 activerecord/test/cases/relation_scoping_test.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index c7f7738248..1678e631e5 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -469,6 +469,17 @@ class DefaultScopingTest < ActiveRecord::TestCase
     assert_equal 50000, jamis.salary
   end
 
+  def test_where_attribute
+    aaron = PoorDeveloperCalledJamis.where(:salary => 20).new(:name => 'Aaron')
+    assert_equal 20, aaron.salary
+    assert_equal 'Aaron', aaron.name
+  end
+
+  def test_where_attribute_merge
+    aaron = PoorDeveloperCalledJamis.where(:name => 'foo').new(:name => 'Aaron')
+    assert_equal 'Aaron', aaron.name
+  end
+
   def test_scope_composed_by_limit_and_then_offset_is_equal_to_scope_composed_by_offset_and_then_limit
     posts_limit_offset = Post.limit(3).offset(2)
     posts_offset_limit = Post.offset(2).limit(3)
-- 
cgit v1.2.3


From b7a9890d7765a0a6edc1161f58304386266bdf2e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 30 Nov 2010 13:38:48 -0800
Subject: fix whitespace errors

---
 activerecord/test/cases/connection_pool_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index f0ec5c751c..2e18117895 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -38,9 +38,9 @@ module ActiveRecord
             assert_not_nil connection
           end
         end
-        
+
         threads.each {|t| t.join}
-        
+
         Thread.new do
           threads.each do |t|
             thread_ids = pool.instance_variable_get(:@reserved_connections).keys
-- 
cgit v1.2.3


From bfc398cb7083c41becf6e4938c0a80a6659a1caa Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 30 Nov 2010 14:10:55 -0800
Subject: adding a test for ActiveRecord::Relation

---
 activerecord/test/cases/relation_test.rb | 56 ++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 activerecord/test/cases/relation_test.rb

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
new file mode 100644
index 0000000000..96856ac22b
--- /dev/null
+++ b/activerecord/test/cases/relation_test.rb
@@ -0,0 +1,56 @@
+require "cases/helper"
+
+module ActiveRecord
+  class RelationTest < ActiveRecord::TestCase
+    def test_construction
+      relation = nil
+      assert_nothing_raised do
+        relation = Relation.new :a, :b
+      end
+      assert_equal :a, relation.klass
+      assert_equal :b, relation.table
+      assert !relation.loaded, 'relation is not loaded'
+    end
+
+    def test_single_values
+      assert_equal [:limit, :offset, :lock, :readonly, :create_with, :from].sort,
+        Relation::SINGLE_VALUE_METHODS.sort
+    end
+
+    def test_initialize_single_values
+      relation = Relation.new :a, :b
+      Relation::SINGLE_VALUE_METHODS.each do |method|
+        assert_nil relation.send("#{method}_value"), method.to_s
+      end
+    end
+
+    def test_association_methods
+      assert_equal [:includes, :eager_load, :preload].sort,
+        Relation::ASSOCIATION_METHODS.sort
+    end
+
+    def test_initialize_association_methods
+      relation = Relation.new :a, :b
+      Relation::ASSOCIATION_METHODS.each do |method|
+        assert_equal [], relation.send("#{method}_values"), method.to_s
+      end
+    end
+
+    def test_multi_value_methods
+      assert_equal [:select, :group, :order, :joins, :where, :having, :bind].sort,
+        Relation::MULTI_VALUE_METHODS.sort
+    end
+
+    def test_multi_value_initialize
+      relation = Relation.new :a, :b
+      Relation::MULTI_VALUE_METHODS.each do |method|
+        assert_equal [], relation.send("#{method}_values"), method.to_s
+      end
+    end
+
+    def test_extensions
+      relation = Relation.new :a, :b
+      assert_equal [], relation.extensions
+    end
+  end
+end
-- 
cgit v1.2.3


From 6c32290bac460ce53ea2d29b50047248f9f0de92 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 30 Nov 2010 14:29:35 -0800
Subject: testing Relation#table_name

---
 activerecord/test/cases/relation_test.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 96856ac22b..3629f6f806 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -2,6 +2,9 @@ require "cases/helper"
 
 module ActiveRecord
   class RelationTest < ActiveRecord::TestCase
+    class FakeTable < Struct.new(:table_name)
+    end
+
     def test_construction
       relation = nil
       assert_nothing_raised do
@@ -52,5 +55,23 @@ module ActiveRecord
       relation = Relation.new :a, :b
       assert_equal [], relation.extensions
     end
+
+    def test_where_values_hash
+      relation = Relation.new :a, :b
+      assert_equal({}, relation.where_values_hash)
+
+      relation.where_values << :hello
+      assert_equal({}, relation.where_values_hash)
+    end
+
+    def test_table_name_delegates_to_klass
+      relation = Relation.new FakeTable.new('foo'), :b
+      assert_equal 'foo', relation.table_name
+    end
+
+    def test_scope_for_create
+      relation = Relation.new :a, :b
+      assert_equal({}, relation.scope_for_create)
+    end
   end
 end
-- 
cgit v1.2.3


From 795dc3d15fee02c9ccc9da08c8fcee0830a4962a Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 30 Nov 2010 14:47:55 -0800
Subject: adding more tests surrounding where_values_hash

---
 activerecord/test/cases/relation_test.rb | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 3629f6f806..cc2c2c1446 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -1,8 +1,12 @@
 require "cases/helper"
+require 'models/post'
+require 'models/comment'
 
 module ActiveRecord
   class RelationTest < ActiveRecord::TestCase
-    class FakeTable < Struct.new(:table_name)
+    fixtures :posts, :comments
+
+    class FakeKlass < Struct.new(:table_name)
     end
 
     def test_construction
@@ -56,7 +60,7 @@ module ActiveRecord
       assert_equal [], relation.extensions
     end
 
-    def test_where_values_hash
+    def test_empty_where_values_hash
       relation = Relation.new :a, :b
       assert_equal({}, relation.where_values_hash)
 
@@ -64,8 +68,20 @@ module ActiveRecord
       assert_equal({}, relation.where_values_hash)
     end
 
+    def test_has_values
+      relation = Relation.new Post, Post.arel_table
+      relation.where_values << relation.table[:id].eq(10)
+      assert_equal({:id => 10}, relation.where_values_hash)
+    end
+
+    def test_values_wrong_table
+      relation = Relation.new Post, Post.arel_table
+      relation.where_values << Comment.arel_table[:id].eq(10)
+      assert_equal({}, relation.where_values_hash)
+    end
+
     def test_table_name_delegates_to_klass
-      relation = Relation.new FakeTable.new('foo'), :b
+      relation = Relation.new FakeKlass.new('foo'), :b
       assert_equal 'foo', relation.table_name
     end
 
-- 
cgit v1.2.3


From 3ad0779e566067f26422a74f108d81ac458e4333 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 30 Nov 2010 14:56:32 -0800
Subject: testing combined nodes are not traversed

---
 activerecord/test/cases/relation_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index cc2c2c1446..a9244ae65e 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -80,6 +80,15 @@ module ActiveRecord
       assert_equal({}, relation.where_values_hash)
     end
 
+    def test_tree_is_not_traversed
+      relation = Relation.new Post, Post.arel_table
+      left     = relation.table[:id].eq(10)
+      right    = relation.table[:id].eq(10)
+      combine  = left.and right
+      relation.where_values << combine
+      assert_equal({}, relation.where_values_hash)
+    end
+
     def test_table_name_delegates_to_klass
       relation = Relation.new FakeKlass.new('foo'), :b
       assert_equal 'foo', relation.table_name
-- 
cgit v1.2.3


From dccf624b643398afdf1b0e048e57f04cb182c55e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 30 Nov 2010 15:20:27 -0800
Subject: Ruby 1.8, how does it work?

---
 activerecord/test/cases/relation_test.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index a9244ae65e..02de0398aa 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -20,8 +20,8 @@ module ActiveRecord
     end
 
     def test_single_values
-      assert_equal [:limit, :offset, :lock, :readonly, :create_with, :from].sort,
-        Relation::SINGLE_VALUE_METHODS.sort
+      assert_equal [:limit, :offset, :lock, :readonly, :create_with, :from].map(&:to_s).sort,
+        Relation::SINGLE_VALUE_METHODS.map(&:to_s).sort
     end
 
     def test_initialize_single_values
@@ -32,8 +32,8 @@ module ActiveRecord
     end
 
     def test_association_methods
-      assert_equal [:includes, :eager_load, :preload].sort,
-        Relation::ASSOCIATION_METHODS.sort
+      assert_equal [:includes, :eager_load, :preload].map(&:to_s).sort,
+        Relation::ASSOCIATION_METHODS.map(&:to_s).sort
     end
 
     def test_initialize_association_methods
@@ -44,8 +44,8 @@ module ActiveRecord
     end
 
     def test_multi_value_methods
-      assert_equal [:select, :group, :order, :joins, :where, :having, :bind].sort,
-        Relation::MULTI_VALUE_METHODS.sort
+      assert_equal [:select, :group, :order, :joins, :where, :having, :bind].map(&:to_s).sort,
+        Relation::MULTI_VALUE_METHODS.map(&:to_s).sort
     end
 
     def test_multi_value_initialize
-- 
cgit v1.2.3


From b2e7d1e41ec1d40c35aeb201720dfec413c8f95a Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 30 Nov 2010 15:44:30 -0800
Subject: surrounding scope_for_create behavior

---
 activerecord/test/cases/relation_test.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 02de0398aa..31d2020acd 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -98,5 +98,19 @@ module ActiveRecord
       relation = Relation.new :a, :b
       assert_equal({}, relation.scope_for_create)
     end
+
+    def test_create_with_value
+      relation = Relation.new Post, Post.arel_table
+      hash = { :hello => 'world' }
+      relation.create_with_value = hash
+      assert_equal hash, relation.scope_for_create
+    end
+
+    def test_create_with_value_with_wheres
+      relation = Relation.new Post, Post.arel_table
+      relation.where_values << relation.table[:id].eq(10)
+      relation.create_with_value = {:hello => 'world'}
+      assert_equal({:hello => 'world', :id => 10}, relation.scope_for_create)
+    end
   end
 end
-- 
cgit v1.2.3


From b293ab7c618f65e06371e9ae7b00fe2a65082209 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 30 Nov 2010 15:45:32 -0800
Subject: making sure scope_for_create value is cached

---
 activerecord/test/cases/relation_test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 31d2020acd..3cc31b3db0 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -112,5 +112,17 @@ module ActiveRecord
       relation.create_with_value = {:hello => 'world'}
       assert_equal({:hello => 'world', :id => 10}, relation.scope_for_create)
     end
+
+    # FIXME: is this really wanted or expected behavior?
+    def test_scope_for_create_is_cached
+      relation = Relation.new Post, Post.arel_table
+      assert_equal({}, relation.scope_for_create)
+
+      relation.where_values << relation.table[:id].eq(10)
+      assert_equal({}, relation.scope_for_create)
+
+      relation.create_with_value = {:hello => 'world'}
+      assert_equal({}, relation.scope_for_create)
+    end
   end
 end
-- 
cgit v1.2.3


From 22b01c52c7cccdaa7f4fbed2a66c38a4c5416c6e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 30 Nov 2010 16:10:49 -0800
Subject: isolating eager_loading? method

---
 activerecord/test/cases/relation_test.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 3cc31b3db0..7bdbd773b6 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -124,5 +124,16 @@ module ActiveRecord
       relation.create_with_value = {:hello => 'world'}
       assert_equal({}, relation.scope_for_create)
     end
+
+    def test_empty_eager_loading?
+      relation = Relation.new :a, :b
+      assert !relation.eager_loading?
+    end
+
+    def test_eager_load_values
+      relation = Relation.new :a, :b
+      relation.eager_load_values << :b
+      assert relation.eager_loading?
+    end
   end
 end
-- 
cgit v1.2.3


From 542cb5c327f92d3f6ae6159a54e86949441f095e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 30 Nov 2010 18:46:56 -0800
Subject: fix warnings, stop using global variables

---
 activerecord/test/cases/nested_attributes_test.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index fb6a239545..ffcc7a081a 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -848,13 +848,12 @@ class TestNestedAttributesWithNonStandardPrimaryKeys < ActiveRecord::TestCase
   def test_attr_accessor_of_child_should_be_value_provided_during_update_attributes
     @owner = owners(:ashley)
     @pet1 = pets(:chew)
-    assert_equal nil, $current_user
     attributes = {:pets_attributes => { "1"=> { :id => @pet1.id,
                                                 :name => "Foo2",
                                                 :current_user => "John",
                                                 :_destroy=>true }}}
     @owner.update_attributes(attributes)
-    assert_equal 'John', $after_destroy_callback_output
+    assert_equal 'John', Pet.after_destroy_output
   end
 
 end
-- 
cgit v1.2.3


From c283cdd63cafdb04784cfcc5094da41c9268c20c Mon Sep 17 00:00:00 2001
From: Josh Susser <josh@hasmanythrough.com>
Date: Mon, 15 Mar 2010 00:53:57 -0700
Subject: Add migrated_at column to schema_migrations table.

---
 activerecord/test/cases/migration_test.rb | 36 +++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 3037d73a1b..55a24a94f3 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -27,22 +27,46 @@ if ActiveRecord::Base.connection.supports_migrations?
   end
 
   class MigrationTableAndIndexTest < ActiveRecord::TestCase
-    def test_add_schema_info_respects_prefix_and_suffix
-      conn = ActiveRecord::Base.connection
+    def setup
+      @conn = ActiveRecord::Base.connection
+      @conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if @conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+    end
 
-      conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+    def test_add_schema_migrations_respects_prefix_and_suffix
       # Use shorter prefix and suffix as in Oracle database identifier cannot be larger than 30 characters
       ActiveRecord::Base.table_name_prefix = 'p_'
       ActiveRecord::Base.table_name_suffix = '_s'
-      conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+      @conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if @conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
 
-      conn.initialize_schema_migrations_table
+      @conn.initialize_schema_migrations_table
 
-      assert_equal "p_unique_schema_migrations_s", conn.indexes(ActiveRecord::Migrator.schema_migrations_table_name)[0][:name]
+      assert_equal "p_unique_schema_migrations_s", @conn.indexes(ActiveRecord::Migrator.schema_migrations_table_name)[0][:name]
     ensure
       ActiveRecord::Base.table_name_prefix = ""
       ActiveRecord::Base.table_name_suffix = ""
     end
+
+    def test_schema_migrations_columns
+      @conn.initialize_schema_migrations_table
+
+      columns =  @conn.columns(ActiveRecord::Migrator.schema_migrations_table_name).collect(&:name)
+      %w[version migrated_at].each { |col| assert columns.include?(col) }
+    end
+
+    def test_add_migrated_at_to_exisiting_schema_migrations
+      sm_table = ActiveRecord::Migrator.schema_migrations_table_name
+      @conn.create_table(sm_table, :id => false) do |schema_migrations_table|
+              schema_migrations_table.column :version, :string, :null => false
+            end
+      @conn.insert "INSERT INTO #{@conn.quote_table_name(sm_table)} (version) VALUES (100)"
+      @conn.insert "INSERT INTO #{@conn.quote_table_name(sm_table)} (version) VALUES (200)"
+
+      @conn.initialize_schema_migrations_table
+
+      m_ats = @conn.select_values("SELECT migrated_at FROM #{@conn.quote_table_name(sm_table)}")
+      assert_equal 2, m_ats.length
+      assert_equal 2, m_ats.compact.length
+    end
   end
 
   class MigrationTest < ActiveRecord::TestCase
-- 
cgit v1.2.3


From 4e4e9ad48a222ac94a904c62ae684c609bd8e177 Mon Sep 17 00:00:00 2001
From: Josh Susser <josh@hasmanythrough.com>
Date: Tue, 16 Mar 2010 23:02:03 -0700
Subject: record migration timestamp when migrations run

---
 activerecord/test/cases/migration_test.rb | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 55a24a94f3..e76097d42d 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -445,6 +445,43 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.drop_table table_name rescue nil
     end
 
+    def test_create_table_with_custom_sequence_name
+      return unless current_adapter? :OracleAdapter
+
+      # table name is 29 chars, the standard sequence name will
+      # be 33 chars and fail
+      assert_raise(ActiveRecord::StatementInvalid) do
+        begin
+          Person.connection.create_table :table_with_name_thats_just_ok do |t|
+            t.column :foo, :string, :null => false
+          end
+        ensure
+          Person.connection.drop_table :table_with_name_thats_just_ok rescue nil
+        end
+      end
+
+      # should be all good w/ a custom sequence name
+      assert_nothing_raised do
+        begin
+          Person.connection.create_table :table_with_name_thats_just_ok,
+                                         :sequence_name => 'suitably_short_seq' do |t|
+            t.column :foo, :string, :null => false
+          end
+
+          Person.connection.execute("select suitably_short_seq.nextval from dual")
+
+        ensure
+          Person.connection.drop_table :table_with_name_thats_just_ok,
+                                       :sequence_name => 'suitably_short_seq' rescue nil
+        end
+      end
+
+      # confirm the custom sequence got dropped
+      assert_raise(ActiveRecord::StatementInvalid) do
+        Person.connection.execute("select suitably_short_seq.nextval from dual")
+      end
+    end
+
     # Sybase, and SQLite3 will not allow you to add a NOT NULL
     # column to a table without a default value.
     unless current_adapter?(:SybaseAdapter, :SQLite3Adapter)
@@ -1462,6 +1499,17 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Base.table_name_suffix = ""
     end
 
+    def test_migration_row_includes_timestamp
+      conn = ActiveRecord::Base.connection
+      sm_table = ActiveRecord::Migrator.schema_migrations_table_name
+
+      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
+
+      conn.select_all("SELECT * FROM #{conn.quote_table_name(sm_table)}").each do |row|
+        assert_match /^2\d\d\d-/, row["migrated_at"], "missing migrated_at"
+      end
+    end
+
     def test_proper_table_name
       assert_equal "table", ActiveRecord::Migrator.proper_table_name('table')
       assert_equal "table", ActiveRecord::Migrator.proper_table_name(:table)
@@ -2117,4 +2165,3 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
   end
 end
-
-- 
cgit v1.2.3


From 7139aa878ceea8dd17a60955cd4d07f5f68980d9 Mon Sep 17 00:00:00 2001
From: Josh Susser <josh@hasmanythrough.com>
Date: Sat, 20 Mar 2010 18:26:12 -0700
Subject: name in schema_migrations, migrations in schema dump

---
 activerecord/test/cases/ar_schema_test.rb     | 23 +++++++++++++++++++++++
 activerecord/test/cases/migration_test.rb     | 20 ++++++++++++--------
 activerecord/test/cases/schema_dumper_test.rb | 15 +++++++++++++++
 3 files changed, 50 insertions(+), 8 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index 588adc38e3..e7f3907ff5 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -39,4 +39,27 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
   end
 
+  class ActiveRecordSchemaMigrationsTest < ActiveRecordSchemaTest
+    def setup
+      super
+      @sm_table = ActiveRecord::Migrator.schema_migrations_table_name
+      @connection.execute "DELETE FROM #{@connection.quote_table_name(@sm_table)}"
+    end
+
+    def test_migration_adds_row_to_migrations_table
+      ActiveRecord::Schema.migration("123001")
+      ActiveRecord::Schema.migration("123002", "add_magic_power_to_unicorns")
+      rows = @connection.select_all("SELECT * FROM #{@connection.quote_table_name(@sm_table)}")
+      assert_equal 2, rows.length
+
+      assert_equal "123001", rows[0]["version"]
+      assert_equal "", rows[0]["name"]
+      assert_match /^2\d\d\d-/, rows[0]["migrated_at"]
+
+      assert_equal "123002", rows[1]["version"]
+      assert_equal "add_magic_power_to_unicorns", rows[1]["name"]
+      assert_match /^2\d\d\d-/, rows[1]["migrated_at"]
+    end
+  end
+
 end
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index e76097d42d..497391e713 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -50,10 +50,10 @@ if ActiveRecord::Base.connection.supports_migrations?
       @conn.initialize_schema_migrations_table
 
       columns =  @conn.columns(ActiveRecord::Migrator.schema_migrations_table_name).collect(&:name)
-      %w[version migrated_at].each { |col| assert columns.include?(col) }
+      %w[version name migrated_at].each { |col| assert columns.include?(col) }
     end
 
-    def test_add_migrated_at_to_exisiting_schema_migrations
+    def test_add_name_and_migrated_at_to_exisiting_schema_migrations
       sm_table = ActiveRecord::Migrator.schema_migrations_table_name
       @conn.create_table(sm_table, :id => false) do |schema_migrations_table|
               schema_migrations_table.column :version, :string, :null => false
@@ -63,9 +63,9 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       @conn.initialize_schema_migrations_table
 
-      m_ats = @conn.select_values("SELECT migrated_at FROM #{@conn.quote_table_name(sm_table)}")
-      assert_equal 2, m_ats.length
-      assert_equal 2, m_ats.compact.length
+      rows = @conn.select_all("SELECT * FROM #{@conn.quote_table_name(sm_table)}")
+      assert rows[0].has_key?("name")
+      assert rows[0].has_key?("migrated_at")
     end
   end
 
@@ -1499,15 +1499,19 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Base.table_name_suffix = ""
     end
 
-    def test_migration_row_includes_timestamp
+    def test_migration_row_includes_name_and_timestamp
       conn = ActiveRecord::Base.connection
       sm_table = ActiveRecord::Migrator.schema_migrations_table_name
 
       ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
 
-      conn.select_all("SELECT * FROM #{conn.quote_table_name(sm_table)}").each do |row|
-        assert_match /^2\d\d\d-/, row["migrated_at"], "missing migrated_at"
+      rows = conn.select_all("SELECT * FROM #{conn.quote_table_name(sm_table)}")
+      rows.each do |row|
+        assert_match( /^2\d\d\d-/, row["migrated_at"], "missing migrated_at" )
       end
+      assert_equal "people_have_last_names",  rows[0]["name"]
+      assert_equal "we_need_reminders",       rows[1]["name"]
+      assert_equal "innocent_jointable",      rows[2]["name"]
     end
 
     def test_proper_table_name
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index 9b2c7c00df..fdcf1b5cd4 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -17,6 +17,21 @@ class SchemaDumperTest < ActiveRecord::TestCase
     assert_no_match %r{create_table "schema_migrations"}, output
   end
 
+  def test_schema_dump_includes_migrations
+    conn = ActiveRecord::Base.connection
+    sm_table = ActiveRecord::Migrator.schema_migrations_table_name
+    conn.execute "DELETE FROM #{conn.quote_table_name(sm_table)}"
+    conn.remove_column "people", "last_name" rescue nil
+    conn.drop_table "reminders" rescue nil
+    conn.drop_table "people_reminders" rescue nil
+    ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
+
+    output = standard_dump
+    assert_match %r{migration "1", "people_have_last_names"}, output
+    assert_match %r{migration "2", "we_need_reminders"}, output
+    assert_match %r{migration "3", "innocent_jointable"}, output
+  end
+
   def test_schema_dump_excludes_sqlite_sequence
     output = standard_dump
     assert_no_match %r{create_table "sqlite_sequence"}, output
-- 
cgit v1.2.3


From b07c2c0fd3130bb69cf8d846e46762a7c3972107 Mon Sep 17 00:00:00 2001
From: Josh Susser <josh@hasmanythrough.com>
Date: Sat, 20 Mar 2010 19:46:17 -0700
Subject: clear schema_migrations in Schema.define

---
 activerecord/test/cases/ar_schema_test.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index e7f3907ff5..930a57330d 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -60,6 +60,17 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal "add_magic_power_to_unicorns", rows[1]["name"]
       assert_match /^2\d\d\d-/, rows[1]["migrated_at"]
     end
+
+    def test_define_clears_schema_migrations
+      assert_nothing_raised do
+        ActiveRecord::Schema.define do
+          migration("123001")
+        end
+        ActiveRecord::Schema.define do
+          migration("123001")
+        end
+      end
+    end
   end
 
 end
-- 
cgit v1.2.3


From a49de9811ab4cf39fbdb5a6941ee003b1e489184 Mon Sep 17 00:00:00 2001
From: Josh Susser <josh@hasmanythrough.com>
Date: Wed, 1 Dec 2010 11:56:21 -0800
Subject: tests mostly pass

adjust to work with instance-based migations
migrated_at can't be null
why must people have last names? it's killing me!
---
 activerecord/test/cases/ar_schema_test.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index 930a57330d..28f219e213 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -47,8 +47,9 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
 
     def test_migration_adds_row_to_migrations_table
-      ActiveRecord::Schema.migration("123001")
-      ActiveRecord::Schema.migration("123002", "add_magic_power_to_unicorns")
+      schema = ActiveRecord::Schema.new
+      schema.migration("123001")
+      schema.migration("123002", "add_magic_power_to_unicorns")
       rows = @connection.select_all("SELECT * FROM #{@connection.quote_table_name(@sm_table)}")
       assert_equal 2, rows.length
 
-- 
cgit v1.2.3


From c266a6bf0f219f211979b67396750fc9071b0391 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 1 Dec 2010 14:33:59 -0800
Subject: fixing tests and warnings

---
 activerecord/test/cases/ar_schema_test.rb     | 4 ++--
 activerecord/test/cases/schema_dumper_test.rb | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index 28f219e213..e007c12c33 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -55,11 +55,11 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       assert_equal "123001", rows[0]["version"]
       assert_equal "", rows[0]["name"]
-      assert_match /^2\d\d\d-/, rows[0]["migrated_at"]
+      assert_match(/^2\d\d\d-/, rows[0]["migrated_at"])
 
       assert_equal "123002", rows[1]["version"]
       assert_equal "add_magic_power_to_unicorns", rows[1]["name"]
-      assert_match /^2\d\d\d-/, rows[1]["migrated_at"]
+      assert_match(/^2\d\d\d-/, rows[1]["migrated_at"])
     end
 
     def test_define_clears_schema_migrations
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index fdcf1b5cd4..7914ee0a6f 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -18,6 +18,10 @@ class SchemaDumperTest < ActiveRecord::TestCase
   end
 
   def test_schema_dump_includes_migrations
+    $".delete_if do |fname|
+      fname == (MIGRATIONS_ROOT + "/valid/1_people_have_last_names.rb")
+    end
+
     conn = ActiveRecord::Base.connection
     sm_table = ActiveRecord::Migrator.schema_migrations_table_name
     conn.execute "DELETE FROM #{conn.quote_table_name(sm_table)}"
-- 
cgit v1.2.3


From 7d2179608c21f1a36a3d0392f251b1ef7a2cf377 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 1 Dec 2010 14:59:17 -0800
Subject: not all databases return dates as strings

---
 activerecord/test/cases/ar_schema_test.rb | 4 ++--
 activerecord/test/cases/migration_test.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index e007c12c33..cab27167b7 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -55,11 +55,11 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       assert_equal "123001", rows[0]["version"]
       assert_equal "", rows[0]["name"]
-      assert_match(/^2\d\d\d-/, rows[0]["migrated_at"])
+      assert_match(/^2\d\d\d-/, rows[0]["migrated_at"].to_s)
 
       assert_equal "123002", rows[1]["version"]
       assert_equal "add_magic_power_to_unicorns", rows[1]["name"]
-      assert_match(/^2\d\d\d-/, rows[1]["migrated_at"])
+      assert_match(/^2\d\d\d-/, rows[1]["migrated_at"].to_s)
     end
 
     def test_define_clears_schema_migrations
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 497391e713..37b2fea275 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1507,7 +1507,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       rows = conn.select_all("SELECT * FROM #{conn.quote_table_name(sm_table)}")
       rows.each do |row|
-        assert_match( /^2\d\d\d-/, row["migrated_at"], "missing migrated_at" )
+        assert_match(/^2\d\d\d-/, row["migrated_at"].to_s, "missing migrated_at")
       end
       assert_equal "people_have_last_names",  rows[0]["name"]
       assert_equal "we_need_reminders",       rows[1]["name"]
-- 
cgit v1.2.3


From 4232454289ec12f8b21a22f764848263acd7af26 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 1 Dec 2010 15:07:44 -0800
Subject: make sure we have a value in migrated_at

---
 activerecord/test/cases/migration_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 37b2fea275..eed35e83f1 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1507,7 +1507,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       rows = conn.select_all("SELECT * FROM #{conn.quote_table_name(sm_table)}")
       rows.each do |row|
-        assert_match(/^2\d\d\d-/, row["migrated_at"].to_s, "missing migrated_at")
+        assert_not_nil(row["migrated_at"], "missing migrated_at")
       end
       assert_equal "people_have_last_names",  rows[0]["name"]
       assert_equal "we_need_reminders",       rows[1]["name"]
-- 
cgit v1.2.3


From 85a5318c2b03bd4a9b5e7ce096207a3a9f052419 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 1 Dec 2010 15:14:10 -0800
Subject: should not to_s the possibly nil value

---
 activerecord/test/cases/ar_schema_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index cab27167b7..df51a6e4ba 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -55,11 +55,11 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       assert_equal "123001", rows[0]["version"]
       assert_equal "", rows[0]["name"]
-      assert_match(/^2\d\d\d-/, rows[0]["migrated_at"].to_s)
+      assert_not_nil(rows[0]["migrated_at"])
 
       assert_equal "123002", rows[1]["version"]
       assert_equal "add_magic_power_to_unicorns", rows[1]["name"]
-      assert_match(/^2\d\d\d-/, rows[1]["migrated_at"].to_s)
+      assert_not_nil(rows[1]["migrated_at"])
     end
 
     def test_define_clears_schema_migrations
-- 
cgit v1.2.3


From c15c14563e6604aab232336b16e14f1f235cc19d Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 1 Dec 2010 15:14:56 -0800
Subject: removing duplicate test

---
 activerecord/test/cases/migration_test.rb | 37 -------------------------------
 1 file changed, 37 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index eed35e83f1..b698a5a3cf 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -445,43 +445,6 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.drop_table table_name rescue nil
     end
 
-    def test_create_table_with_custom_sequence_name
-      return unless current_adapter? :OracleAdapter
-
-      # table name is 29 chars, the standard sequence name will
-      # be 33 chars and fail
-      assert_raise(ActiveRecord::StatementInvalid) do
-        begin
-          Person.connection.create_table :table_with_name_thats_just_ok do |t|
-            t.column :foo, :string, :null => false
-          end
-        ensure
-          Person.connection.drop_table :table_with_name_thats_just_ok rescue nil
-        end
-      end
-
-      # should be all good w/ a custom sequence name
-      assert_nothing_raised do
-        begin
-          Person.connection.create_table :table_with_name_thats_just_ok,
-                                         :sequence_name => 'suitably_short_seq' do |t|
-            t.column :foo, :string, :null => false
-          end
-
-          Person.connection.execute("select suitably_short_seq.nextval from dual")
-
-        ensure
-          Person.connection.drop_table :table_with_name_thats_just_ok,
-                                       :sequence_name => 'suitably_short_seq' rescue nil
-        end
-      end
-
-      # confirm the custom sequence got dropped
-      assert_raise(ActiveRecord::StatementInvalid) do
-        Person.connection.execute("select suitably_short_seq.nextval from dual")
-      end
-    end
-
     # Sybase, and SQLite3 will not allow you to add a NOT NULL
     # column to a table without a default value.
     unless current_adapter?(:SybaseAdapter, :SQLite3Adapter)
-- 
cgit v1.2.3


From 3ec212e3c9c815e9993cbea409c60774ea75cd30 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 1 Dec 2010 17:08:01 -0800
Subject: rolling out migrated_at until I can fix the build

---
 activerecord/test/cases/ar_schema_test.rb     | 35 ------------------
 activerecord/test/cases/migration_test.rb     | 52 ++++-----------------------
 activerecord/test/cases/schema_dumper_test.rb | 19 ----------
 3 files changed, 7 insertions(+), 99 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index df51a6e4ba..588adc38e3 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -39,39 +39,4 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
   end
 
-  class ActiveRecordSchemaMigrationsTest < ActiveRecordSchemaTest
-    def setup
-      super
-      @sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-      @connection.execute "DELETE FROM #{@connection.quote_table_name(@sm_table)}"
-    end
-
-    def test_migration_adds_row_to_migrations_table
-      schema = ActiveRecord::Schema.new
-      schema.migration("123001")
-      schema.migration("123002", "add_magic_power_to_unicorns")
-      rows = @connection.select_all("SELECT * FROM #{@connection.quote_table_name(@sm_table)}")
-      assert_equal 2, rows.length
-
-      assert_equal "123001", rows[0]["version"]
-      assert_equal "", rows[0]["name"]
-      assert_not_nil(rows[0]["migrated_at"])
-
-      assert_equal "123002", rows[1]["version"]
-      assert_equal "add_magic_power_to_unicorns", rows[1]["name"]
-      assert_not_nil(rows[1]["migrated_at"])
-    end
-
-    def test_define_clears_schema_migrations
-      assert_nothing_raised do
-        ActiveRecord::Schema.define do
-          migration("123001")
-        end
-        ActiveRecord::Schema.define do
-          migration("123001")
-        end
-      end
-    end
-  end
-
 end
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index b698a5a3cf..3037d73a1b 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -27,46 +27,22 @@ if ActiveRecord::Base.connection.supports_migrations?
   end
 
   class MigrationTableAndIndexTest < ActiveRecord::TestCase
-    def setup
-      @conn = ActiveRecord::Base.connection
-      @conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if @conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
-    end
+    def test_add_schema_info_respects_prefix_and_suffix
+      conn = ActiveRecord::Base.connection
 
-    def test_add_schema_migrations_respects_prefix_and_suffix
+      conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
       # Use shorter prefix and suffix as in Oracle database identifier cannot be larger than 30 characters
       ActiveRecord::Base.table_name_prefix = 'p_'
       ActiveRecord::Base.table_name_suffix = '_s'
-      @conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if @conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+      conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
 
-      @conn.initialize_schema_migrations_table
+      conn.initialize_schema_migrations_table
 
-      assert_equal "p_unique_schema_migrations_s", @conn.indexes(ActiveRecord::Migrator.schema_migrations_table_name)[0][:name]
+      assert_equal "p_unique_schema_migrations_s", conn.indexes(ActiveRecord::Migrator.schema_migrations_table_name)[0][:name]
     ensure
       ActiveRecord::Base.table_name_prefix = ""
       ActiveRecord::Base.table_name_suffix = ""
     end
-
-    def test_schema_migrations_columns
-      @conn.initialize_schema_migrations_table
-
-      columns =  @conn.columns(ActiveRecord::Migrator.schema_migrations_table_name).collect(&:name)
-      %w[version name migrated_at].each { |col| assert columns.include?(col) }
-    end
-
-    def test_add_name_and_migrated_at_to_exisiting_schema_migrations
-      sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-      @conn.create_table(sm_table, :id => false) do |schema_migrations_table|
-              schema_migrations_table.column :version, :string, :null => false
-            end
-      @conn.insert "INSERT INTO #{@conn.quote_table_name(sm_table)} (version) VALUES (100)"
-      @conn.insert "INSERT INTO #{@conn.quote_table_name(sm_table)} (version) VALUES (200)"
-
-      @conn.initialize_schema_migrations_table
-
-      rows = @conn.select_all("SELECT * FROM #{@conn.quote_table_name(sm_table)}")
-      assert rows[0].has_key?("name")
-      assert rows[0].has_key?("migrated_at")
-    end
   end
 
   class MigrationTest < ActiveRecord::TestCase
@@ -1462,21 +1438,6 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Base.table_name_suffix = ""
     end
 
-    def test_migration_row_includes_name_and_timestamp
-      conn = ActiveRecord::Base.connection
-      sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
-
-      rows = conn.select_all("SELECT * FROM #{conn.quote_table_name(sm_table)}")
-      rows.each do |row|
-        assert_not_nil(row["migrated_at"], "missing migrated_at")
-      end
-      assert_equal "people_have_last_names",  rows[0]["name"]
-      assert_equal "we_need_reminders",       rows[1]["name"]
-      assert_equal "innocent_jointable",      rows[2]["name"]
-    end
-
     def test_proper_table_name
       assert_equal "table", ActiveRecord::Migrator.proper_table_name('table')
       assert_equal "table", ActiveRecord::Migrator.proper_table_name(:table)
@@ -2132,3 +2093,4 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
   end
 end
+
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index 7914ee0a6f..9b2c7c00df 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -17,25 +17,6 @@ class SchemaDumperTest < ActiveRecord::TestCase
     assert_no_match %r{create_table "schema_migrations"}, output
   end
 
-  def test_schema_dump_includes_migrations
-    $".delete_if do |fname|
-      fname == (MIGRATIONS_ROOT + "/valid/1_people_have_last_names.rb")
-    end
-
-    conn = ActiveRecord::Base.connection
-    sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-    conn.execute "DELETE FROM #{conn.quote_table_name(sm_table)}"
-    conn.remove_column "people", "last_name" rescue nil
-    conn.drop_table "reminders" rescue nil
-    conn.drop_table "people_reminders" rescue nil
-    ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
-
-    output = standard_dump
-    assert_match %r{migration "1", "people_have_last_names"}, output
-    assert_match %r{migration "2", "we_need_reminders"}, output
-    assert_match %r{migration "3", "innocent_jointable"}, output
-  end
-
   def test_schema_dump_excludes_sqlite_sequence
     output = standard_dump
     assert_no_match %r{create_table "sqlite_sequence"}, output
-- 
cgit v1.2.3


From 96eec090dfd50326146b2f690408fefec50c5111 Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael@koziarski.com>
Date: Thu, 2 Dec 2010 15:36:05 +1300
Subject: Work around a strange piece of Syck behaviour where it checks
 Model#respond_to? before initializing the object.

Things like YAML.load(YAML.dump(@post)) won't work without this.
---
 activerecord/test/cases/attribute_methods_test.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index bb0166a60c..3df8197e0d 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -85,6 +85,17 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     assert !topic.respond_to?("nothingness")
     assert !topic.respond_to?(:nothingness)
   end
+  
+  
+  # Syck calls respond_to? before actually calling initialize
+  def test_respond_to_with_allocated_object
+    topic = Topic.allocate
+    assert !topic.respond_to?("nothingness")
+    assert !topic.respond_to?(:nothingness)
+    assert_respond_to topic, "title"
+    assert_respond_to topic, :title
+  end
+  
 
   def test_array_content
     topic = Topic.new
-- 
cgit v1.2.3


From da6ce2e2532a5209a224201a08f805f62dff8d72 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 2 Dec 2010 08:44:31 -0800
Subject: adding a test for YAML round trip

---
 activerecord/test/cases/yaml_serialization_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/yaml_serialization_test.rb b/activerecord/test/cases/yaml_serialization_test.rb
index f221def6b6..0fc9918744 100644
--- a/activerecord/test/cases/yaml_serialization_test.rb
+++ b/activerecord/test/cases/yaml_serialization_test.rb
@@ -2,10 +2,19 @@ require "cases/helper"
 require 'models/topic'
 
 class YamlSerializationTest < ActiveRecord::TestCase
+  fixtures :topics
+
   def test_to_yaml_with_time_with_zone_should_not_raise_exception
     Time.zone = ActiveSupport::TimeZone["Pacific Time (US & Canada)"]
     ActiveRecord::Base.time_zone_aware_attributes = true
     topic = Topic.new(:written_on => DateTime.now)
     assert_nothing_raised { topic.to_yaml }
   end
+
+  def test_roundtrip
+    topic = Topic.first
+    assert topic
+    t = YAML.load YAML.dump topic
+    assert_equal topic, t
+  end
 end
-- 
cgit v1.2.3


From 077ec5a0ed3459816a4666364c722bb512c09bc7 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 2 Dec 2010 08:41:54 -0800
Subject: fixing space errors

---
 activerecord/test/cases/attribute_methods_test.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 3df8197e0d..8214815bde 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -85,8 +85,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     assert !topic.respond_to?("nothingness")
     assert !topic.respond_to?(:nothingness)
   end
-  
-  
+
   # Syck calls respond_to? before actually calling initialize
   def test_respond_to_with_allocated_object
     topic = Topic.allocate
@@ -95,7 +94,6 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     assert_respond_to topic, "title"
     assert_respond_to topic, :title
   end
-  
 
   def test_array_content
     topic = Topic.new
-- 
cgit v1.2.3


From 42c51b8527e49ae2d7a0f6cc009e53865b7910c1 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 2 Dec 2010 17:59:55 -0200
Subject: Doesn't need to sort, lets users of attribute_names sort them if they
 want

---
 activerecord/test/cases/reflection_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index 3b9e4f42a6..389ca9eae6 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -25,7 +25,7 @@ class ReflectionTest < ActiveRecord::TestCase
   def test_read_attribute_names
     assert_equal(
       %w( id title author_name author_email_address bonus_time written_on last_read content group approved replies_count parent_id parent_title type created_at updated_at ).sort,
-      @first.attribute_names
+      @first.attribute_names.sort
     )
   end
 
-- 
cgit v1.2.3


From 47737681fdfe4986dc7426b174f81d2b8daca991 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 3 Dec 2010 11:44:11 -0800
Subject: in the middle of refactoring

---
 activerecord/test/cases/migration_test.rb | 80 ++++++++++++-------------------
 1 file changed, 30 insertions(+), 50 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 3037d73a1b..d7ff3e68d9 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -5,10 +5,8 @@ require 'models/person'
 require 'models/topic'
 require 'models/developer'
 
-require MIGRATIONS_ROOT + "/valid/1_people_have_last_names"
 require MIGRATIONS_ROOT + "/valid/2_we_need_reminders"
 require MIGRATIONS_ROOT + "/decimal/1_give_me_big_numbers"
-require MIGRATIONS_ROOT + "/interleaved/pass_3/2_i_raise_on_down"
 
 if ActiveRecord::Base.connection.supports_migrations?
   class BigNumber < ActiveRecord::Base; end
@@ -21,8 +19,8 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
 
     def puts(text="")
-      self.class.message_count ||= 0
-      self.class.message_count += 1
+      ActiveRecord::Migration.message_count ||= 0
+      ActiveRecord::Migration.message_count += 1
     end
   end
 
@@ -52,7 +50,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
     def setup
       ActiveRecord::Migration.verbose = true
-      PeopleHaveLastNames.message_count = 0
+      ActiveRecord::Migration.message_count = 0
     end
 
     def teardown
@@ -1271,7 +1269,7 @@ if ActiveRecord::Base.connection.supports_migrations?
     def test_finds_migrations
       migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/valid").migrations
 
-      [[1, 'PeopleHaveLastNames'], [2, 'WeNeedReminders'], [3, 'InnocentJointable']].each_with_index do |pair, i|
+      [[1, 'ValidPeopleHaveLastNames'], [2, 'WeNeedReminders'], [3, 'InnocentJointable']].each_with_index do |pair, i|
         assert_equal migrations[i].version, pair.first
         assert_equal migrations[i].name, pair.last
       end
@@ -1283,39 +1281,30 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       assert_equal 1, migrations.size
       assert_equal migrations[0].version, 3
-      assert_equal migrations[0].name, 'InnocentJointable'
+      assert_equal migrations[0].name, 'InterleavedInnocentJointable'
     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
+      list = Dir.chdir(MIGRATIONS_ROOT) do
         ActiveRecord::Migrator.up("valid/", 1)
       end
 
-      assert defined?(PeopleHaveLastNames)
+      migration_proxy = list.find { |item|
+        item.name == 'ValidPeopleHaveLastNames'
+      }
+      assert migration_proxy, 'should find pending migration'
     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
-      Object.send(:remove_const, :PeopleHaveLastNames)
-
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", nil)
+      proxies = ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", nil)
 
-      assert !defined? PeopleHaveLastNames
-
-      %w(WeNeedReminders, InnocentJointable).each do |migration|
-        assert defined? migration
-      end
-
-    ensure
-      load(MIGRATIONS_ROOT + "/valid/1_people_have_last_names.rb")
+      names = proxies.map(&:name)
+      assert !names.include?('ValidPeopleHaveLastNames')
+      assert names.include?('WeNeedReminders')
+      assert names.include?('InnocentJointable')
     end
 
     def test_target_version_zero_should_run_only_once
@@ -1325,16 +1314,9 @@ if ActiveRecord::Base.connection.supports_migrations?
       # migrate down to 0
       ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0)
 
-      # now unload the migrations that have been defined
-      PeopleHaveLastNames.unloadable
-      ActiveSupport::Dependencies.remove_unloadable_constants!
-
       # migrate down to 0 again
-      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0)
-
-      assert !defined? PeopleHaveLastNames
-    ensure
-      load(MIGRATIONS_ROOT + "/valid/1_people_have_last_names.rb")
+      proxies = ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0)
+      assert_equal [], proxies
     end
 
     def test_migrator_db_has_no_schema_migrations_table
@@ -1351,20 +1333,20 @@ if ActiveRecord::Base.connection.supports_migrations?
 
     def test_migrator_verbosity
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
-      assert_operator PeopleHaveLastNames.message_count, :>, 0
-      PeopleHaveLastNames.message_count = 0
+      assert_not_equal 0, ActiveRecord::Migration.message_count
+      ActiveRecord::Migration.message_count = 0
 
       ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0)
-      assert_operator PeopleHaveLastNames.message_count, :>, 0
-      PeopleHaveLastNames.message_count = 0
+      assert_not_equal 0, ActiveRecord::Migration.message_count
+      ActiveRecord::Migration.message_count = 0
     end
 
     def test_migrator_verbosity_off
-      PeopleHaveLastNames.verbose = false
+      ActiveRecord::Migration.verbose = false
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
-      assert_equal 0, PeopleHaveLastNames.message_count
+      assert_equal 0, ActiveRecord::Migration.message_count
       ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0)
-      assert_equal 0, PeopleHaveLastNames.message_count
+      assert_equal 0, ActiveRecord::Migration.message_count
     end
 
     def test_migrator_going_down_due_to_version_target
@@ -1658,10 +1640,6 @@ if ActiveRecord::Base.connection.supports_migrations?
   end # SexyMigrationsTest
 
   class MigrationLoggerTest < ActiveRecord::TestCase
-    def setup
-      Object.send(:remove_const, :InnocentJointable)
-    end
-
     def test_migration_should_be_run_without_logger
       previous_logger = ActiveRecord::Base.logger
       ActiveRecord::Base.logger = nil
@@ -1675,7 +1653,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
   class InterleavedMigrationsTest < ActiveRecord::TestCase
     def setup
-      Object.send(:remove_const, :PeopleHaveLastNames)
+      #Object.send(:remove_const, :PeopleHaveLastNames)
     end
 
     def test_migrator_interleaved_migrations
@@ -1688,10 +1666,12 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.reset_column_information
       assert Person.column_methods_hash.include?(:last_name)
 
-      Object.send(:remove_const, :PeopleHaveLastNames)
-      Object.send(:remove_const, :InnocentJointable)
       assert_nothing_raised do
-        ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/interleaved/pass_3")
+        proxies = ActiveRecord::Migrator.down(
+          MIGRATIONS_ROOT + "/interleaved/pass_3")
+        names = proxies.map(&:name)
+        assert names.include?('InterleavedPeopleHaveLastNames')
+        assert names.include?('InterleavedInnocentJointable')
       end
     end
   end
-- 
cgit v1.2.3


From 399730bdd2f133e9fecac501e2f2333be5f29aa2 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 3 Dec 2010 11:51:33 -0800
Subject: removing unused setup

---
 activerecord/test/cases/migration_test.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index d7ff3e68d9..96da3be655 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1652,10 +1652,6 @@ if ActiveRecord::Base.connection.supports_migrations?
   end
 
   class InterleavedMigrationsTest < ActiveRecord::TestCase
-    def setup
-      #Object.send(:remove_const, :PeopleHaveLastNames)
-    end
-
     def test_migrator_interleaved_migrations
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_1")
 
-- 
cgit v1.2.3


From a299fcaef90741090c5719d0569715c209149a59 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 3 Dec 2010 16:22:42 -0800
Subject: not a responsibility for rails to test

---
 activerecord/test/cases/associations/join_model_test.rb | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index 1ece961d2e..4581cb1acd 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -44,16 +44,6 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     assert !authors(:mary).unique_categorized_posts.loaded?
   end
 
-  def test_column_caching
-    # pre-heat our cache
-    Post.arel_table.columns
-    Comment.columns
-
-    Post.connection.column_calls = 0
-    2.times { Post.joins(:comments).to_a }
-    assert_equal 0, Post.connection.column_calls
-  end
-
   def test_has_many_uniq_through_find
     assert_equal 1, authors(:mary).unique_categorized_posts.find(:all).size
   end
-- 
cgit v1.2.3


From d0467e08e54a84fc4672c508716615aa0177994a Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Fri, 3 Dec 2010 13:12:59 +0100
Subject: Allow to run migrations from more than one directory

---
 activerecord/test/cases/migration_test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 96da3be655..95b7ce9f34 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1275,6 +1275,18 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
 
+    def test_finds_migrations_from_two_directories
+      directories = [MIGRATIONS_ROOT + '/valid_with_timestamps', MIGRATIONS_ROOT + '/to_copy_with_timestamps']
+      migrations = ActiveRecord::Migrator.new(:up, directories).migrations
+
+      [[20090101010101, "PeopleHaveHobbies"], [20090101010202, "PeopleHaveDescriptions"], 
+       [20100101010101, "PeopleHaveLastNames"], [20100201010101, "WeNeedReminders"], 
+       [20100301010101, "InnocentJointable"]].each_with_index do |pair, i|
+        assert_equal migrations[i].version, pair.first
+        assert_equal migrations[i].name, pair.last
+      end
+    end
+
     def test_finds_pending_migrations
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_2", 1)
       migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/interleaved/pass_2").pending_migrations
-- 
cgit v1.2.3


From 7ecee054a322e214e4f285b1a8327751bd79a418 Mon Sep 17 00:00:00 2001
From: Jeff Dean <jeff@zilkey.com>
Date: Fri, 3 Dec 2010 23:16:45 -0700
Subject: Setting the id of a belongs_to object updates all referenced objects
 [#2989 state:resolved]

---
 .../associations/belongs_to_associations_test.rb   | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 1b0c00bd5a..1820f95261 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -486,4 +486,41 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     new_firm = accounts(:signals37).build_firm(:name => 'Apple')
     assert_equal new_firm.name, "Apple"
   end
+
+  def test_reassigning_the_parent_id_updates_the_object
+    original_parent = Firm.create! :name => "original"
+    updated_parent = Firm.create! :name => "updated"
+
+    client = Client.new("client_of" => original_parent.id)
+    assert_equal original_parent, client.firm
+    assert_equal original_parent, client.firm_with_condition
+    assert_equal original_parent, client.firm_with_other_name
+
+    client.client_of = updated_parent.id
+    assert_equal updated_parent, client.firm
+    assert_equal updated_parent, client.firm_with_condition
+    assert_equal updated_parent, client.firm_with_other_name
+  end
+
+  def test_polymorphic_reassignment_of_associated_id_updates_the_object
+    member1 = Member.create!
+    member2 = Member.create!
+
+    sponsor = Sponsor.new("sponsorable_type" => "Member", "sponsorable_id" => member1.id)
+    assert_equal member1, sponsor.sponsorable
+
+    sponsor.sponsorable_id = member2.id
+    assert_equal member2, sponsor.sponsorable
+  end
+
+  def test_polymorphic_reassignment_of_associated_type_updates_the_object
+    member1 = Member.create!
+
+    sponsor = Sponsor.new("sponsorable_type" => "Member", "sponsorable_id" => member1.id)
+    assert_equal member1, sponsor.sponsorable
+
+    sponsor.sponsorable_type = "Firm"
+    assert_not_equal member1, sponsor.sponsorable
+  end
+
 end
-- 
cgit v1.2.3


From 7a237d56aa38c51987af0fd52d001989c4f3da07 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Mon, 29 Nov 2010 18:13:17 +0530
Subject: Ensure that boolean false is properly serialized [#6079
 state:resolved]

---
 activerecord/test/cases/base_test.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index c3ba1f0c35..86d4a90fc4 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -997,6 +997,22 @@ class BasicsTest < ActiveRecord::TestCase
     Topic.serialize(:content)
   end
 
+  def test_serialized_boolean_value_true
+    Topic.serialize(:content)
+    topic = Topic.new(:content => true)
+    assert topic.save
+    topic = topic.reload
+    assert_equal topic.content, true
+  end
+
+  def test_serialized_boolean_value_false
+    Topic.serialize(:content)
+    topic = Topic.new(:content => false)
+    assert topic.save
+    topic = topic.reload
+    assert_equal topic.content, false
+  end
+
   def test_quote
     author_name = "\\ \001 ' \n \\n \""
     topic = Topic.create('author_name' => author_name)
-- 
cgit v1.2.3


From f572a02b94ce85bb8db64e838aa159cf3ef4b1fa Mon Sep 17 00:00:00 2001
From: Mike Dvorkin <mike@dvorkin.net>
Date: Wed, 8 Dec 2010 20:39:46 -0800
Subject: Take into account current time zone when serializing datetime values
 [#6096 state:resolved]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activerecord/test/cases/xml_serialization_test.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb
index b11b340e94..2003e25e35 100644
--- a/activerecord/test/cases/xml_serialization_test.rb
+++ b/activerecord/test/cases/xml_serialization_test.rb
@@ -4,6 +4,7 @@ require 'models/post'
 require 'models/author'
 require 'models/comment'
 require 'models/company_in_module'
+require 'models/toy'
 
 class XmlSerializationTest < ActiveRecord::TestCase
   def test_should_serialize_default_root
@@ -83,6 +84,26 @@ class DefaultXmlSerializationTest < ActiveRecord::TestCase
   end
 end
 
+class DefaultXmlSerializationTimezoneTest < ActiveRecord::TestCase
+  def test_should_serialize_datetime_with_timezone
+    timezone, Time.zone = Time.zone, "Pacific Time (US & Canada)"
+
+    toy = Toy.create(:name => 'Mickey', :updated_at => Time.utc(2006, 8, 1))
+    assert_match %r{<updated-at type=\"datetime\">2006-07-31T17:00:00-07:00</updated-at>}, toy.to_xml
+  ensure
+    Time.zone = timezone
+  end
+
+  def test_should_serialize_datetime_with_timezone_reloaded
+    timezone, Time.zone = Time.zone, "Pacific Time (US & Canada)"
+
+    toy = Toy.create(:name => 'Minnie', :updated_at => Time.utc(2006, 8, 1)).reload
+    assert_match %r{<updated-at type=\"datetime\">2006-07-31T17:00:00-07:00</updated-at>}, toy.to_xml
+  ensure
+    Time.zone = timezone
+  end
+end
+
 class NilXmlSerializationTest < ActiveRecord::TestCase
   def setup
     @xml = Contact.new.to_xml(:root => 'xml_contact')
-- 
cgit v1.2.3


From 6f8958277b4ba96dc6185a476a7a00a6c1d99892 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 9 Dec 2010 18:02:09 +0100
Subject: Fix test on finding migrations from 2 paths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activerecord/test/cases/migration_test.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 95b7ce9f34..1a65045ded 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1279,11 +1279,13 @@ if ActiveRecord::Base.connection.supports_migrations?
       directories = [MIGRATIONS_ROOT + '/valid_with_timestamps', MIGRATIONS_ROOT + '/to_copy_with_timestamps']
       migrations = ActiveRecord::Migrator.new(:up, directories).migrations
 
-      [[20090101010101, "PeopleHaveHobbies"], [20090101010202, "PeopleHaveDescriptions"], 
-       [20100101010101, "PeopleHaveLastNames"], [20100201010101, "WeNeedReminders"], 
-       [20100301010101, "InnocentJointable"]].each_with_index do |pair, i|
-        assert_equal migrations[i].version, pair.first
-        assert_equal migrations[i].name, pair.last
+      [[20090101010101, "PeopleHaveHobbies"],
+       [20090101010202, "PeopleHaveDescriptions"],
+       [20100101010101, "ValidWithTimestampsPeopleHaveLastNames"],
+       [20100201010101, "ValidWithTimestampsWeNeedReminders"],
+       [20100301010101, "ValidWithTimestampsInnocentJointable"]].each_with_index do |pair, i|
+        assert_equal pair.first, migrations[i].version
+        assert_equal pair.last, migrations[i].name
       end
     end
 
-- 
cgit v1.2.3


From bba3dacc3dc6ac379209f2eda0da5d2dd93d6b04 Mon Sep 17 00:00:00 2001
From: "Robert Pankowecki (Gavdi)" <rpa@gavdi.com>
Date: Fri, 26 Nov 2010 19:16:13 +0100
Subject: Simplifies observer implementation [#6065 state:resolved]

---
 activerecord/test/cases/lifecycle_test.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index 233338498f..b8c3ffb9cb 100644
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -9,10 +9,19 @@ class SpecialDeveloper < Developer; end
 
 class SalaryChecker < ActiveRecord::Observer
   observe :special_developer
+  attr_accessor :last_saved
 
   def before_save(developer)
     return developer.salary > 80000
   end
+
+  module Implementation
+    def after_save(developer)
+      self.last_saved = developer
+    end
+  end
+  include Implementation
+
 end
 
 class TopicaAuditor < ActiveRecord::Observer
@@ -179,4 +188,11 @@ class LifecycleTest < ActiveRecord::TestCase
     developer = SpecialDeveloper.new :name => 'Rookie', :salary => 50000
     assert !developer.save, "allowed to save a developer with too low salary"
   end
+
+  test "able to call methods defined with included module" do # https://rails.lighthouseapp.com/projects/8994/tickets/6065-activerecordobserver-is-not-aware-of-method-added-by-including-modules
+    SalaryChecker.instance # activate
+    developer = SpecialDeveloper.create! :name => 'Roger', :salary => 100000
+    assert_equal developer, SalaryChecker.instance.last_saved
+  end
+
 end
-- 
cgit v1.2.3


From 3e7c351b486356757631de9a89ea775c9bed658f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 9 Dec 2010 15:12:48 -0800
Subject: preheating cache so that tests can run in isolation

---
 activerecord/test/cases/associations/eager_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index ea86ac29d0..c96ca90750 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -24,6 +24,11 @@ class EagerAssociationTest < ActiveRecord::TestCase
             :owners, :pets, :author_favorites, :jobs, :references, :subscribers, :subscriptions, :books,
             :developers, :projects, :developers_projects
 
+  def setup
+    # preheat table existence caches
+    Comment.find_by_id(1)
+  end
+
   def test_loading_with_one_association
     posts = Post.find(:all, :include => :comments)
     post = posts.find { |p| p.id == 1 }
-- 
cgit v1.2.3


From bda16eb0920780509467bcf051d1a01639357903 Mon Sep 17 00:00:00 2001
From: Chiel Wester <chiel.wester@holder.nl>
Date: Mon, 13 Dec 2010 15:06:23 +0100
Subject: Only call save on belongs_to associations if the record has changed
 or any nested associations have changed (resolves #3353)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activerecord/test/cases/autosave_association_test.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index fbf7121468..27aee400f9 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -667,10 +667,21 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
       end
     end
 
+    @ship.pirate.catchphrase = "Changed Catchphrase"
+
     assert_raise(RuntimeError) { assert !@ship.save }
     assert_not_nil @ship.reload.pirate
   end
 
+  def test_should_save_changed_child_objects_if_parent_is_saved
+    @pirate = @ship.create_pirate(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    @parrot = @pirate.parrots.create!(:name => 'Posideons Killer')
+    @parrot.name = "NewName"
+    @ship.save
+
+    assert_equal 'NewName', @parrot.reload.name
+  end
+
   # has_many & has_and_belongs_to
   %w{ parrots birds }.each do |association_name|
     define_method("test_should_destroy_#{association_name}_as_part_of_the_save_transaction_if_they_were_marked_for_destroyal") do
-- 
cgit v1.2.3


From a1ca1e85a9ccefd72db4dc700a894c5bd7db53de Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 13 Dec 2010 11:39:31 -0800
Subject: persisted? should be able to return a truthy object

---
 activerecord/test/cases/transactions_test.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index b0ccd71836..110a18772f 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -370,23 +370,23 @@ class TransactionTest < ActiveRecord::TestCase
       assert topic_2.save
       @first.save
       @second.destroy
-      assert_equal true, topic_1.persisted?
+      assert topic_1.persisted?, 'persisted'
       assert_not_nil topic_1.id
-      assert_equal true, topic_2.persisted?
+      assert topic_2.persisted?, 'persisted'
       assert_not_nil topic_2.id
-      assert_equal true, @first.persisted?
+      assert @first.persisted?, 'persisted'
       assert_not_nil @first.id
-      assert_equal true, @second.destroyed?
+      assert @second.destroyed?, 'destroyed'
       raise ActiveRecord::Rollback
     end
 
-    assert_equal false, topic_1.persisted?
+    assert !topic_1.persisted?, 'not persisted'
     assert_nil topic_1.id
-    assert_equal false, topic_2.persisted?
+    assert !topic_2.persisted?, 'not persisted'
     assert_nil topic_2.id
-    assert_equal true, @first.persisted?
+    assert @first.persisted?, 'persisted'
     assert_not_nil @first.id
-    assert_equal false, @second.destroyed?
+    assert !@second.destroyed?, 'not destroyed'
   end
 
   if current_adapter?(:PostgreSQLAdapter) && defined?(PGconn::PQTRANS_IDLE)
-- 
cgit v1.2.3


From 08ccca764498909faa2e4f9c69cee911e6395602 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 13 Dec 2010 13:49:39 -0800
Subject: fixing whitespace errors

---
 .../test/cases/associations/inner_join_association_test.rb        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb
index 780eabc443..da2a81e98a 100644
--- a/activerecord/test/cases/associations/inner_join_association_test.rb
+++ b/activerecord/test/cases/associations/inner_join_association_test.rb
@@ -65,21 +65,21 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase
     authors_with_welcoming_post_titles = Author.calculate(:count, 'authors.id', :joins => :posts, :distinct => true, :conditions => "posts.title like 'Welcome%'")
     assert_equal real_count, authors_with_welcoming_post_titles, "inner join and conditions should have only returned authors posting titles starting with 'Welcome'"
   end
-  
+
   def test_find_with_sti_join
     scope = Post.joins(:special_comments).where(:id => posts(:sti_comments).id)
-    
+
     # The join should match SpecialComment and its subclasses only
     assert scope.where("comments.type" => "Comment").empty?
     assert !scope.where("comments.type" => "SpecialComment").empty?
     assert !scope.where("comments.type" => "SubSpecialComment").empty?
   end
-  
+
   def test_find_with_conditions_on_reflection
     assert !posts(:welcome).comments.empty?
     assert Post.joins(:nonexistant_comments).where(:id => posts(:welcome).id).empty? # [sic!]
   end
-  
+
   def test_find_with_conditions_on_through_reflection
     assert !posts(:welcome).tags.empty?
     assert Post.joins(:misc_tags).where(:id => posts(:welcome).id).empty?
-- 
cgit v1.2.3


From 7bffa9dd01cdef3088e0d33fabd5fc07eb35c9d9 Mon Sep 17 00:00:00 2001
From: Joe Hannon <ziggurism@gmail.com>
Date: Sun, 2 May 2010 16:26:02 -0700
Subject: add test which fails for has_many through self join [#4361
 state:open]

---
 .../test/cases/associations/has_many_through_associations_test.rb  | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activerecord/test/cases')

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 52432b0428..fe60e676d6 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -388,6 +388,13 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     ].each {|block| assert_raise(ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection, &block) }
   end
 
+  def test_has_many_association_through_a_has_many_association_to_self
+    sarah = Person.create!(:first_name => 'Sarah', :primary_contact_id => people(:susan).id, :gender => 'F', :number1_fan_id => 1)
+    john = Person.create!(:first_name => 'John', :primary_contact_id => sarah.id, :gender => 'M', :number1_fan_id => 1)
+    assert_equal sarah.agents, [john]
+    assert_equal people(:susan).agents_of_agents, [john]
+  end
+
   def test_collection_singular_ids_getter_with_string_primary_keys
     book = books(:awdr)
     assert_equal 2, book.subscriber_ids.size
-- 
cgit v1.2.3


From 5d37ff6bb2b1f948034bf06e450f2fdb8195c4e5 Mon Sep 17 00:00:00 2001
From: Ernie Miller <ernie@metautonomo.us>
Date: Mon, 3 May 2010 20:47:42 -0400
Subject: Fix hm:t to self table aliasing in construct_scope

---
 .../test/cases/associations/has_many_through_associations_test.rb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

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 fe60e676d6..34ae297275 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -392,7 +392,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     sarah = Person.create!(:first_name => 'Sarah', :primary_contact_id => people(:susan).id, :gender => 'F', :number1_fan_id => 1)
     john = Person.create!(:first_name => 'John', :primary_contact_id => sarah.id, :gender => 'M', :number1_fan_id => 1)
     assert_equal sarah.agents, [john]
-    assert_equal people(:susan).agents_of_agents, [john]
+    assert_equal people(:susan).agents.map(&:agents).flatten, people(:susan).agents_of_agents
   end
 
   def test_collection_singular_ids_getter_with_string_primary_keys
-- 
cgit v1.2.3


From eba76640862d071d89c846f8624d1e651d872794 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 12 Dec 2010 16:35:27 +0000
Subject: Respect the default_scope on a join model when reading a through
 association

---
 .../cases/associations/has_many_through_associations_test.rb   |  4 ++++
 .../cases/associations/has_one_through_associations_test.rb    | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

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 34ae297275..113d0f6d73 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -462,4 +462,8 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     post.people << people(:michael)
     assert_equal readers + 1, post.readers.size
   end
+
+  def test_has_many_through_with_default_scope_on_join_model
+    assert_equal posts(:welcome).comments, authors(:david).comments_on_first_posts
+  end
 end
diff --git a/activerecord/test/cases/associations/has_one_through_associations_test.rb b/activerecord/test/cases/associations/has_one_through_associations_test.rb
index ac43e571cb..93a4f498d0 100644
--- a/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -9,9 +9,13 @@ require 'models/member_detail'
 require 'models/minivan'
 require 'models/dashboard'
 require 'models/speedometer'
+require 'models/author'
+require 'models/post'
+require 'models/comment'
 
 class HasOneThroughAssociationsTest < ActiveRecord::TestCase
-  fixtures :member_types, :members, :clubs, :memberships, :sponsors, :organizations, :minivans, :dashboards, :speedometers
+  fixtures :member_types, :members, :clubs, :memberships, :sponsors, :organizations, :minivans,
+           :dashboards, :speedometers, :authors, :posts, :comments
 
   def setup
     @member = members(:groucho)
@@ -229,4 +233,8 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
       minivan.dashboard
     end
   end
+
+  def test_has_one_through_with_default_scope_on_join_model
+    assert_equal posts(:welcome).comments.first, authors(:david).comment_on_first_posts
+  end
 end
-- 
cgit v1.2.3


From 491ce5b6ce1a3af42d02efff9a2e42b1a8980553 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 12 Dec 2010 17:03:41 +0000
Subject: Verify that creating a has_many through record where there is a
 default_scope on the join model works correctly (creates the join record with
 the default scope applied)

---
 .../test/cases/associations/has_many_through_associations_test.rb  | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activerecord/test/cases')

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 113d0f6d73..44ff01ddc0 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -17,6 +17,8 @@ require 'models/developer'
 require 'models/subscriber'
 require 'models/book'
 require 'models/subscription'
+require 'models/categorization'
+require 'models/category'
 
 class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   fixtures :posts, :readers, :people, :comments, :authors,
@@ -466,4 +468,9 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   def test_has_many_through_with_default_scope_on_join_model
     assert_equal posts(:welcome).comments, authors(:david).comments_on_first_posts
   end
+
+  def test_create_has_many_through_with_default_scope_on_join_model
+    category = authors(:david).special_categories.create(:name => "Foo")
+    assert_equal 1, category.categorizations.where(:special => true).count
+  end
 end
-- 
cgit v1.2.3


From 15984dbe35651e64dcff69f8e48fca156c380df2 Mon Sep 17 00:00:00 2001
From: Pivotal Labs <pivotal@lapidge.flood.pivotallabs.com>
Date: Fri, 9 Jan 2009 12:13:17 -0800
Subject: test for eager load of has_one association with condition on the
 through table

---
 activerecord/test/cases/associations/eager_test.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index c96ca90750..34a1cdeebe 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -17,18 +17,26 @@ require 'models/subscription'
 require 'models/book'
 require 'models/developer'
 require 'models/project'
+require 'models/member'
+require 'models/membership'
+require 'models/club'
 
 class EagerAssociationTest < ActiveRecord::TestCase
   fixtures :posts, :comments, :authors, :author_addresses, :categories, :categories_posts,
             :companies, :accounts, :tags, :taggings, :people, :readers,
             :owners, :pets, :author_favorites, :jobs, :references, :subscribers, :subscriptions, :books,
-            :developers, :projects, :developers_projects
+            :developers, :projects, :developers_projects, :members, :memberships, :clubs
 
   def setup
     # preheat table existence caches
     Comment.find_by_id(1)
   end
 
+  def test_eager_with_has_one_through_join_model_with_conditions_on_the_through
+    member = Member.find(members(:some_other_guy).id, :include => :favourite_club)
+    assert_nil member.favourite_club
+  end
+
   def test_loading_with_one_association
     posts = Post.find(:all, :include => :comments)
     post = posts.find { |p| p.id == 1 }
-- 
cgit v1.2.3


From aa40543022303d8a1b695e73ed71406c0da15bde Mon Sep 17 00:00:00 2001
From: Franck Verrot <franck@verrot.fr>
Date: Thu, 18 Nov 2010 09:01:45 +0100
Subject: Provide test for #4840: to_xml doesn't work in such case:
 Event.select('title as t').to_xml

---
 activerecord/test/cases/xml_serialization_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb
index 2003e25e35..a6074b23e7 100644
--- a/activerecord/test/cases/xml_serialization_test.rb
+++ b/activerecord/test/cases/xml_serialization_test.rb
@@ -262,4 +262,10 @@ class DatabaseConnectedXmlSerializationTest < ActiveRecord::TestCase
     assert array.include? 'github'
   end
 
+  def test_should_support_aliased_attributes
+    xml = Author.select("name as firstname").to_xml
+    array = Hash.from_xml(xml)['authors']
+    assert_equal array.size, array.select { |author| author.has_key? 'firstname' }.size
+  end
+
 end
-- 
cgit v1.2.3


From 96bae30538951367a82235785e7dba3577b50a5a Mon Sep 17 00:00:00 2001
From: Pavel Gorbokon <pahanix@gmail.com>
Date: Wed, 24 Nov 2010 10:17:49 +0200
Subject: Replace rudimentary named_scope with scope. [#6052 state:resolved]

* rename method names (actually in tests)
* rename instance variable @_named_scopes_cache to @_scopes_cache
* rename references in doc comments
* don't touch CHANGELOG :)
---
 activerecord/test/cases/named_scope_test.rb      | 42 ++++++++++++------------
 activerecord/test/cases/relation_scoping_test.rb |  2 +-
 activerecord/test/cases/relations_test.rb        |  6 ++--
 3 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 6ac3e3fc56..ed5e1e0cba 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -141,26 +141,26 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal 1, Topic.multiple_extensions.extension_one
   end
 
-  def test_has_many_associations_have_access_to_named_scopes
+  def test_has_many_associations_have_access_to_scopes
     assert_not_equal Post.containing_the_letter_a, authors(:david).posts
     assert !Post.containing_the_letter_a.empty?
 
     assert_equal authors(:david).posts & Post.containing_the_letter_a, authors(:david).posts.containing_the_letter_a
   end
 
-  def test_named_scope_with_STI
+  def test_scope_with_STI
     assert_equal 3,Post.containing_the_letter_a.count
     assert_equal 1,SpecialPost.containing_the_letter_a.count
   end
 
-  def test_has_many_through_associations_have_access_to_named_scopes
+  def test_has_many_through_associations_have_access_to_scopes
     assert_not_equal Comment.containing_the_letter_e, authors(:david).comments
     assert !Comment.containing_the_letter_e.empty?
 
     assert_equal authors(:david).comments & Comment.containing_the_letter_e, authors(:david).comments.containing_the_letter_e
   end
 
-  def test_named_scopes_honor_current_scopes_from_when_defined
+  def test_scopes_honor_current_scopes_from_when_defined
     assert !Post.ranked_by_comments.limit_by(5).empty?
     assert !authors(:david).posts.ranked_by_comments.limit_by(5).empty?
     assert_not_equal Post.ranked_by_comments.limit_by(5), authors(:david).posts.ranked_by_comments.limit_by(5)
@@ -236,7 +236,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     end
   end
 
-  def test_any_should_not_fire_query_if_named_scope_loaded
+  def test_any_should_not_fire_query_if_scope_loaded
     topics = Topic.base
     topics.collect # force load
     assert_no_queries { assert topics.any? }
@@ -259,7 +259,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     end
   end
 
-  def test_many_should_not_fire_query_if_named_scope_loaded
+  def test_many_should_not_fire_query_if_scope_loaded
     topics = Topic.base
     topics.collect # force load
     assert_no_queries { assert topics.many? }
@@ -276,27 +276,27 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert Topic.base.many?
   end
 
-  def test_should_build_on_top_of_named_scope
+  def test_should_build_on_top_of_scope
     topic = Topic.approved.build({})
     assert topic.approved
   end
 
-  def test_should_build_new_on_top_of_named_scope
+  def test_should_build_new_on_top_of_scope
     topic = Topic.approved.new
     assert topic.approved
   end
 
-  def test_should_create_on_top_of_named_scope
+  def test_should_create_on_top_of_scope
     topic = Topic.approved.create({})
     assert topic.approved
   end
 
-  def test_should_create_with_bang_on_top_of_named_scope
+  def test_should_create_with_bang_on_top_of_scope
     topic = Topic.approved.create!({})
     assert topic.approved
   end
 
-  def test_should_build_on_top_of_chained_named_scopes
+  def test_should_build_on_top_of_chained_scopes
     topic = Topic.approved.by_lifo.build({})
     assert topic.approved
     assert_equal 'lifo', topic.author_name
@@ -310,7 +310,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_kind_of Topic, Topic.approved.sample
   end
 
-  def test_should_use_where_in_query_for_named_scope
+  def test_should_use_where_in_query_for_scope
     assert_equal Developer.find_all_by_name('Jamis').to_set, Developer.find_all_by_id(Developer.jamises).to_set
   end
 
@@ -361,7 +361,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal [posts(:sti_comments)], Post.with_special_comments.with_post(4).all.uniq
   end
 
-  def test_named_scopes_batch_finders
+  def test_scopes_batch_finders
     assert_equal 3, Topic.approved.count
 
     assert_queries(4) do
@@ -381,7 +381,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     end
   end
 
-  def test_named_scopes_with_reserved_names
+  def test_scopes_with_reserved_names
     class << Topic
       def public_method; end
       public :public_method
@@ -400,7 +400,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     end
   end
 
-  def test_named_scopes_on_relations
+  def test_scopes_on_relations
     # Topic.replied
     approved_topics = Topic.scoped.approved.order('id DESC')
     assert_equal topics(:fourth), approved_topics.first
@@ -409,19 +409,19 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal topics(:third), replied_approved_topics.first
   end
 
-  def test_index_on_named_scope
+  def test_index_on_scope
     approved = Topic.approved.order('id ASC')
     assert_equal topics(:second), approved[0]
     assert approved.loaded?
   end
 
-  def test_nested_named_scopes_queries_size
+  def test_nested_scopes_queries_size
     assert_queries(1) do
       Topic.approved.by_lifo.replied.written_before(Time.now).all
     end
   end
 
-  def test_named_scopes_are_cached_on_associations
+  def test_scopes_are_cached_on_associations
     post = posts(:welcome)
 
     assert_equal post.comments.containing_the_letter_e.object_id, post.comments.containing_the_letter_e.object_id
@@ -430,7 +430,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_no_queries { post.comments.containing_the_letter_e.all }
   end
 
-  def test_named_scopes_with_arguments_are_cached_on_associations
+  def test_scopes_with_arguments_are_cached_on_associations
     post = posts(:welcome)
 
     one = post.comments.limit_by(1).all
@@ -443,7 +443,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_no_queries { post.comments.limit_by(2).all }
   end
 
-  def test_named_scopes_are_reset_on_association_reload
+  def test_scopes_are_reset_on_association_reload
     post = posts(:welcome)
 
     [:destroy_all, :reset, :delete_all].each do |method|
@@ -453,7 +453,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     end
   end
 
-  def test_named_scoped_are_lazy_loaded_if_table_still_does_not_exist
+  def test_scoped_are_lazy_loaded_if_table_still_does_not_exist
     assert_nothing_raised do
       require "models/without_table"
     end
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 1678e631e5..f113a9c516 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -422,7 +422,7 @@ class DefaultScopingTest < ActiveRecord::TestCase
     assert_equal expected, received
   end
 
-  def test_named_scope_overwrites_default
+  def test_scope_overwrites_default
     expected = Developer.find(:all, :order => 'salary DESC, name DESC').collect { |dev| dev.name }
     received = DeveloperOrderedBySalary.by_name.find(:all).collect { |dev| dev.name }
     assert_equal expected, received
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 1682f34a1d..0b106e3bcd 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -36,7 +36,7 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal [], relation.bind_values
   end
 
-  def test_two_named_scopes_with_includes_should_not_drop_any_include
+  def test_two_scopes_with_includes_should_not_drop_any_include
     car = Car.incl_engines.incl_tyres.first
     assert_no_queries { car.tyres.length }
     assert_no_queries { car.engines.length }
@@ -248,7 +248,7 @@ class RelationTest < ActiveRecord::TestCase
     end
   end
 
-  def test_respond_to_class_methods_and_named_scopes
+  def test_respond_to_class_methods_and_scopes
     assert DeveloperOrderedBySalary.scoped.respond_to?(:all_ordered_by_name)
     assert Topic.scoped.respond_to?(:by_lifo)
   end
@@ -754,7 +754,7 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal 'zyke', FastCar.order('name desc').find(:first, :order => 'id').name
   end
 
-  def test_default_scope_order_with_named_scope_order
+  def test_default_scope_order_with_scope_order
     assert_equal 'zyke', CoolCar.order_using_new_style.limit(1).first.name
     assert_equal 'zyke', CoolCar.order_using_old_style.limit(1).first.name
     assert_equal 'zyke', FastCar.order_using_new_style.limit(1).first.name
-- 
cgit v1.2.3


From 09ddca67acbb88e2fdd7300670839cbf647b2694 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Thu, 16 Dec 2010 00:40:03 +0000
Subject: Fix problem with duplicated records when a :uniq :through association
 is preloaded [#2447 state:resolved]

---
 activerecord/test/cases/associations/eager_test.rb               | 9 ++++++++-
 .../cases/associations/has_many_through_associations_test.rb     | 8 +++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 34a1cdeebe..d5262b1ee4 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -20,10 +20,11 @@ require 'models/project'
 require 'models/member'
 require 'models/membership'
 require 'models/club'
+require 'models/categorization'
 
 class EagerAssociationTest < ActiveRecord::TestCase
   fixtures :posts, :comments, :authors, :author_addresses, :categories, :categories_posts,
-            :companies, :accounts, :tags, :taggings, :people, :readers,
+            :companies, :accounts, :tags, :taggings, :people, :readers, :categorizations,
             :owners, :pets, :author_favorites, :jobs, :references, :subscribers, :subscriptions, :books,
             :developers, :projects, :developers_projects, :members, :memberships, :clubs
 
@@ -910,4 +911,10 @@ class EagerAssociationTest < ActiveRecord::TestCase
     assert_queries(2) { @tagging = Tagging.preload(:taggable).find(t.id) }
     assert_no_queries { assert ! @tagging.taggable }
   end
+
+  def test_preloading_has_many_through_with_uniq
+    mary = Author.includes(:unique_categorized_posts).where(:id => authors(:mary).id).first
+    assert_equal 1, mary.unique_categorized_posts.length
+    assert_equal 1, mary.unique_categorized_post_ids.length
+  end
 end
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 44ff01ddc0..77bc369ecc 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -23,7 +23,7 @@ require 'models/category'
 class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   fixtures :posts, :readers, :people, :comments, :authors,
            :owners, :pets, :toys, :jobs, :references, :companies,
-           :subscribers, :books, :subscriptions, :developers
+           :subscribers, :books, :subscriptions, :developers, :categorizations
 
   # Dummies to force column loads so query counts are clean.
   def setup
@@ -473,4 +473,10 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     category = authors(:david).special_categories.create(:name => "Foo")
     assert_equal 1, category.categorizations.where(:special => true).count
   end
+
+  def test_joining_has_many_through_with_uniq
+    mary = Author.joins(:unique_categorized_posts).where(:id => authors(:mary).id).first
+    assert_equal 1, mary.unique_categorized_posts.length
+    assert_equal 1, mary.unique_categorized_post_ids.length
+  end
 end
-- 
cgit v1.2.3


From 14b880fd035fcdf807051398674c9aa89bd3b4d3 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Wed, 15 Dec 2010 23:27:15 +0000
Subject: Fix various issues with the :primary_key option in :through
 associations [#2421 state:resolved]

---
 activerecord/test/cases/associations/join_model_test.rb | 16 ++++++++++++++++
 activerecord/test/cases/reflection_test.rb              |  5 +++++
 2 files changed, 21 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index 4581cb1acd..0a57c7883f 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -298,6 +298,22 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     assert_equal [authors(:mary)], posts(:authorless).authors
   end
 
+  def test_has_many_going_through_join_model_with_custom_primary_key
+    assert_equal [authors(:david)], posts(:thinking).authors_using_author_id
+  end
+
+  def test_has_many_going_through_polymorphic_join_model_with_custom_primary_key
+    assert_equal [tags(:general)], posts(:eager_other).tags_using_author_id
+  end
+
+  def test_has_many_through_with_custom_primary_key_on_belongs_to_source
+    assert_equal [authors(:david), authors(:david)], posts(:thinking).author_using_custom_pk
+  end
+
+  def test_has_many_through_with_custom_primary_key_on_has_many_source
+    assert_equal [authors(:david)], posts(:thinking).authors_using_custom_pk
+  end
+
   def test_both_scoped_and_explicit_joins_should_be_respected
     assert_nothing_raised do
       Post.send(:with_scope, :find => {:joins => "left outer join comments on comments.id = posts.id"}) do
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index 389ca9eae6..912e3c47bb 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -191,6 +191,11 @@ class ReflectionTest < ActiveRecord::TestCase
     assert_kind_of ThroughReflection, Subscriber.reflect_on_association(:books)
   end
 
+  def test_active_record_primary_key
+    assert_equal "nick", Subscriber.reflect_on_association(:subscriptions).active_record_primary_key.to_s
+    assert_equal "name", Author.reflect_on_association(:essay).active_record_primary_key.to_s
+  end
+
   def test_collection_association
     assert Pirate.reflect_on_association(:birds).collection?
     assert Pirate.reflect_on_association(:parrots).collection?
-- 
cgit v1.2.3


From 40b15f9f389b9394b22cf36567269e54c66c9fc8 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 16 Dec 2010 22:20:42 +0100
Subject: ActiveRecord::Base.joins should allow single nil argument [#6181
 state:resolved]

---
 activerecord/test/cases/relations_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 0b106e3bcd..20bfafbc5e 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -184,6 +184,10 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal [2, 4, 6, 8, 10], even_ids.sort
   end
 
+  def test_joins_with_nil_argument
+    assert_nothing_raised { DependentFirm.joins(nil).first }
+  end
+
   def test_finding_with_hash_conditions_on_joined_table
     firms = DependentFirm.joins(:account).where({:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }}).to_a
     assert_equal 1, firms.size
-- 
cgit v1.2.3