From 63fd88ca5c255a84b61ce81c41dfe9928ea101d9 Mon Sep 17 00:00:00 2001
From: David Verhasselt <david@crowdway.com>
Date: Fri, 23 May 2014 13:46:03 +0300
Subject: If a counter_cache exists, use it for #empty?

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 5f01352ab4..a80be99720 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -807,6 +807,13 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_calling_empty_with_counter_cache
+    post = posts(:welcome)
+    assert_queries(0) do
+      assert_not post.comments.empty?
+    end
+  end
+
   def test_custom_named_counter_cache
     topic = topics(:first)
 
-- 
cgit v1.2.3


From dd1ec62578db6f7a03d1c07546b00a008a0c629d Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Sat, 14 Jun 2014 02:18:36 -0700
Subject: Fixed a regression introduced in 84cf156
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

84cf156 (PR #15694) introduced a subtle regression. There are actually three
distinct entry points to creating an AR object – via .new (i.e. #initialize),
via #init_with (e.g. from YAML or database queries) and via .allocate.

With the patch in 84cf156, attribute methods and respond_to? will not work
correctly when objects are allocated directly, without going through either

The reason this test case didn't catch the regression was that the `Topic`
class is shared between test cases, so by the time this test case is ran the
attribute methods are very likely to be defined.

Switching to use a fresh anonymous class in the test to ensure we surface this
problem in the future.
---
 activerecord/test/cases/attribute_methods_test.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index f832ca3451..f8e2609572 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -143,7 +143,11 @@ class AttributeMethodsTest < ActiveRecord::TestCase
 
   # Syck calls respond_to? before actually calling initialize
   def test_respond_to_with_allocated_object
-    topic = Topic.allocate
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = 'topics'
+    end
+
+    topic = klass.allocate
     assert !topic.respond_to?("nothingness")
     assert !topic.respond_to?(:nothingness)
     assert_respond_to topic, "title"
-- 
cgit v1.2.3


From c965de396f1bd7457159306f1fc10342840fdf86 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 16 Jun 2014 18:25:09 -0400
Subject: Dont swallow errors when bad alias_method

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 8f83cf7cb4..4c0b0c868a 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1347,14 +1347,32 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_compute_type_no_method_error
-    ActiveSupport::Dependencies.stubs(:constantize).raises(NoMethodError)
+    ActiveSupport::Dependencies.stubs(:safe_constantize).raises(NoMethodError)
     assert_raises NoMethodError do
       ActiveRecord::Base.send :compute_type, 'InvalidModel'
     end
   end
 
+  def test_compute_type_on_undefined_method
+    error = nil
+    begin
+      Class.new(Author) do
+        alias_method :foo, :bar
+      end
+    rescue => e
+      error = e
+    end
+
+    ActiveSupport::Dependencies.stubs(:safe_constantize).raises(e)
+
+    exception = assert_raises NameError do
+      ActiveRecord::Base.send :compute_type, 'InvalidModel'
+    end
+    assert_equal error.message, exception.message
+  end
+
   def test_compute_type_argument_error
-    ActiveSupport::Dependencies.stubs(:constantize).raises(ArgumentError)
+    ActiveSupport::Dependencies.stubs(:safe_constantize).raises(ArgumentError)
     assert_raises ArgumentError do
       ActiveRecord::Base.send :compute_type, 'InvalidModel'
     end
-- 
cgit v1.2.3


From f8d2899d12d59360f29c5eb6a1b1a8fe4ec82ca0 Mon Sep 17 00:00:00 2001
From: eileencodes <eileencodes@gmail.com>
Date: Mon, 9 Jun 2014 18:45:29 -0400
Subject: Begin refactoring ThroughReflection

This allows us to decouple AssociationReflection and
ThroughReflection making ThroughReflection it's own Reflection
bucket in a way. The benefit of this is to be able to remove
checks against the macro's symbol for exmaple `macro == :belongs_to`.

Get all tests passing again

Some of the methods that used to be inherited from MacroReflection
through AssociationReflection were no longer getting passed through.
They needed to be duplicated into the ThroughReflection. I will
extract these out into a separate class.

Refactor shared methods into strategy object

Now that we've separated ThroughReflection and AssociationReflection
we can combine shared methods into one class to avoid duplication.

Break out class for each type of reflection

This creates a class for each reflection type (has_many, has_one,
belongs_to and habtm). We then can remove the need to set the macro
symbol in each initialization.

Tests were updated to reflect these changes because creation of
these reflections is now different.

Remove need for @collection instance var

We now define `collection?` as `false` by default and set it to
`true` in `has_and_belongs_to_many` and `has_many` reflections.
This removes the need for the `@collection` instance variable.

Raise exception on unknown macro types

We shouldn't accept just any macro when creating reflections. An
unrecongnized AssociationReflection raises an error. Tests in
`reflection_test` were updated to reflect these new changes.
`:has_and_belongs_to_many` macro tests were removed because we no
longer internally return HABTM.
---
 activerecord/test/cases/reflection_test.rb | 64 ++++++++++++++----------------
 1 file changed, 30 insertions(+), 34 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index b41a7ee787..84abaf0291 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -87,7 +87,7 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_reflection_klass_for_nested_class_name
-    reflection = MacroReflection.new(:company, nil, nil, { :class_name => 'MyApplication::Business::Company' }, ActiveRecord::Base)
+    reflection = ActiveRecord::Reflection.create(:has_many, nil, nil, { :class_name => 'MyApplication::Business::Company' }, ActiveRecord::Base)
     assert_nothing_raised do
       assert_equal MyApplication::Business::Company, reflection.klass
     end
@@ -97,21 +97,21 @@ class ReflectionTest < ActiveRecord::TestCase
     ActiveSupport::Inflector.inflections do |inflect|
       inflect.irregular 'plural_irregular', 'plurales_irregulares'
     end
-    reflection = AssociationReflection.new(:has_many, 'plurales_irregulares', nil, {}, ActiveRecord::Base)
+    reflection = ActiveRecord::Reflection.create(:has_many, 'plurales_irregulares', nil, {}, ActiveRecord::Base)
     assert_equal 'PluralIrregular', reflection.class_name
   end
 
   def test_aggregation_reflection
     reflection_for_address = AggregateReflection.new(
-      :composed_of, :address, nil, { :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ] }, Customer
+      :address, nil, { :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ] }, Customer
     )
 
     reflection_for_balance = AggregateReflection.new(
-      :composed_of, :balance, nil, { :class_name => "Money", :mapping => %w(balance amount) }, Customer
+      :balance, nil, { :class_name => "Money", :mapping => %w(balance amount) }, Customer
     )
 
     reflection_for_gps_location = AggregateReflection.new(
-      :composed_of, :gps_location, nil, { }, Customer
+      :gps_location, nil, { }, Customer
     )
 
     assert Customer.reflect_on_all_aggregations.include?(reflection_for_gps_location)
@@ -135,7 +135,7 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_has_many_reflection
-    reflection_for_clients = AssociationReflection.new(:has_many, :clients, nil, { :order => "id", :dependent => :destroy }, Firm)
+    reflection_for_clients = ActiveRecord::Reflection.create(:has_many, :clients, nil, { :order => "id", :dependent => :destroy }, Firm)
 
     assert_equal reflection_for_clients, Firm.reflect_on_association(:clients)
 
@@ -147,7 +147,7 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_has_one_reflection
-    reflection_for_account = AssociationReflection.new(:has_one, :account, nil, { :foreign_key => "firm_id", :dependent => :destroy }, Firm)
+    reflection_for_account = ActiveRecord::Reflection.create(:has_one, :account, nil, { :foreign_key => "firm_id", :dependent => :destroy }, Firm)
     assert_equal reflection_for_account, Firm.reflect_on_association(:account)
 
     assert_equal Account, Firm.reflect_on_association(:account).klass
@@ -284,12 +284,12 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_association_primary_key_raises_when_missing_primary_key
-    reflection = ActiveRecord::Reflection::AssociationReflection.new(:fuu, :edge, nil, {}, Author)
+    reflection = ActiveRecord::Reflection.create(:has_many, :edge, nil, {}, Author)
     assert_raises(ActiveRecord::UnknownPrimaryKey) { reflection.association_primary_key }
 
     through = Class.new(ActiveRecord::Reflection::ThroughReflection) {
       define_method(:source_reflection) { reflection }
-    }.new(:fuu, :edge, nil, {}, Author)
+    }.new(reflection)
     assert_raises(ActiveRecord::UnknownPrimaryKey) { through.association_primary_key }
   end
 
@@ -299,7 +299,7 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_active_record_primary_key_raises_when_missing_primary_key
-    reflection = ActiveRecord::Reflection::AssociationReflection.new(:fuu, :author, nil, {}, Edge)
+    reflection = ActiveRecord::Reflection.create(:has_many, :author, nil, {}, Edge)
     assert_raises(ActiveRecord::UnknownPrimaryKey) { reflection.active_record_primary_key }
   end
 
@@ -317,32 +317,28 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_default_association_validation
-    assert AssociationReflection.new(:has_many, :clients, nil, {}, Firm).validate?
+    assert ActiveRecord::Reflection.create(:has_many, :clients, nil, {}, Firm).validate?
 
-    assert !AssociationReflection.new(:has_one, :client, nil, {}, Firm).validate?
-    assert !AssociationReflection.new(:belongs_to, :client, nil, {}, Firm).validate?
-    assert !AssociationReflection.new(:has_and_belongs_to_many, :clients, nil, {}, Firm).validate?
+    assert !ActiveRecord::Reflection.create(:has_one, :client, nil, {}, Firm).validate?
+    assert !ActiveRecord::Reflection.create(:belongs_to, :client, nil, {}, Firm).validate?
   end
 
   def test_always_validate_association_if_explicit
-    assert AssociationReflection.new(:has_one, :client, nil, { :validate => true }, Firm).validate?
-    assert AssociationReflection.new(:belongs_to, :client, nil, { :validate => true }, Firm).validate?
-    assert AssociationReflection.new(:has_many, :clients, nil, { :validate => true }, Firm).validate?
-    assert AssociationReflection.new(:has_and_belongs_to_many, :clients, nil, { :validate => true }, Firm).validate?
+    assert ActiveRecord::Reflection.create(:has_one, :client, nil, { :validate => true }, Firm).validate?
+    assert ActiveRecord::Reflection.create(:belongs_to, :client, nil, { :validate => true }, Firm).validate?
+    assert ActiveRecord::Reflection.create(:has_many, :clients, nil, { :validate => true }, Firm).validate?
   end
 
   def test_validate_association_if_autosave
-    assert AssociationReflection.new(:has_one, :client, nil, { :autosave => true }, Firm).validate?
-    assert AssociationReflection.new(:belongs_to, :client, nil, { :autosave => true }, Firm).validate?
-    assert AssociationReflection.new(:has_many, :clients, nil, { :autosave => true }, Firm).validate?
-    assert AssociationReflection.new(:has_and_belongs_to_many, :clients, nil, { :autosave => true }, Firm).validate?
+    assert ActiveRecord::Reflection.create(:has_one, :client, nil, { :autosave => true }, Firm).validate?
+    assert ActiveRecord::Reflection.create(:belongs_to, :client, nil, { :autosave => true }, Firm).validate?
+    assert ActiveRecord::Reflection.create(:has_many, :clients, nil, { :autosave => true }, Firm).validate?
   end
 
   def test_never_validate_association_if_explicit
-    assert !AssociationReflection.new(:has_one, :client, nil, { :autosave => true, :validate => false }, Firm).validate?
-    assert !AssociationReflection.new(:belongs_to, :client, nil, { :autosave => true, :validate => false }, Firm).validate?
-    assert !AssociationReflection.new(:has_many, :clients, nil, { :autosave => true, :validate => false }, Firm).validate?
-    assert !AssociationReflection.new(:has_and_belongs_to_many, :clients, nil, { :autosave => true, :validate => false }, Firm).validate?
+    assert !ActiveRecord::Reflection.create(:has_one, :client, nil, { :autosave => true, :validate => false }, Firm).validate?
+    assert !ActiveRecord::Reflection.create(:belongs_to, :client, nil, { :autosave => true, :validate => false }, Firm).validate?
+    assert !ActiveRecord::Reflection.create(:has_many, :clients, nil, { :autosave => true, :validate => false }, Firm).validate?
   end
 
   def test_foreign_key
@@ -364,11 +360,11 @@ class ReflectionTest < ActiveRecord::TestCase
     category = Struct.new(:table_name, :pluralize_table_names).new('categories', true)
     product = Struct.new(:table_name, :pluralize_table_names).new('products', true)
 
-    reflection = AssociationReflection.new(:has_and_belongs_to_many, :categories, nil, {}, product)
+    reflection = ActiveRecord::Reflection.create(:has_many, :categories, nil, {}, product)
     reflection.stubs(:klass).returns(category)
     assert_equal 'categories_products', reflection.join_table
 
-    reflection = AssociationReflection.new(:has_and_belongs_to_many, :products, nil, {}, category)
+    reflection = ActiveRecord::Reflection.create(:has_many, :products, nil, {}, category)
     reflection.stubs(:klass).returns(product)
     assert_equal 'categories_products', reflection.join_table
   end
@@ -377,11 +373,11 @@ class ReflectionTest < ActiveRecord::TestCase
     category = Struct.new(:table_name, :pluralize_table_names).new('catalog_categories', true)
     product = Struct.new(:table_name, :pluralize_table_names).new('catalog_products', true)
 
-    reflection = AssociationReflection.new(:has_and_belongs_to_many, :categories, nil, {}, product)
+    reflection = ActiveRecord::Reflection.create(:has_many, :categories, nil, {}, product)
     reflection.stubs(:klass).returns(category)
     assert_equal 'catalog_categories_products', reflection.join_table
 
-    reflection = AssociationReflection.new(:has_and_belongs_to_many, :products, nil, {}, category)
+    reflection = ActiveRecord::Reflection.create(:has_many, :products, nil, {}, category)
     reflection.stubs(:klass).returns(product)
     assert_equal 'catalog_categories_products', reflection.join_table
   end
@@ -390,11 +386,11 @@ class ReflectionTest < ActiveRecord::TestCase
     category = Struct.new(:table_name, :pluralize_table_names).new('catalog_categories', true)
     page = Struct.new(:table_name, :pluralize_table_names).new('content_pages', true)
 
-    reflection = AssociationReflection.new(:has_and_belongs_to_many, :categories, nil, {}, page)
+    reflection = ActiveRecord::Reflection.create(:has_many, :categories, nil, {}, page)
     reflection.stubs(:klass).returns(category)
     assert_equal 'catalog_categories_content_pages', reflection.join_table
 
-    reflection = AssociationReflection.new(:has_and_belongs_to_many, :pages, nil, {}, category)
+    reflection = ActiveRecord::Reflection.create(:has_many, :pages, nil, {}, category)
     reflection.stubs(:klass).returns(page)
     assert_equal 'catalog_categories_content_pages', reflection.join_table
   end
@@ -403,11 +399,11 @@ class ReflectionTest < ActiveRecord::TestCase
     category = Struct.new(:table_name, :pluralize_table_names).new('categories', true)
     product = Struct.new(:table_name, :pluralize_table_names).new('products', true)
 
-    reflection = AssociationReflection.new(:has_and_belongs_to_many, :categories, nil, { :join_table => 'product_categories' }, product)
+    reflection = ActiveRecord::Reflection.create(:has_many, :categories, nil, { :join_table => 'product_categories' }, product)
     reflection.stubs(:klass).returns(category)
     assert_equal 'product_categories', reflection.join_table
 
-    reflection = AssociationReflection.new(:has_and_belongs_to_many, :products, nil, { :join_table => 'product_categories' }, category)
+    reflection = ActiveRecord::Reflection.create(:has_many, :products, nil, { :join_table => 'product_categories' }, category)
     reflection.stubs(:klass).returns(product)
     assert_equal 'product_categories', reflection.join_table
   end
-- 
cgit v1.2.3


From 584fc8b33b66aa47b2ecabedbdca7c66f16653d7 Mon Sep 17 00:00:00 2001
From: Andrey Novikov <envek@envek.name>
Date: Thu, 10 Jul 2014 21:00:46 +0400
Subject: Dump PostgreSQL primary key with custom function as a default.

For example, if use pgcrypto extension in PostgreSQL 9.4 beta 1, where
uuid-ossp extension isn't available for moment of writing, and thus to
use a gen_random_uuid() method as a primary key default.

In this case schema dumper wasn't able to correctly reconstruct
create_table statement and lost primary key constraint on schema load.

Fixes #16111.
---
 .../test/cases/adapters/postgresql/uuid_test.rb    | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index f5b199b46a..df8faff546 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -87,10 +87,26 @@ class PostgresqlUUIDGenerationTest < ActiveRecord::TestCase
       t.string 'name'
       t.uuid 'other_uuid', default: 'uuid_generate_v4()'
     end
+
+    # Create custom PostgreSQL function to generate UUIDs
+    # to test dumping tables which columns have defaults with custom functions
+    connection.execute <<-SQL
+    CREATE OR REPLACE FUNCTION my_uuid_generator() RETURNS uuid
+    AS $$ SELECT * FROM uuid_generate_v4() $$
+    LANGUAGE SQL VOLATILE;
+    SQL
+
+    # Create such a table with custom function as default value generator
+    connection.create_table('pg_uuids_2', id: :uuid, default: 'my_uuid_generator()') do |t|
+      t.string 'name'
+      t.uuid 'other_uuid_2', default: 'my_uuid_generator()'
+    end
   end
 
   teardown do
     drop_table "pg_uuids"
+    drop_table 'pg_uuids_2'
+    connection.execute 'DROP FUNCTION IF EXISTS my_uuid_generator();'
   end
 
   if ActiveRecord::Base.connection.supports_extensions?
@@ -122,6 +138,13 @@ class PostgresqlUUIDGenerationTest < ActiveRecord::TestCase
       assert_match(/\bcreate_table "pg_uuids", id: :uuid, default: "uuid_generate_v1\(\)"/, schema.string)
       assert_match(/t\.uuid   "other_uuid", default: "uuid_generate_v4\(\)"/, schema.string)
     end
+
+    def test_schema_dumper_for_uuid_primary_key_with_custom_default
+      schema = StringIO.new
+      ActiveRecord::SchemaDumper.dump(connection, schema)
+      assert_match(/\bcreate_table "pg_uuids_2", id: :uuid, default: "my_uuid_generator\(\)"/, schema.string)
+      assert_match(/t\.uuid   "other_uuid_2", default: "my_uuid_generator\(\)"/, schema.string)
+    end
   end
 end
 
-- 
cgit v1.2.3


From d739dd1627d1b20bde417045558848fe92a82d6c Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Tue, 1 Jul 2014 08:11:59 -0600
Subject: Use a type object for type casting behavior on SQLite3

---
 activerecord/test/cases/adapters/sqlite3/quoting_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
index 3bd53aa278..ac8332e2fa 100644
--- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
@@ -103,6 +103,13 @@ module ActiveRecord
           }.new
           assert_raise(TypeError) { @conn.type_cast(quoted_id_obj, nil) }
         end
+
+        def test_quoting_binary_strings
+          value = "hello".encode('ascii-8bit')
+          column = Column.new(nil, 1, SQLite3String.new)
+
+          assert_equal "'hello'", @conn.quote(value, column)
+        end
       end
     end
   end
-- 
cgit v1.2.3


From 9c83e8401d802864dde38ddffb690a4245d01716 Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Fri, 11 Jul 2014 07:50:16 -0600
Subject: AttributeSet#include? -> AttributeSet#key?

https://github.com/rails/rails/pull/15868/files#r14135210
---
 activerecord/test/cases/attribute_set_test.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/attribute_set_test.rb b/activerecord/test/cases/attribute_set_test.rb
index cdbb11fa32..dc20c3c676 100644
--- a/activerecord/test/cases/attribute_set_test.rb
+++ b/activerecord/test/cases/attribute_set_test.rb
@@ -88,15 +88,15 @@ module ActiveRecord
       assert_equal [:foo], attributes.keys
     end
 
-    test "uninitialized attributes return false for include?" do
+    test "uninitialized attributes return false for key?" do
       attributes = attributes_with_uninitialized_key
-      assert attributes.include?(:foo)
-      assert_not attributes.include?(:bar)
+      assert attributes.key?(:foo)
+      assert_not attributes.key?(:bar)
     end
 
-    test "unknown attributes return false for include?" do
+    test "unknown attributes return false for key?" do
       attributes = attributes_with_uninitialized_key
-      assert_not attributes.include?(:wibble)
+      assert_not attributes.key?(:wibble)
     end
 
     test "fetch_value returns the value for the given initialized attribute" do
-- 
cgit v1.2.3


From f378f23653259dee98061b279b628eb774e6faf1 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Thu, 29 May 2014 07:45:56 +0000
Subject: Treat invalid uuid as nil

---
 .../test/cases/adapters/postgresql/uuid_test.rb    | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index df8faff546..d7ff81a382 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -60,6 +60,43 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase
     assert_equal(nil, UUIDType.last.guid)
   end
 
+  def test_treat_invalid_uuid_as_nil
+    uuid = UUIDType.create! guid: 'foobar'
+    assert_equal(nil, uuid.guid)
+  end
+
+  def test_invalid_uuid_dont_modify_before_type_cast
+    uuid = UUIDType.new guid: 'foobar'
+    assert_equal 'foobar', uuid.guid_before_type_cast
+  end
+
+  def test_rfc_4122_regex
+    # Valid uuids
+    ['A0EEBC99-9C0B-4EF8-BB6D-6BB9BD380A11',
+     '{a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11}',
+     'a0eebc999c0b4ef8bb6d6bb9bd380a11',
+     'a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11',
+     '{a0eebc99-9c0b4ef8-bb6d6bb9-bd380a11}'].each do |valid_uuid|
+      uuid = UUIDType.new guid: valid_uuid
+      assert_not_nil uuid.guid
+    end
+
+    # Invalid uuids
+    [['A0EEBC99-9C0B-4EF8-BB6D-6BB9BD380A11'],
+     Hash.new,
+     0,
+     0.0,
+     true,
+     'Z0000C99-9C0B-4EF8-BB6D-6BB9BD380A11',
+     '{a0eebc99-9c0b-4ef8-fb6d-6bb9bd380a11}',
+     'a0eebc999r0b4ef8ab6d6bb9bd380a11',
+     'a0ee-bc99------4ef8-bb6d-6bb9-bd38-0a11',
+     '{a0eebc99-bb6d6bb9-bd380a11}'].each do |invalid_uuid|
+      uuid = UUIDType.new guid: invalid_uuid
+      assert_nil uuid.guid
+    end
+  end
+
   def test_uuid_formats
     ["A0EEBC99-9C0B-4EF8-BB6D-6BB9BD380A11",
      "{a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11}",
-- 
cgit v1.2.3


From fc4680425817a5fcfbaba970201fecee7cb8491d Mon Sep 17 00:00:00 2001
From: Yasuo Honda <yasuo.honda@gmail.com>
Date: Sat, 12 Jul 2014 05:42:49 +0900
Subject: Address ORA-00972: identifier is too long when tested with Oracle by
 using shorter attribute names.

---
 activerecord/test/models/face.rb   | 3 ++-
 activerecord/test/models/man.rb    | 2 +-
 activerecord/test/schema/schema.rb | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/models/face.rb b/activerecord/test/models/face.rb
index 3d7f0626e2..91e46f83e5 100644
--- a/activerecord/test/models/face.rb
+++ b/activerecord/test/models/face.rb
@@ -1,7 +1,8 @@
 class Face < ActiveRecord::Base
   belongs_to :man, :inverse_of => :face
   belongs_to :polymorphic_man, :polymorphic => true, :inverse_of => :polymorphic_face
-  belongs_to :polymorphic_man_without_inverse, :polymorphic => true
+  # Oracle identifier lengh is limited to 30 bytes or less, `polymorphic` renamed `poly`
+  belongs_to :poly_man_without_inverse, :polymorphic => true
   # These is a "broken" inverse_of for the purposes of testing
   belongs_to :horrible_man, :class_name => 'Man', :inverse_of => :horrible_face
   belongs_to :horrible_polymorphic_man, :polymorphic => true, :inverse_of => :horrible_polymorphic_face
diff --git a/activerecord/test/models/man.rb b/activerecord/test/models/man.rb
index a26491ce61..4fbb6b226b 100644
--- a/activerecord/test/models/man.rb
+++ b/activerecord/test/models/man.rb
@@ -1,7 +1,7 @@
 class Man < ActiveRecord::Base
   has_one :face, :inverse_of => :man
   has_one :polymorphic_face, :class_name => 'Face', :as => :polymorphic_man, :inverse_of => :polymorphic_man
-  has_one :polymorphic_face_without_inverse, :class_name => 'Face', :as => :polymorphic_man_without_inverse
+  has_one :polymorphic_face_without_inverse, :class_name => 'Face', :as => :poly_man_without_inverse
   has_many :interests, :inverse_of => :man
   has_many :polymorphic_interests, :class_name => 'Interest', :as => :polymorphic_man, :inverse_of => :polymorphic_man
   # These are "broken" inverse_of associations for the purposes of testing
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 932c9ba5d9..146190fc19 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -781,8 +781,8 @@ ActiveRecord::Schema.define do
     t.integer :man_id
     t.integer :polymorphic_man_id
     t.string  :polymorphic_man_type
-    t.integer :polymorphic_man_without_inverse_id
-    t.string  :polymorphic_man_without_inverse_type
+    t.integer :poly_man_without_inverse_id
+    t.string  :poly_man_without_inverse_type
     t.integer :horrible_polymorphic_man_id
     t.string  :horrible_polymorphic_man_type
   end
-- 
cgit v1.2.3


From a66aeb84e215c8a6e365a7fd0197c5703a14f241 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 15 Jul 2014 08:43:18 -0700
Subject: Revert "Revert "Merge pull request #16059 from
 jenncoop/json-serialized-attr""

This reverts commit 6f3c64eeb1dc8288dae49f114aaf619adc7dcb7f.

Conflicts:
	activerecord/CHANGELOG.md
---
 activerecord/test/cases/serialized_attribute_test.rb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/serialized_attribute_test.rb b/activerecord/test/cases/serialized_attribute_test.rb
index 186a1a2ade..a8f667c732 100644
--- a/activerecord/test/cases/serialized_attribute_test.rb
+++ b/activerecord/test/cases/serialized_attribute_test.rb
@@ -3,10 +3,11 @@ require 'models/topic'
 require 'models/reply'
 require 'models/person'
 require 'models/traffic_light'
+require 'models/post'
 require 'bcrypt'
 
 class SerializedAttributeTest < ActiveRecord::TestCase
-  fixtures :topics
+  fixtures :topics, :posts
 
   MyObject = Struct.new :attribute1, :attribute2
 
@@ -67,6 +68,19 @@ class SerializedAttributeTest < ActiveRecord::TestCase
     assert_equal(orig.content, clone.content)
   end
 
+  def test_serialized_json_attribute_returns_unserialized_value
+    Topic.serialize :content, JSON
+    my_post = posts(:welcome)
+
+    t = Topic.new(content: my_post)
+    t.save!
+    t.reload
+
+    assert_instance_of(Hash, t.content)
+    assert_equal(my_post.id, t.content["id"])
+    assert_equal(my_post.title, t.content["title"])
+  end
+
   def test_serialized_attribute_declared_in_subclass
     hash = { 'important1' => 'value1', 'important2' => 'value2' }
     important_topic = ImportantTopic.create("important" => hash)
-- 
cgit v1.2.3


From f4c8a4b71fcce46c3259240b50f30e134e14c4a2 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 14 Jul 2014 10:38:14 -0700
Subject: Merge pull request #16162 from chancancode/fix_json_coder

Fixed JSON coder when loading NULL from DB
---
 activerecord/test/cases/serialized_attribute_test.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/serialized_attribute_test.rb b/activerecord/test/cases/serialized_attribute_test.rb
index a8f667c732..96d1e365f0 100644
--- a/activerecord/test/cases/serialized_attribute_test.rb
+++ b/activerecord/test/cases/serialized_attribute_test.rb
@@ -81,6 +81,24 @@ class SerializedAttributeTest < ActiveRecord::TestCase
     assert_equal(my_post.title, t.content["title"])
   end
 
+  # This is to ensure that the JSON coder is behaving the same way as 4.0, but
+  # we can consider changing this in the future.
+  def test_json_db_null
+    Topic.serialize :content, JSON
+
+    # Force a row to have a database NULL instead of a JSON "null"
+    id = Topic.connection.insert "INSERT INTO topics (content) VALUES(NULL)"
+    t = Topic.find(id)
+
+    assert_nil t.content
+
+    t.save!
+
+    # On 4.0, re-saving a row with a database NULL will turn that into a JSON
+    # "null"
+    assert_equal 1, Topic.where('content = "null"').count
+  end
+
   def test_serialized_attribute_declared_in_subclass
     hash = { 'important1' => 'value1', 'important2' => 'value2' }
     important_topic = ImportantTopic.create("important" => hash)
-- 
cgit v1.2.3


From cd809fd8ce920b27f813b56907e9a603a2b91839 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 14 Jul 2014 11:11:59 -0700
Subject: Fixed SQL syntax for postgresql

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/serialized_attribute_test.rb b/activerecord/test/cases/serialized_attribute_test.rb
index 96d1e365f0..d7e6d3465f 100644
--- a/activerecord/test/cases/serialized_attribute_test.rb
+++ b/activerecord/test/cases/serialized_attribute_test.rb
@@ -96,7 +96,7 @@ class SerializedAttributeTest < ActiveRecord::TestCase
 
     # On 4.0, re-saving a row with a database NULL will turn that into a JSON
     # "null"
-    assert_equal 1, Topic.where('content = "null"').count
+    assert_equal 1, Topic.where("content = 'null'").count
   end
 
   def test_serialized_attribute_declared_in_subclass
-- 
cgit v1.2.3


From da6472c916be5645ea4d761e7cbf44d486ca07a8 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 15 Jul 2014 09:08:31 -0700
Subject: Document the change in `nil` handling for serialized attributes

Also updated the test case to reflect that
---
 .../test/cases/serialized_attribute_test.rb         | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/serialized_attribute_test.rb b/activerecord/test/cases/serialized_attribute_test.rb
index d7e6d3465f..f8d87a3661 100644
--- a/activerecord/test/cases/serialized_attribute_test.rb
+++ b/activerecord/test/cases/serialized_attribute_test.rb
@@ -81,22 +81,25 @@ class SerializedAttributeTest < ActiveRecord::TestCase
     assert_equal(my_post.title, t.content["title"])
   end
 
-  # This is to ensure that the JSON coder is behaving the same way as 4.0, but
-  # we can consider changing this in the future.
-  def test_json_db_null
+  def test_json_read_legacy_null
     Topic.serialize :content, JSON
 
-    # Force a row to have a database NULL instead of a JSON "null"
-    id = Topic.connection.insert "INSERT INTO topics (content) VALUES(NULL)"
+    # Force a row to have a JSON "null" instead of a database NULL (this is how
+    # null values are saved on 4.1 and before)
+    id = Topic.connection.insert "INSERT INTO topics (content) VALUES('null')"
     t = Topic.find(id)
 
     assert_nil t.content
+  end
 
-    t.save!
+  def test_json_read_db_null
+    Topic.serialize :content, JSON
 
-    # On 4.0, re-saving a row with a database NULL will turn that into a JSON
-    # "null"
-    assert_equal 1, Topic.where("content = 'null'").count
+    # Force a row to have a database NULL instead of a JSON "null"
+    id = Topic.connection.insert "INSERT INTO topics (content) VALUES(NULL)"
+    t = Topic.find(id)
+
+    assert_nil t.content
   end
 
   def test_serialized_attribute_declared_in_subclass
-- 
cgit v1.2.3


From b8e8096a89b0405544c8004c9c445a7894cf7ec9 Mon Sep 17 00:00:00 2001
From: Gustavo Beathyate <gustavo.bt@me.com>
Date: Tue, 15 Jul 2014 15:50:29 -0500
Subject: Implement required #encode_with

While running the spec `ARCONN=mysql2 ruby -v -Itest
test/cases/yaml_serialization_test.rb`
the following warning shows up:
`implementing to_yaml is deprecated, please implement "encode_with"`
---
 activerecord/test/cases/yaml_serialization_test.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/yaml_serialization_test.rb b/activerecord/test/cases/yaml_serialization_test.rb
index 9f1d110ddb..bce59b4fcd 100644
--- a/activerecord/test/cases/yaml_serialization_test.rb
+++ b/activerecord/test/cases/yaml_serialization_test.rb
@@ -1,5 +1,6 @@
 require 'cases/helper'
 require 'models/topic'
+require 'models/reply'
 require 'models/post'
 require 'models/author'
 
-- 
cgit v1.2.3


From 3121412cf181388f8dac71f2d707be2cbb764524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 15 Jul 2014 17:56:27 -0300
Subject: Keep quietly and capture undeprecated on your suite

---
 activerecord/test/cases/migration_test.rb        | 10 ++++++++++
 activerecord/test/cases/tasks/mysql_rake_test.rb | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 6b840e16bb..84720585f2 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -895,4 +895,14 @@ class CopyMigrationsTest < ActiveRecord::TestCase
   ensure
     ActiveRecord::Base.logger = old
   end
+
+  private
+
+  def quietly
+    silence_stream(STDOUT) do
+      silence_stream(STDERR) do
+        yield
+      end
+    end
+  end
 end
diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 3e3a2828f3..572ad2ed18 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -288,6 +288,25 @@ module ActiveRecord
         @configuration.merge('port' => 10000),
         filename)
     end
+
+    private
+
+    def capture(stream)
+      stream = stream.to_s
+      captured_stream = Tempfile.new(stream)
+      stream_io = eval("$#{stream}")
+      origin_stream = stream_io.dup
+      stream_io.reopen(captured_stream)
+
+      yield
+
+      stream_io.rewind
+      return captured_stream.read
+    ensure
+      captured_stream.close
+      captured_stream.unlink
+      stream_io.reopen(origin_stream)
+    end
   end
 
   class MySQLStructureLoadTest < ActiveRecord::TestCase
-- 
cgit v1.2.3


From 41fb06fa47b0c11d6b943163ec1bc8ce9fd4d229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 15 Jul 2014 16:12:23 -0300
Subject: Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`.

These methods may cause confusion with the `reset_changes` that
behaves differently
of them.

Also rename undo_changes to restore_changes to match this new set of
methods.
---
 activerecord/test/cases/dirty_test.rb | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index ea73c561e9..69a7f25213 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -169,7 +169,19 @@ class DirtyTest < ActiveRecord::TestCase
     pirate = Pirate.create!(:catchphrase => 'Yar!')
     pirate.catchphrase = 'Ahoy!'
 
-    pirate.reset_catchphrase!
+    assert_deprecated do
+      pirate.reset_catchphrase!
+    end
+    assert_equal "Yar!", pirate.catchphrase
+    assert_equal Hash.new, pirate.changes
+    assert !pirate.catchphrase_changed?
+  end
+
+  def test_restore_attribute!
+    pirate = Pirate.create!(:catchphrase => 'Yar!')
+    pirate.catchphrase = 'Ahoy!'
+
+    pirate.restore_catchphrase!
     assert_equal "Yar!", pirate.catchphrase
     assert_equal Hash.new, pirate.changes
     assert !pirate.catchphrase_changed?
@@ -398,7 +410,7 @@ class DirtyTest < ActiveRecord::TestCase
   def test_dup_objects_should_not_copy_dirty_flag_from_creator
     pirate = Pirate.create!(:catchphrase => "shiver me timbers")
     pirate_dup = pirate.dup
-    pirate_dup.reset_catchphrase!
+    pirate_dup.restore_catchphrase!
     pirate.catchphrase = "I love Rum"
     assert pirate.catchphrase_changed?
     assert !pirate_dup.catchphrase_changed?
-- 
cgit v1.2.3


From 3eca0621602a9f9dbc5e81f007db888d36813ed8 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Wed, 16 Jul 2014 10:06:55 +0200
Subject: use foreign key DSL in our tests.

---
 activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb | 4 ++--
 activerecord/test/schema/schema.rb                                | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb
index ec73ec35aa..9c49599d34 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb
@@ -6,12 +6,12 @@ module ActiveRecord
       class SchemaMigrationsTest < ActiveRecord::TestCase
         def test_renaming_index_on_foreign_key
           connection.add_index "engines", "car_id"
-          connection.execute "ALTER TABLE engines ADD CONSTRAINT fk_engines_cars FOREIGN KEY (car_id) REFERENCES cars(id)"
+          connection.add_foreign_key :engines, :cars, name: "fk_engines_cars"
 
           connection.rename_index("engines", "index_engines_on_car_id", "idx_renamed")
           assert_equal ["idx_renamed"], connection.indexes("engines").map(&:name)
         ensure
-          connection.execute "ALTER TABLE engines DROP FOREIGN KEY fk_engines_cars"
+          connection.remove_foreign_key :engines, name: "fk_engines_cars"
         end
 
         def test_initializes_schema_migrations_for_encoding_utf8mb4
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 146190fc19..a8b21904ac 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -860,9 +860,8 @@ ActiveRecord::Schema.define do
     create_table :fk_test_has_pk, force: true, primary_key: "pk_id" do |t|
     end
 
-    execute "ALTER TABLE fk_test_has_fk ADD CONSTRAINT fk_name FOREIGN KEY (#{quote_column_name 'fk_id'}) REFERENCES #{quote_table_name 'fk_test_has_pk'} (#{quote_column_name 'pk_id'})"
-
-    execute "ALTER TABLE lessons_students ADD CONSTRAINT student_id_fk FOREIGN KEY (#{quote_column_name 'student_id'}) REFERENCES #{quote_table_name 'students'} (#{quote_column_name 'id'})"
+    add_foreign_key :fk_test_has_fk, :fk_test_has_pk, column: "fk_id", name: "fk_name", primary_key: "pk_id"
+    add_foreign_key :lessons_students, :students
   end
 
   create_table :overloaded_types, force: true do |t|
-- 
cgit v1.2.3


From a4802e217e95af14ca6ae13ab72ff3b44e2b4217 Mon Sep 17 00:00:00 2001
From: Mariano Valles <mariano.valles@wooga.com>
Date: Wed, 16 Jul 2014 13:20:53 +0200
Subject: Fix rational to decimal on type_cast_from_user

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/types_test.rb b/activerecord/test/cases/types_test.rb
index 47cf775cb6..4ba8a3e09f 100644
--- a/activerecord/test/cases/types_test.rb
+++ b/activerecord/test/cases/types_test.rb
@@ -102,6 +102,16 @@ module ActiveRecord
         assert_equal BigDecimal.new("1"), type.type_cast_from_user(:"1")
       end
 
+      def test_type_cast_rational_to_decimal_with_precision
+        type = Type::Decimal.new(:precision => 2)
+        assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3))
+      end
+
+      def test_type_cast_rational_to_decimal_without_precision_defaults_to_18_36
+        type = Type::Decimal.new
+        assert_equal BigDecimal("0.333333333333333333E0"), type.type_cast_from_user(Rational(1, 3))
+      end
+
       def test_type_cast_binary
         type = Type::Binary.new
         assert_equal nil, type.type_cast_from_user(nil)
-- 
cgit v1.2.3


From f8f5cdc98c4a096ad8bf72190db8a636b2c973db Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Wed, 16 Jul 2014 14:13:07 +0200
Subject: Active Record tests still depend on `capture`. Let's keep it for now.

This is a follow-up to 3121412

/cc @rafaelfranca

This will remove deprecation warnings from the PostgreSQL suite:

```
DEPRECATION WARNING: #capture(stream) is deprecated and will be removed in the next release. (called from capture at /Users/senny/Projects/rails/activesupport/lib/active_support/core_ext/kernel/reporting.rb:89)
/Users/senny/Projects/rails/activesupport/lib/active_support/core_ext/kernel/reporting.rb:89:in `capture'
  /Users/senny/Projects/rails/activerecord/test/cases/adapters/postgresql/composite_test.rb:73:in `ensure_warning_is_issued'
  /Users/senny/Projects/rails/activerecord/test/cases/adapters/postgresql/composite_test.rb:48:in `test_column'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:106:in `block (3 levels) in run'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:204:in `capture_exceptions'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:103:in `block (2 levels) in run'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:256:in `time_it'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:102:in `block in run'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:317:in `on_signal'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:276:in `with_info_handler'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:101:in `run'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:759:in `run_one_method'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:293:in `run_one_method'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:287:in `block (2 levels) in run'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:286:in `each'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:286:in `block in run'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:317:in `on_signal'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:306:in `with_info_handler'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:285:in `run'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:149:in `block in __run'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:149:in `map'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:149:in `__run'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:126:in `run'
  /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:55:in `block in autorun'
```
---
 activerecord/test/cases/tasks/mysql_rake_test.rb | 19 -------------------
 activerecord/test/cases/test_case.rb             | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 19 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 572ad2ed18..3e3a2828f3 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -288,25 +288,6 @@ module ActiveRecord
         @configuration.merge('port' => 10000),
         filename)
     end
-
-    private
-
-    def capture(stream)
-      stream = stream.to_s
-      captured_stream = Tempfile.new(stream)
-      stream_io = eval("$#{stream}")
-      origin_stream = stream_io.dup
-      stream_io.reopen(captured_stream)
-
-      yield
-
-      stream_io.rewind
-      return captured_stream.read
-    ensure
-      captured_stream.close
-      captured_stream.unlink
-      stream_io.reopen(origin_stream)
-    end
   end
 
   class MySQLStructureLoadTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index b6c5511849..80aaead6d9 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -1,10 +1,33 @@
 require 'active_support/test_case'
 
 module ActiveRecord
+  # The +capture+ helper was deprecated because it is not thread safe.
+  # Our own tests still depend on it.
+  module UndeprecateCapture
+    def capture(stream)
+      stream = stream.to_s
+      captured_stream = Tempfile.new(stream)
+      stream_io = eval("$#{stream}")
+      origin_stream = stream_io.dup
+      stream_io.reopen(captured_stream)
+
+      yield
+
+      stream_io.rewind
+      return captured_stream.read
+    ensure
+      captured_stream.close
+      captured_stream.unlink
+      stream_io.reopen(origin_stream)
+    end
+  end
+
   # = Active Record Test Case
   #
   # Defines some test assertions to test against SQL queries.
   class TestCase < ActiveSupport::TestCase #:nodoc:
+    include UndeprecateCapture
+
     def teardown
       SQLCounter.clear_log
     end
-- 
cgit v1.2.3


From 7098c9083ccd08eb36cce5abcc99ad0506945ef0 Mon Sep 17 00:00:00 2001
From: Mariano Valles <mariano.valles@wooga.com>
Date: Wed, 16 Jul 2014 16:08:35 +0200
Subject: Change class evaluation for Rationals in cast_value

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/types_test.rb b/activerecord/test/cases/types_test.rb
index 4ba8a3e09f..541c0a4e12 100644
--- a/activerecord/test/cases/types_test.rb
+++ b/activerecord/test/cases/types_test.rb
@@ -103,7 +103,7 @@ module ActiveRecord
       end
 
       def test_type_cast_rational_to_decimal_with_precision
-        type = Type::Decimal.new(:precision => 2)
+        type = Type::Decimal.new(precision: 2)
         assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3))
       end
 
-- 
cgit v1.2.3


From 2f93aa0d2b304b804853b100174a7ac47a1c4dd5 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Wed, 16 Jul 2014 16:15:16 +0200
Subject: we intend to keep the `capture` helper for Active Record tests.

This is a follow up to f8f5cdc
---
 activerecord/test/cases/test_case.rb | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index 80aaead6d9..23a170388e 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -1,9 +1,18 @@
 require 'active_support/test_case'
 
 module ActiveRecord
-  # The +capture+ helper was deprecated because it is not thread safe.
-  # Our own tests still depend on it.
-  module UndeprecateCapture
+  # = Active Record Test Case
+  #
+  # Defines some test assertions to test against SQL queries.
+  class TestCase < ActiveSupport::TestCase #:nodoc:
+    def teardown
+      SQLCounter.clear_log
+    end
+
+    def assert_date_from_db(expected, actual, message = nil)
+      assert_equal expected.to_s, actual.to_s, message
+    end
+
     def capture(stream)
       stream = stream.to_s
       captured_stream = Tempfile.new(stream)
@@ -20,21 +29,6 @@ module ActiveRecord
       captured_stream.unlink
       stream_io.reopen(origin_stream)
     end
-  end
-
-  # = Active Record Test Case
-  #
-  # Defines some test assertions to test against SQL queries.
-  class TestCase < ActiveSupport::TestCase #:nodoc:
-    include UndeprecateCapture
-
-    def teardown
-      SQLCounter.clear_log
-    end
-
-    def assert_date_from_db(expected, actual, message = nil)
-      assert_equal expected.to_s, actual.to_s, message
-    end
 
     def capture_sql
       SQLCounter.clear_log
-- 
cgit v1.2.3


From 431b4b4d8881fce7bd937d7d9ff38afb1e3d8b4c Mon Sep 17 00:00:00 2001
From: Mariano Valles <mariano.valles@wooga.com>
Date: Wed, 16 Jul 2014 16:23:54 +0200
Subject: Fix case statement to use ::Numeric and ::String

---
 activerecord/test/cases/type/decimal_test.rb | 24 ++++++++++++++++++++++++
 activerecord/test/cases/types_test.rb        | 17 -----------------
 2 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 activerecord/test/cases/type/decimal_test.rb

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/type/decimal_test.rb b/activerecord/test/cases/type/decimal_test.rb
new file mode 100644
index 0000000000..1415afc420
--- /dev/null
+++ b/activerecord/test/cases/type/decimal_test.rb
@@ -0,0 +1,24 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class DecimalTest < ActiveRecord::TestCase
+      def test_type_cast_decimal
+        type = Type::Decimal.new
+        assert_equal BigDecimal.new("0"), type.type_cast_from_user(BigDecimal.new("0"))
+        assert_equal BigDecimal.new("123"), type.type_cast_from_user(123.0)
+        assert_equal BigDecimal.new("1"), type.type_cast_from_user(:"1")
+      end
+
+      def test_type_cast_rational_to_decimal_with_precision
+        type = Type::Decimal.new(precision: 2)
+        assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3))
+      end
+
+      def test_type_cast_rational_to_decimal_without_precision_defaults_to_18_36
+        type = Type::Decimal.new
+        assert_equal BigDecimal("0.333333333333333333E0"), type.type_cast_from_user(Rational(1, 3))
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/types_test.rb b/activerecord/test/cases/types_test.rb
index 541c0a4e12..5c54812f30 100644
--- a/activerecord/test/cases/types_test.rb
+++ b/activerecord/test/cases/types_test.rb
@@ -95,23 +95,6 @@ module ActiveRecord
         assert_not type.changed?(nil, nil, nil)
       end
 
-      def test_type_cast_decimal
-        type = Type::Decimal.new
-        assert_equal BigDecimal.new("0"), type.type_cast_from_user(BigDecimal.new("0"))
-        assert_equal BigDecimal.new("123"), type.type_cast_from_user(123.0)
-        assert_equal BigDecimal.new("1"), type.type_cast_from_user(:"1")
-      end
-
-      def test_type_cast_rational_to_decimal_with_precision
-        type = Type::Decimal.new(precision: 2)
-        assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3))
-      end
-
-      def test_type_cast_rational_to_decimal_without_precision_defaults_to_18_36
-        type = Type::Decimal.new
-        assert_equal BigDecimal("0.333333333333333333E0"), type.type_cast_from_user(Rational(1, 3))
-      end
-
       def test_type_cast_binary
         type = Type::Binary.new
         assert_equal nil, type.type_cast_from_user(nil)
-- 
cgit v1.2.3


From dd02463a26f3d9cd20bb6fb5ef84e0df7477c75d Mon Sep 17 00:00:00 2001
From: Mariano Valles <mariano.valles@wooga.com>
Date: Wed, 16 Jul 2014 17:17:31 +0200
Subject: Fix decimal_test module and add new test for object responding to
 to_d

---
 activerecord/test/cases/type/decimal_test.rb | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/type/decimal_test.rb b/activerecord/test/cases/type/decimal_test.rb
index 1415afc420..951cd879dd 100644
--- a/activerecord/test/cases/type/decimal_test.rb
+++ b/activerecord/test/cases/type/decimal_test.rb
@@ -1,24 +1,33 @@
 require "cases/helper"
 
 module ActiveRecord
-  module ConnectionAdapters
+  module Type
     class DecimalTest < ActiveRecord::TestCase
       def test_type_cast_decimal
-        type = Type::Decimal.new
+        type = Decimal.new
         assert_equal BigDecimal.new("0"), type.type_cast_from_user(BigDecimal.new("0"))
         assert_equal BigDecimal.new("123"), type.type_cast_from_user(123.0)
         assert_equal BigDecimal.new("1"), type.type_cast_from_user(:"1")
       end
 
-      def test_type_cast_rational_to_decimal_with_precision
-        type = Type::Decimal.new(precision: 2)
+      def test_type_cast_decimal_from_rational_with_precision
+        type = Decimal.new(precision: 2)
         assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3))
       end
 
-      def test_type_cast_rational_to_decimal_without_precision_defaults_to_18_36
-        type = Type::Decimal.new
+      def test_type_cast_decimal_from_rational_without_precision_defaults_to_18_36
+        type = Decimal.new
         assert_equal BigDecimal("0.333333333333333333E0"), type.type_cast_from_user(Rational(1, 3))
       end
+
+      def test_type_cast_decimal_from_object_responding_to_d
+        value = Object.new
+        def value.to_d
+          BigDecimal.new("1")
+        end
+        type = Decimal.new
+        assert_equal BigDecimal("1"), type.type_cast_from_user(value)
+      end
     end
   end
 end
-- 
cgit v1.2.3


From 599d138465f772ac6bf9cfe1f10d4937a0604912 Mon Sep 17 00:00:00 2001
From: Yasuo Honda <yasuo.honda@gmail.com>
Date: Thu, 17 Jul 2014 02:48:00 +0900
Subject: Revert "Rename to
 test_mysql_strict_mode_disabled_dont_override_global_sql_mode"

This reverts commit babc24c1b07c1fd58b9b3249b0256f9b0d45c0f0.

Conflicts:

	activerecord/test/cases/adapters/mysql/connection_test.rb
	activerecord/test/cases/adapters/mysql2/connection_test.rb
---
 activerecord/test/cases/adapters/mysql/connection_test.rb  | 7 +++----
 activerecord/test/cases/adapters/mysql2/connection_test.rb | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index 4c90d06732..b0759dffde 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -134,12 +134,11 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     assert_equal [["STRICT_ALL_TABLES"]], result.rows
   end
 
-  def test_mysql_strict_mode_disabled_dont_override_global_sql_mode
+  def test_mysql_strict_mode_disabled
     run_without_connection do |orig_connection|
       ActiveRecord::Base.establish_connection(orig_connection.merge({:strict => false}))
-      global_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.sql_mode"
-      session_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
-      assert_equal global_sql_mode.rows, session_sql_mode.rows
+      result = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
+      assert_equal [['']], result.rows
     end
   end
 
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index 65f50e77bb..3b35e69e0d 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -60,12 +60,11 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     assert_equal [["STRICT_ALL_TABLES"]], result.rows
   end
 
-  def test_mysql_strict_mode_disabled_dont_override_global_sql_mode
+  def test_mysql_strict_mode_disabled
     run_without_connection do |orig_connection|
       ActiveRecord::Base.establish_connection(orig_connection.merge({:strict => false}))
-      global_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.sql_mode"
-      session_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
-      assert_equal global_sql_mode.rows, session_sql_mode.rows
+      result = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
+      assert_equal [['']], result.rows
     end
   end
 
-- 
cgit v1.2.3


From 15fd96a06735e13b625ad396d86d9053d7d98a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 17 Jul 2014 17:47:58 -0300
Subject: Disable some tests on SQLite

These tests were passing before because the precision were not using to
cast the value. Not it is being used so it would fail on sqlite3
---
 .../test/cases/migration/column_attributes_test.rb | 154 ++++++++++-----------
 1 file changed, 77 insertions(+), 77 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/migration/column_attributes_test.rb b/activerecord/test/cases/migration/column_attributes_test.rb
index 93adbdd05b..763aa88f72 100644
--- a/activerecord/test/cases/migration/column_attributes_test.rb
+++ b/activerecord/test/cases/migration/column_attributes_test.rb
@@ -51,46 +51,46 @@ module ActiveRecord
         end
       end
 
-      # We specifically do a manual INSERT here, and then test only the SELECT
-      # functionality. This allows us to more easily catch INSERT being broken,
-      # but SELECT actually working fine.
-      def test_native_decimal_insert_manual_vs_automatic
-        correct_value = '0012345678901234567890.0123456789'.to_d
-
-        connection.add_column "test_models", "wealth", :decimal, :precision => '30', :scale => '10'
-
-        # Do a manual insertion
-        if current_adapter?(:OracleAdapter)
-          connection.execute "insert into test_models (id, wealth) values (people_seq.nextval, 12345678901234567890.0123456789)"
-        elsif current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003 #before MySQL 5.0.3 decimals stored as strings
-          connection.execute "insert into test_models (wealth) values ('12345678901234567890.0123456789')"
-        elsif current_adapter?(:PostgreSQLAdapter)
-          connection.execute "insert into test_models (wealth) values (12345678901234567890.0123456789)"
-        else
-          connection.execute "insert into test_models (wealth) values (12345678901234567890.0123456789)"
-        end
+      unless current_adapter?(:SQLite3Adapter)
+        # We specifically do a manual INSERT here, and then test only the SELECT
+        # functionality. This allows us to more easily catch INSERT being broken,
+        # but SELECT actually working fine.
+        def test_native_decimal_insert_manual_vs_automatic
+          correct_value = '0012345678901234567890.0123456789'.to_d
+
+          connection.add_column "test_models", "wealth", :decimal, :precision => '30', :scale => '10'
+
+          # Do a manual insertion
+          if current_adapter?(:OracleAdapter)
+            connection.execute "insert into test_models (id, wealth) values (people_seq.nextval, 12345678901234567890.0123456789)"
+          elsif current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003 #before MySQL 5.0.3 decimals stored as strings
+            connection.execute "insert into test_models (wealth) values ('12345678901234567890.0123456789')"
+          elsif current_adapter?(:PostgreSQLAdapter)
+            connection.execute "insert into test_models (wealth) values (12345678901234567890.0123456789)"
+          else
+            connection.execute "insert into test_models (wealth) values (12345678901234567890.0123456789)"
+          end
 
-        # SELECT
-        row = TestModel.first
-        assert_kind_of BigDecimal, row.wealth
+          # SELECT
+          row = TestModel.first
+          assert_kind_of BigDecimal, row.wealth
 
-        # If this assert fails, that means the SELECT is broken!
-        unless current_adapter?(:SQLite3Adapter)
-          assert_equal correct_value, row.wealth
-        end
+          # If this assert fails, that means the SELECT is broken!
+          unless current_adapter?(:SQLite3Adapter)
+            assert_equal correct_value, row.wealth
+          end
 
-        # Reset to old state
-        TestModel.delete_all
+          # Reset to old state
+          TestModel.delete_all
 
-        # Now use the Rails insertion
-        TestModel.create :wealth => BigDecimal.new("12345678901234567890.0123456789")
+          # Now use the Rails insertion
+          TestModel.create :wealth => BigDecimal.new("12345678901234567890.0123456789")
 
-        # SELECT
-        row = TestModel.first
-        assert_kind_of BigDecimal, row.wealth
+          # SELECT
+          row = TestModel.first
+          assert_kind_of BigDecimal, row.wealth
 
-        # If these asserts fail, that means the INSERT (create function, or cast to SQL) is broken!
-        unless current_adapter?(:SQLite3Adapter)
+          # If these asserts fail, that means the INSERT (create function, or cast to SQL) is broken!
           assert_equal correct_value, row.wealth
         end
       end
@@ -121,54 +121,54 @@ module ActiveRecord
         end
       end
 
-      def test_native_types
-        add_column "test_models", "first_name", :string
-        add_column "test_models", "last_name", :string
-        add_column "test_models", "bio", :text
-        add_column "test_models", "age", :integer
-        add_column "test_models", "height", :float
-        add_column "test_models", "wealth", :decimal, :precision => '30', :scale => '10'
-        add_column "test_models", "birthday", :datetime
-        add_column "test_models", "favorite_day", :date
-        add_column "test_models", "moment_of_truth", :datetime
-        add_column "test_models", "male", :boolean
-
-        TestModel.create :first_name => 'bob', :last_name => 'bobsen',
-          :bio => "I was born ....", :age => 18, :height => 1.78,
-          :wealth => BigDecimal.new("12345678901234567890.0123456789"),
-          :birthday => 18.years.ago, :favorite_day => 10.days.ago,
-          :moment_of_truth => "1782-10-10 21:40:18", :male => true
-
-        bob = TestModel.first
-        assert_equal 'bob', bob.first_name
-        assert_equal 'bobsen', bob.last_name
-        assert_equal "I was born ....", bob.bio
-        assert_equal 18, bob.age
-
-        # Test for 30 significant digits (beyond the 16 of float), 10 of them
-        # after the decimal place.
-
-        unless current_adapter?(:SQLite3Adapter)
+      unless current_adapter?(:SQLite3Adapter)
+        def test_native_types
+          add_column "test_models", "first_name", :string
+          add_column "test_models", "last_name", :string
+          add_column "test_models", "bio", :text
+          add_column "test_models", "age", :integer
+          add_column "test_models", "height", :float
+          add_column "test_models", "wealth", :decimal, :precision => '30', :scale => '10'
+          add_column "test_models", "birthday", :datetime
+          add_column "test_models", "favorite_day", :date
+          add_column "test_models", "moment_of_truth", :datetime
+          add_column "test_models", "male", :boolean
+
+          TestModel.create :first_name => 'bob', :last_name => 'bobsen',
+            :bio => "I was born ....", :age => 18, :height => 1.78,
+            :wealth => BigDecimal.new("12345678901234567890.0123456789"),
+            :birthday => 18.years.ago, :favorite_day => 10.days.ago,
+            :moment_of_truth => "1782-10-10 21:40:18", :male => true
+
+          bob = TestModel.first
+          assert_equal 'bob', bob.first_name
+          assert_equal 'bobsen', bob.last_name
+          assert_equal "I was born ....", bob.bio
+          assert_equal 18, bob.age
+
+          # Test for 30 significant digits (beyond the 16 of float), 10 of them
+          # after the decimal place.
+
           assert_equal BigDecimal.new("0012345678901234567890.0123456789"), bob.wealth
-        end
 
-        assert_equal true, bob.male?
+          assert_equal true, bob.male?
 
-        assert_equal String, bob.first_name.class
-        assert_equal String, bob.last_name.class
-        assert_equal String, bob.bio.class
-        assert_equal Fixnum, bob.age.class
-        assert_equal Time, bob.birthday.class
+          assert_equal String, bob.first_name.class
+          assert_equal String, bob.last_name.class
+          assert_equal String, bob.bio.class
+          assert_equal Fixnum, bob.age.class
+          assert_equal Time, bob.birthday.class
 
-        if current_adapter?(:OracleAdapter)
-          # Oracle doesn't differentiate between date/time
-          assert_equal Time, bob.favorite_day.class
-        else
-          assert_equal Date, bob.favorite_day.class
-        end
+          if current_adapter?(:OracleAdapter)
+            # Oracle doesn't differentiate between date/time
+            assert_equal Time, bob.favorite_day.class
+          else
+            assert_equal Date, bob.favorite_day.class
+          end
 
-        assert_instance_of TrueClass, bob.male?
-        assert_kind_of BigDecimal, bob.wealth
+          assert_instance_of TrueClass, bob.male?
+          assert_kind_of BigDecimal, bob.wealth
+        end
       end
 
       if current_adapter?(:MysqlAdapter, :Mysql2Adapter, :PostgreSQLAdapter)
-- 
cgit v1.2.3


From a013b082aa4459762b55bbc6c59a4f072eef8224 Mon Sep 17 00:00:00 2001
From: Stefan Kanev <stefan.kanev@gmail.com>
Date: Fri, 18 Jul 2014 19:46:53 +0300
Subject: create_join_table uses same logic as HABTM reflections

Before this change, create_join_table would not remove the common prefix
in the join table name, unlike ActiveRecord::Reflections. A HABTM
between Music::Artist and Music::Record would use a table
music_artists_records, while create_join table would create
music_artists_music_records.
---
 .../test/cases/migration/create_join_table_test.rb | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/migration/create_join_table_test.rb b/activerecord/test/cases/migration/create_join_table_test.rb
index 62b60f7f7b..bea9d6b2c9 100644
--- a/activerecord/test/cases/migration/create_join_table_test.rb
+++ b/activerecord/test/cases/migration/create_join_table_test.rb
@@ -119,6 +119,30 @@ module ActiveRecord
 
         assert !connection.tables.include?('artists_musics')
       end
+
+      def test_create_and_drop_join_table_with_common_prefix
+        with_table_cleanup do
+          connection.create_join_table 'audio_artists', 'audio_musics'
+          assert_includes connection.tables, 'audio_artists_musics'
+
+          connection.drop_join_table 'audio_artists', 'audio_musics'
+          assert !connection.tables.include?('audio_artists_musics'), "Should have dropped join table, but didn't"
+        end
+      end
+
+      private
+
+        def with_table_cleanup
+          tables_before = connection.tables
+
+          yield
+        ensure
+          tables_after = connection.tables - tables_before
+
+          tables_after.each do |table|
+            connection.execute "DROP TABLE #{table}"
+          end
+        end
     end
   end
 end
-- 
cgit v1.2.3


From fd6aaaa0c308b36df3bf06eb87b9eebfca1de127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sat, 19 Jul 2014 17:35:12 -0300
Subject: Stop requiring mocha automatically

We are planning to remove mocha from our test suite because of
performance problems. To make this possible we should stop require mocha
on ActionSupport::TestCase.

This should not affect applications since users still need to add mocha
to Gemfile and this already load mocha.

Added FIXME notes to place that still need mocha removal
---
 activerecord/test/cases/helper.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 937646b09a..6a8aff4b69 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -199,3 +199,5 @@ module InTimeZone
     ActiveRecord::Base.time_zone_aware_attributes = old_tz
   end
 end
+
+require 'mocha/setup' # FIXME: stop using mocha
-- 
cgit v1.2.3


From 18cc7123abffcbcbd255d02473da84c94a4c8c64 Mon Sep 17 00:00:00 2001
From: Zuhao Wan <wanzuhao@gmail.com>
Date: Tue, 22 Jul 2014 10:09:05 +0800
Subject: Remove the side-effects of validates_presence_of.

---
 activerecord/test/cases/validations/presence_validation_test.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/validations/presence_validation_test.rb b/activerecord/test/cases/validations/presence_validation_test.rb
index 3790d3c8cf..4f38849131 100644
--- a/activerecord/test/cases/validations/presence_validation_test.rb
+++ b/activerecord/test/cases/validations/presence_validation_test.rb
@@ -52,14 +52,15 @@ class PresenceValidationTest < ActiveRecord::TestCase
   end
 
   def test_validates_presence_doesnt_convert_to_array
-    Speedometer.validates_presence_of :dashboard
+    speedometer = Class.new(Speedometer)
+    speedometer.validates_presence_of :dashboard
 
     dash = Dashboard.new
 
     # dashboard has to_a method
     def dash.to_a; ['(/)', '(\)']; end
 
-    s = Speedometer.new
+    s = speedometer.new
     s.dashboard = dash
 
     assert_nothing_raised { s.valid? }
-- 
cgit v1.2.3


From 8e30a636256fcc5d4e9c48825339e894c9e7b8a4 Mon Sep 17 00:00:00 2001
From: Zuhao Wan <wanzuhao@gmail.com>
Date: Tue, 22 Jul 2014 11:22:05 +0800
Subject: Remove length limit that results failure in other tests.

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 84720585f2..2a00b2a3a6 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -63,7 +63,7 @@ class MigrationTest < ActiveRecord::TestCase
     end
     Person.connection.remove_column("people", "first_name") rescue nil
     Person.connection.remove_column("people", "middle_name") rescue nil
-    Person.connection.add_column("people", "first_name", :string, :limit => 40)
+    Person.connection.add_column("people", "first_name", :string, null: false)
     Person.reset_column_information
   end
 
-- 
cgit v1.2.3


From 4c81c8ce533896be28bdc0b055ff30bb9dee1316 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Tue, 22 Jul 2014 09:05:33 +0200
Subject: build fix, remove not null constraint.

The fixtures are still in play, adding a new column without a default and `null: true`
is not possible. This reverts back to leaking global state, as our `schema.rb` adds
the `null: false` constraint on this field.

A future solution would be to make the `migration_test.rb` run independent of fixture tables.
This way we can simply drop the state after test execution, without worrying about side effects.

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 2a00b2a3a6..ef3f073472 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -63,7 +63,7 @@ class MigrationTest < ActiveRecord::TestCase
     end
     Person.connection.remove_column("people", "first_name") rescue nil
     Person.connection.remove_column("people", "middle_name") rescue nil
-    Person.connection.add_column("people", "first_name", :string, null: false)
+    Person.connection.add_column("people", "first_name", :string)
     Person.reset_column_information
   end
 
-- 
cgit v1.2.3


From c40bfc80b7e0a9c21f387652e9d1c01a6486a8e7 Mon Sep 17 00:00:00 2001
From: Zuhao Wan <wanzuhao@gmail.com>
Date: Tue, 22 Jul 2014 17:03:26 +0800
Subject: Make sure assertion passes for postgresql.

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/associations/nested_through_associations_test.rb b/activerecord/test/cases/associations/nested_through_associations_test.rb
index 3720d6d251..31b68c940e 100644
--- a/activerecord/test/cases/associations/nested_through_associations_test.rb
+++ b/activerecord/test/cases/associations/nested_through_associations_test.rb
@@ -130,7 +130,7 @@ class NestedThroughAssociationsTest < ActiveRecord::TestCase
   def test_has_many_through_has_one_through_with_has_one_source_reflection_preload
     members = assert_queries(4) { Member.includes(:nested_sponsors).to_a }
     mustache = sponsors(:moustache_club_sponsor_for_groucho)
-    assert_no_queries do
+    assert_no_queries(ignore_none: false) do
       assert_equal [mustache], members.first.nested_sponsors
     end
   end
-- 
cgit v1.2.3


From 4dfe213d0fcaf5e665aa624686c13e08849059db Mon Sep 17 00:00:00 2001
From: Zuhao Wan <wanzuhao@gmail.com>
Date: Tue, 22 Jul 2014 17:24:31 +0800
Subject: Remove redundant that already happened in teardown.

---
 activerecord/test/cases/attribute_decorators_test.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/attribute_decorators_test.rb b/activerecord/test/cases/attribute_decorators_test.rb
index b352d1a6c2..cbc2c4e5d7 100644
--- a/activerecord/test/cases/attribute_decorators_test.rb
+++ b/activerecord/test/cases/attribute_decorators_test.rb
@@ -45,7 +45,6 @@ module ActiveRecord
 
     test "decoration does not eagerly load existing columns" do
       assert_no_queries do
-        Model.reset_column_information
         Model.decorate_attribute_type(:a_string, :test) { |t| StringDecorator.new(t) }
       end
     end
-- 
cgit v1.2.3


From 6d327dbc0cd7969375e14a56c0a9bc6a7c847056 Mon Sep 17 00:00:00 2001
From: Andrey Novikov <envek@envek.name>
Date: Sat, 19 Jul 2014 23:38:38 +0400
Subject: Allow to specify a type for foreign key column in migrations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Andrey Novikov & Łukasz Sarnacki]
---
 activerecord/test/cases/adapters/postgresql/uuid_test.rb   |  2 +-
 activerecord/test/cases/migration/change_table_test.rb     | 14 ++++++++++++++
 .../test/cases/migration/references_statements_test.rb     | 10 ++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index d7ff81a382..66006d718f 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -233,7 +233,7 @@ class PostgresqlUUIDTestInverseOf < ActiveRecord::TestCase
         t.string 'title'
       end
       connection.create_table('pg_uuid_comments', id: :uuid) do |t|
-        t.uuid :uuid_post_id, default: 'uuid_generate_v4()'
+        t.references :uuid_post, type: :uuid
         t.string 'content'
       end
     end
diff --git a/activerecord/test/cases/migration/change_table_test.rb b/activerecord/test/cases/migration/change_table_test.rb
index a6d506b04a..3e9d957ed3 100644
--- a/activerecord/test/cases/migration/change_table_test.rb
+++ b/activerecord/test/cases/migration/change_table_test.rb
@@ -72,6 +72,20 @@ module ActiveRecord
         end
       end
 
+      def test_references_column_type_with_polymorphic_and_type
+        with_change_table do |t|
+          @connection.expect :add_reference, nil, [:delete_me, :taggable, polymorphic: true, type: :string]
+          t.references :taggable, polymorphic: true, type: :string
+        end
+      end
+
+      def test_remove_references_column_type_with_polymorphic_and_type
+        with_change_table do |t|
+          @connection.expect :remove_reference, nil, [:delete_me, :taggable, polymorphic: true, type: :string]
+          t.remove_references :taggable, polymorphic: true, type: :string
+        end
+      end
+
       def test_timestamps_creates_updated_at_and_created_at
         with_change_table do |t|
           @connection.expect :add_timestamps, nil, [:delete_me]
diff --git a/activerecord/test/cases/migration/references_statements_test.rb b/activerecord/test/cases/migration/references_statements_test.rb
index e9545f2cce..1fdfbdd181 100644
--- a/activerecord/test/cases/migration/references_statements_test.rb
+++ b/activerecord/test/cases/migration/references_statements_test.rb
@@ -55,6 +55,16 @@ module ActiveRecord
         assert index_exists?(table_name, :tag_id, name: 'index_taggings_on_tag_id')
       end
 
+      def test_creates_reference_id_with_specified_type
+        add_reference table_name, :user, type: :string
+        assert column_exists?(table_name, :user_id, :string)
+      end
+
+      def test_does_not_create_reference_id_with_specified_type
+        add_reference table_name, :user
+        assert_not column_exists?(table_name, :user_id, :string)
+      end
+
       def test_deletes_reference_id_column
         remove_reference table_name, :supplier
         assert_not column_exists?(table_name, :supplier_id, :integer)
-- 
cgit v1.2.3


From e63ae630e1a9eda6f331757206b1905f1438307c Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Thu, 24 Jul 2014 17:00:14 +0200
Subject: build fix, fix error introduced with
 091b246bb0111357edbb9703ea342a944b04deb6

Fixes the following issue:

  1) Failure:
ActiveRecord::MySQLPurgeTest#test_establishes_connection_to_test_database [test/cases/tasks/mysql_rake_test.rb:200]:
not all expectations were satisfied
unsatisfied expectations:
- expected exactly once, not yet invoked: ActiveRecord::Base.establish_connection(:test)
satisfied expectations:
- allowed any number of times, invoked once: #<Mock:0x2349430>.recreate_database(any_parameters)
- allowed any number of times, invoked once: ActiveRecord::Base.establish_connection(any_parameters)
- allowed any number of times, invoked once: ActiveRecord::Base.connection(any_parameters)
---
 activerecord/test/cases/tasks/mysql_rake_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 3e3a2828f3..043e8ca8e7 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -196,8 +196,8 @@ module ActiveRecord
       ActiveRecord::Base.stubs(:establish_connection).returns(true)
     end
 
-    def test_establishes_connection_to_test_database
-      ActiveRecord::Base.expects(:establish_connection).with(:test)
+    def test_establishes_connection_to_the_appropriate_database
+      ActiveRecord::Base.expects(:establish_connection).with(@configuration)
 
       ActiveRecord::Tasks::DatabaseTasks.purge @configuration
     end
-- 
cgit v1.2.3


From 5f25435bf4b3c4e6c1dbac92ef9063420d28dc49 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Thu, 24 Jul 2014 17:19:43 +0200
Subject: tests, run adapter specific rake tests only for the right adapter.

---
 activerecord/test/cases/tasks/mysql_rake_test.rb      | 2 ++
 activerecord/test/cases/tasks/postgresql_rake_test.rb | 2 ++
 activerecord/test/cases/tasks/sqlite_rake_test.rb     | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 043e8ca8e7..f58535f044 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -1,5 +1,6 @@
 require 'cases/helper'
 
+if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
 module ActiveRecord
   class MysqlDBCreateTest < ActiveRecord::TestCase
     def setup
@@ -307,3 +308,4 @@ module ActiveRecord
   end
 
 end
+end
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb
index 6ea225178f..0d574d071c 100644
--- a/activerecord/test/cases/tasks/postgresql_rake_test.rb
+++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -1,5 +1,6 @@
 require 'cases/helper'
 
+if current_adapter?(:PostgreSQLAdapter)
 module ActiveRecord
   class PostgreSQLDBCreateTest < ActiveRecord::TestCase
     def setup
@@ -241,3 +242,4 @@ module ActiveRecord
   end
 
 end
+end
diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb
index da3471adf9..750d5e42dc 100644
--- a/activerecord/test/cases/tasks/sqlite_rake_test.rb
+++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb
@@ -1,6 +1,7 @@
 require 'cases/helper'
 require 'pathname'
 
+if current_adapter?(:SQLite3Adapter)
 module ActiveRecord
   class SqliteDBCreateTest < ActiveRecord::TestCase
     def setup
@@ -189,3 +190,4 @@ module ActiveRecord
     end
   end
 end
+end
-- 
cgit v1.2.3


From 99b82fdf03fcf6d6ca8e2d810ba35011723a5267 Mon Sep 17 00:00:00 2001
From: Philippe Creux <pcreux@gmail.com>
Date: Thu, 24 Jul 2014 10:39:39 -0700
Subject: Add support for Postgresql JSONB

[Philippe Creux, Chris Teague]
---
 .../test/cases/adapters/postgresql/json_test.rb    | 34 ++++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index cb3c02fa3a..86ba849445 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 require 'active_record/base'
 require 'active_record/connection_adapters/postgresql_adapter'
 
-class PostgresqlJSONTest < ActiveRecord::TestCase
+module PostgresqlJSONSharedTestCases
   class JsonDataType < ActiveRecord::Base
     self.table_name = 'json_data_type'
 
@@ -16,8 +16,8 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
     begin
       @connection.transaction do
         @connection.create_table('json_data_type') do |t|
-          t.json 'payload', :default => {}
-          t.json 'settings'
+          t.public_send column_type, 'payload', default: {} # t.json 'payload', default: {}
+          t.public_send column_type, 'settings'             # t.json 'settings'
         end
       end
     rescue ActiveRecord::StatementInvalid
@@ -26,21 +26,21 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
     @column = JsonDataType.columns_hash['payload']
   end
 
-  teardown do
+  def teardown
     @connection.execute 'drop table if exists json_data_type'
   end
 
   def test_column
     column = JsonDataType.columns_hash["payload"]
-    assert_equal :json, column.type
-    assert_equal "json", column.sql_type
+    assert_equal column_type, column.type
+    assert_equal column_type.to_s, column.sql_type
     assert_not column.number?
     assert_not column.binary?
     assert_not column.array
   end
 
   def test_default
-    @connection.add_column 'json_data_type', 'permissions', :json, default: '{"users": "read", "posts": ["read", "write"]}'
+    @connection.add_column 'json_data_type', 'permissions', column_type, default: '{"users": "read", "posts": ["read", "write"]}'
     JsonDataType.reset_column_information
 
     assert_equal({"users"=>"read", "posts"=>["read", "write"]}, JsonDataType.column_defaults['permissions'])
@@ -52,11 +52,11 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
   def test_change_table_supports_json
     @connection.transaction do
       @connection.change_table('json_data_type') do |t|
-        t.json 'users', default: '{}'
+        t.public_send column_type, 'users', default: '{}' # t.json 'users', default: '{}'
       end
       JsonDataType.reset_column_information
       column = JsonDataType.columns_hash['users']
-      assert_equal :json, column.type
+      assert_equal column_type, column.type
 
       raise ActiveRecord::Rollback # reset the schema change
     end
@@ -175,3 +175,19 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
     assert_not json.changed?
   end
 end
+
+class PostgresqlJSONTest < ActiveRecord::TestCase
+  include PostgresqlJSONSharedTestCases
+
+  def column_type
+    :json
+  end
+end
+
+class PostgresqlJSONBTest < ActiveRecord::TestCase
+  include PostgresqlJSONSharedTestCases
+
+  def column_type
+    :jsonb
+  end
+end
-- 
cgit v1.2.3


From be58912c84ee5130ebb49d55bb59b63a2432d896 Mon Sep 17 00:00:00 2001
From: Zuhao Wan <wanzuhao@gmail.com>
Date: Mon, 28 Jul 2014 17:49:56 +0800
Subject: Add where condition so select_one returns the correct record.

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 778c4ed7e5..6f84bae432 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -192,7 +192,7 @@ module ActiveRecord
     def test_select_methods_passing_a_association_relation
       author = Author.create!(name: 'john')
       Post.create!(author: author, title: 'foo', body: 'bar')
-      query = author.posts.select(:title)
+      query = author.posts.where(title: 'foo').select(:title)
       assert_equal({"title" => "foo"}, @connection.select_one(query.arel, nil, query.bind_values))
       assert_equal({"title" => "foo"}, @connection.select_one(query))
       assert @connection.select_all(query).is_a?(ActiveRecord::Result)
-- 
cgit v1.2.3


From d37bcc1d5a781687384fbe632a1850ab218ccbfd Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 28 Jul 2014 13:25:19 -0400
Subject: savepoint_name should return nil for non-savepoint transactions

Also add test to assets the savepoint name
---
 activerecord/test/cases/transactions_test.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index de1f624191..f28a7b00e2 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -424,6 +424,26 @@ class TransactionTest < ActiveRecord::TestCase
     end
   end
 
+  def test_savepoints_name
+    Topic.transaction do
+      assert_nil Topic.connection.current_savepoint_name
+      assert_nil Topic.connection.current_transaction.savepoint_name
+
+      Topic.transaction(requires_new: true) do
+        assert_equal "active_record_1", Topic.connection.current_savepoint_name
+        assert_equal "active_record_1", Topic.connection.current_transaction.savepoint_name
+
+        Topic.transaction(requires_new: true) do
+          assert_equal "active_record_2", Topic.connection.current_savepoint_name
+          assert_equal "active_record_2", Topic.connection.current_transaction.savepoint_name
+        end
+
+        assert_equal "active_record_1", Topic.connection.current_savepoint_name
+        assert_equal "active_record_1", Topic.connection.current_transaction.savepoint_name
+      end
+    end
+  end
+
   def test_rollback_when_commit_raises
     Topic.connection.expects(:begin_db_transaction)
     Topic.connection.expects(:commit_db_transaction).raises('OH NOES')
-- 
cgit v1.2.3


From 1d6a87779c73bc7d9d5f235afadc0df4a36f534f Mon Sep 17 00:00:00 2001
From: joker1007 <kakyoin.hierophant@gmail.com>
Date: Tue, 29 Jul 2014 20:16:10 +0900
Subject: Fix type casting to Decimal from Float with ...

When I defines large precision column at RDBMS,
I assigns float value, raise ArgumentError (precision too large).
---
 activerecord/test/cases/type/decimal_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/type/decimal_test.rb b/activerecord/test/cases/type/decimal_test.rb
index 951cd879dd..da30de373e 100644
--- a/activerecord/test/cases/type/decimal_test.rb
+++ b/activerecord/test/cases/type/decimal_test.rb
@@ -10,6 +10,11 @@ module ActiveRecord
         assert_equal BigDecimal.new("1"), type.type_cast_from_user(:"1")
       end
 
+      def test_type_cast_decimal_from_float_with_large_precision
+        type = Decimal.new(precision: ::Float::DIG + 2)
+        assert_equal BigDecimal.new("123.0"), type.type_cast_from_user(123.0)
+      end
+
       def test_type_cast_decimal_from_rational_with_precision
         type = Decimal.new(precision: 2)
         assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3))
-- 
cgit v1.2.3


From d66ed3b08d8035d4bcb20a26a5739415c0b92428 Mon Sep 17 00:00:00 2001
From: Jack Danger Canty <github@jackcanty.com>
Date: Wed, 30 Jul 2014 14:51:17 -0700
Subject: Add ActiveRecord::Tasks::DatabaseTasks.migrate

This extracts the logic that was embedded in a Rake task into a static
method.
Bonus: the first test for `rake db:migrate`
---
 activerecord/test/cases/tasks/database_tasks_test.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb
index 0f48c8d5fc..01d373b691 100644
--- a/activerecord/test/cases/tasks/database_tasks_test.rb
+++ b/activerecord/test/cases/tasks/database_tasks_test.rb
@@ -273,6 +273,19 @@ module ActiveRecord
     end
   end
 
+  class DatabaseTasksMigrateTest < ActiveRecord::TestCase
+    def test_migrate_receives_correct_env_vars
+      verbose, version = ENV['VERBOSE'], ENV['VERSION']
+
+      ENV['VERBOSE'] = 'false'
+      ENV['VERSION'] = '4'
+
+      ActiveRecord::Migrator.expects(:migrate).with(ActiveRecord::Migrator.migrations_paths, 4)
+      ActiveRecord::Tasks::DatabaseTasks.migrate
+    ensure
+      ENV['VERBOSE'], ENV['VERSION'] = verbose, version
+    end
+  end
 
   class DatabaseTasksPurgeTest < ActiveRecord::TestCase
     include DatabaseTasksSetupper
-- 
cgit v1.2.3


From 91e4b65093f0c485507dadcb018c1f0d2661ba89 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 28 Jul 2014 14:26:27 -0400
Subject: Remove being/number methods from transaction class

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index f28a7b00e2..e518033192 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -546,7 +546,7 @@ class TransactionTest < ActiveRecord::TestCase
 
   def test_transactions_state_from_rollback
     connection = Topic.connection
-    transaction = ActiveRecord::ConnectionAdapters::ClosedTransaction.new(connection).begin
+    transaction = ActiveRecord::ConnectionAdapters::TransactionManager.new(connection).begin_transaction
 
     assert transaction.open?
     assert !transaction.state.rolledback?
@@ -560,7 +560,7 @@ class TransactionTest < ActiveRecord::TestCase
 
   def test_transactions_state_from_commit
     connection = Topic.connection
-    transaction = ActiveRecord::ConnectionAdapters::ClosedTransaction.new(connection).begin
+    transaction = ActiveRecord::ConnectionAdapters::TransactionManager.new(connection).begin_transaction
 
     assert transaction.open?
     assert !transaction.state.rolledback?
-- 
cgit v1.2.3


From e67a2f26db1e0f2e507e9e32fa980b7c05cc5793 Mon Sep 17 00:00:00 2001
From: Rajarshi Das <mita9051@gmail.com>
Date: Sat, 2 Aug 2014 21:30:28 +0530
Subject: rename MiniTest to Minitest

---
 activerecord/test/cases/attribute_test.rb                    | 2 +-
 activerecord/test/cases/migration/pending_migrations_test.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/attribute_test.rb b/activerecord/test/cases/attribute_test.rb
index 24452fdec2..91f6aee931 100644
--- a/activerecord/test/cases/attribute_test.rb
+++ b/activerecord/test/cases/attribute_test.rb
@@ -4,7 +4,7 @@ require 'minitest/mock'
 module ActiveRecord
   class AttributeTest < ActiveRecord::TestCase
     setup do
-      @type = MiniTest::Mock.new
+      @type = Minitest::Mock.new
     end
 
     teardown do
diff --git a/activerecord/test/cases/migration/pending_migrations_test.rb b/activerecord/test/cases/migration/pending_migrations_test.rb
index 517ee695ce..7afac83bd2 100644
--- a/activerecord/test/cases/migration/pending_migrations_test.rb
+++ b/activerecord/test/cases/migration/pending_migrations_test.rb
@@ -6,8 +6,8 @@ module ActiveRecord
     class PendingMigrationsTest < ActiveRecord::TestCase
       def setup
         super
-        @connection = MiniTest::Mock.new
-        @app = MiniTest::Mock.new
+        @connection = Minitest::Mock.new
+        @app = Minitest::Mock.new
         conn = @connection
         @pending = Class.new(CheckPending) {
           define_method(:connection) { conn }
-- 
cgit v1.2.3


From 8298d3adb72eb17186dc0b155afec308071a3900 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Thu, 31 Jul 2014 16:44:55 -0400
Subject: Cleanup Transaction inheritance.

Transaction class doesnt need to encapsulate the transaction state using
inheritance.
This removes all Transaction subclasses, and let the Transaction object
controls different actions based on its own state. Basically the only
actions would behave differently are `being`,`commit`,`rollback` as they
could act in a savepoint or in a real transaction.
---
 activerecord/test/cases/transactions_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index e518033192..b4849222b8 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -552,7 +552,7 @@ class TransactionTest < ActiveRecord::TestCase
     assert !transaction.state.rolledback?
     assert !transaction.state.committed?
 
-    transaction.perform_rollback
+    transaction.rollback
 
     assert transaction.state.rolledback?
     assert !transaction.state.committed?
@@ -566,7 +566,7 @@ class TransactionTest < ActiveRecord::TestCase
     assert !transaction.state.rolledback?
     assert !transaction.state.committed?
 
-    transaction.perform_commit
+    transaction.commit
 
     assert !transaction.state.rolledback?
     assert transaction.state.committed?
-- 
cgit v1.2.3


From e6e81f856e969efda49166af82c27594f30ea592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 6 Aug 2014 23:44:00 -0300
Subject: Define id_was to get the previous value of the primary key

Currently when we call id_was and we have a custom primary key name
Active Record will return the current value of the primary key. This
make impossible to correctly do an update operation if you change the
id.

Fixes #16413
---
 activerecord/test/cases/primary_keys_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index b04df7ce43..f19a6ea5e3 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -5,6 +5,7 @@ require 'models/subscriber'
 require 'models/movie'
 require 'models/keyboard'
 require 'models/mixed_case_monkey'
+require 'models/dashboard'
 
 class PrimaryKeysTest < ActiveRecord::TestCase
   fixtures :topics, :subscribers, :movies, :mixed_case_monkeys
@@ -164,6 +165,15 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     MixedCaseMonkey.reset_primary_key
     assert_equal "monkeyID", MixedCaseMonkey.primary_key
   end
+
+  def test_primary_key_update_with_custom_key_name
+    dashboard = Dashboard.create!(dashboard_id: '1')
+    dashboard.id = '2'
+    dashboard.save!
+
+    dashboard = Dashboard.first
+    assert_equal '2', dashboard.id
+  end
 end
 
 class PrimaryKeyWithNoConnectionTest < ActiveRecord::TestCase
-- 
cgit v1.2.3


From 6ffb29d24e05abbd9ffe3ea974140d6c70221807 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Tue, 12 Aug 2014 19:30:05 +0900
Subject: 
 users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent!

Calling ActiveSupport::TestCase.i_suck_and_my_tests_are_order_dependent! in AS::TestCase makes
everyone's tests order dependent, which should never be done by the framework.
---
 activerecord/test/cases/helper.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 6a8aff4b69..9aa1281e9d 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -201,3 +201,8 @@ module InTimeZone
 end
 
 require 'mocha/setup' # FIXME: stop using mocha
+
+# FIXME: we have tests that depend on run order, we should fix that and
+# remove this method call.
+require 'active_support/test_case'
+ActiveSupport::TestCase.i_suck_and_my_tests_are_order_dependent!
-- 
cgit v1.2.3


From e81f3c210eca074ed6227bd1c40835d44761c09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 12 Aug 2014 10:51:41 -0300
Subject: Nobody sucks so nobody should call this awful method name

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 9aa1281e9d..ff81855ef3 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -205,4 +205,4 @@ require 'mocha/setup' # FIXME: stop using mocha
 # FIXME: we have tests that depend on run order, we should fix that and
 # remove this method call.
 require 'active_support/test_case'
-ActiveSupport::TestCase.i_suck_and_my_tests_are_order_dependent!
+ActiveSupport::TestCase.tests_are_order_dependent!
-- 
cgit v1.2.3


From 82e28492e7c581cdeea904464a18eb11118f4ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 12 Aug 2014 10:59:09 -0300
Subject: :bomb:

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index ff81855ef3..a35ddf5632 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -205,4 +205,4 @@ require 'mocha/setup' # FIXME: stop using mocha
 # FIXME: we have tests that depend on run order, we should fix that and
 # remove this method call.
 require 'active_support/test_case'
-ActiveSupport::TestCase.tests_are_order_dependent!
+ActiveSupport::TestCase.my_tests_are_order_dependent!
-- 
cgit v1.2.3