From d3d3d07d99ea8fbfa242a6c2cfa7279aea51bc7c Mon Sep 17 00:00:00 2001
From: Lauro Caetano <laurocaetano1@gmail.com>
Date: Thu, 13 Mar 2014 15:57:35 -0300
Subject: Test deprecation warning for passing an ActiveRecord object to
 `exists?`

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index af33caefa5..9adfc72634 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -61,6 +61,12 @@ class FinderTest < ActiveRecord::TestCase
     assert_raise(NoMethodError) { Topic.exists?([1,2]) }
   end
 
+  def test_exists_passing_active_record_object_is_deprecated
+    assert_deprecated do
+      Topic.exists?(Topic.new)
+    end
+  end
+
   def test_exists_fails_when_parameter_has_invalid_type
     if current_adapter?(:PostgreSQLAdapter, :MysqlAdapter)
       assert_raises ActiveRecord::StatementInvalid do
-- 
cgit v1.2.3


From 433b19d7e82263fb78c481576ed0f475a62fde06 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Thu, 13 Mar 2014 13:05:10 -0400
Subject: Make select_all on query cache accept a Relation without binds.

[fixes #14361]
[related #13886]
---
 activerecord/test/cases/query_cache_test.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index da8ae672fe..9d89d6a1e8 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -118,6 +118,14 @@ class QueryCacheTest < ActiveRecord::TestCase
     assert ActiveRecord::Base.connection.query_cache.empty?, 'cache should be empty'
   end
 
+  def test_cache_passing_a_relation
+    post = Post.first
+    Post.cache do
+      query = post.categories.select(:post_id)
+      assert Post.connection.select_all(query).is_a?(ActiveRecord::Result)
+    end
+  end
+
   def test_find_queries
     assert_queries(2) { Task.find(1); Task.find(1) }
   end
-- 
cgit v1.2.3


From a9023eccd682efff0cc7e14057112648195cac58 Mon Sep 17 00:00:00 2001
From: Lauro Caetano <laurocaetano1@gmail.com>
Date: Thu, 13 Mar 2014 16:10:04 -0300
Subject: Add test for deprecation warning for passing an AR object to `find`.

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 9adfc72634..c0440744e9 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -33,6 +33,12 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal(topics(:first).title, Topic.find(1).title)
   end
 
+  def test_find_passing_active_record_object_is_deprecated
+    assert_deprecated do
+      Topic.find(Topic.last)
+    end
+  end
+
   def test_symbols_table_ref
     Post.first # warm up
     x = Symbol.all_symbols.count
-- 
cgit v1.2.3


From 7f17019e079bb9e6352f11d537633ddf10ea5903 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 11 Mar 2014 22:23:21 -0500
Subject: Allow custom JDBC urls

mitigates #14323
---
 .../test/cases/connection_adapters/connection_handler_test.rb       | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/connection_adapters/connection_handler_test.rb b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
index 599e8c762c..68ddc08f89 100644
--- a/activerecord/test/cases/connection_adapters/connection_handler_test.rb
+++ b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
@@ -17,6 +17,12 @@ module ActiveRecord
         ENV["DATABASE_URL"] = @previous_database_url
       end
 
+      def test_jdbc_url
+        config   = { "production" => { "url" => "jdbc:postgres://localhost/foo" } }
+        actual   = klass.new(config).resolve
+        assert_equal config, actual
+      end
+
       def test_environment_does_not_exist_in_config_url_does_exist
         ENV['DATABASE_URL'] = "postgres://localhost/foo"
         config      = { "not_production" => {  "adapter" => "not_postgres", "database" => "not_foo" } }
-- 
cgit v1.2.3


From bae7f1dae90c37b0e02482a1d99f4aeec5d49e24 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Fri, 14 Mar 2014 20:17:03 -0300
Subject: Obey `validate: false` option for habtm

Fixes #14383.
---
 .../has_and_belongs_to_many_associations_test.rb   | 24 ++++++++++++++++++++++
 activerecord/test/models/person.rb                 | 13 ++++++++++++
 activerecord/test/models/treasure.rb               |  1 +
 3 files changed, 38 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index bac1cb8e2d..366472c6fd 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -11,6 +11,7 @@ require 'models/author'
 require 'models/tag'
 require 'models/tagging'
 require 'models/parrot'
+require 'models/person'
 require 'models/pirate'
 require 'models/treasure'
 require 'models/price_estimate'
@@ -795,4 +796,27 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_association_with_validate_false_does_not_run_associated_validation_callbacks_on_create
+    rich_person = RichPerson.new
+
+    treasure = Treasure.new
+    treasure.rich_people << rich_person
+    treasure.valid?
+
+    assert_equal 1, treasure.rich_people.size
+    assert_nil rich_person.first_name, 'should not run associated person validation on create when validate: false'
+  end
+
+  def test_association_with_validate_false_does_not_run_associated_validation_callbacks_on_update
+    rich_person = RichPerson.create!
+    person_first_name = rich_person.first_name
+    assert_not_nil person_first_name
+
+    treasure = Treasure.new
+    treasure.rich_people << rich_person
+    treasure.valid?
+
+    assert_equal 1, treasure.rich_people.size
+    assert_equal person_first_name, rich_person.first_name, 'should not run associated person validation on update when validate: false'
+  end
 end
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index 1a282dbce4..c7e54e7b63 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -89,6 +89,19 @@ class RichPerson < ActiveRecord::Base
   self.table_name = 'people'
 
   has_and_belongs_to_many :treasures, :join_table => 'peoples_treasures'
+
+  before_validation :run_before_create, on: :create
+  before_validation :run_before_validation
+
+  private
+
+  def run_before_create
+    self.first_name = first_name.to_s + 'run_before_create'
+  end
+
+  def run_before_validation
+    self.first_name = first_name.to_s + 'run_before_validation'
+  end
 end
 
 class NestedPerson < ActiveRecord::Base
diff --git a/activerecord/test/models/treasure.rb b/activerecord/test/models/treasure.rb
index e864295acf..a69d3fd3df 100644
--- a/activerecord/test/models/treasure.rb
+++ b/activerecord/test/models/treasure.rb
@@ -3,6 +3,7 @@ class Treasure < ActiveRecord::Base
   belongs_to :looter, :polymorphic => true
 
   has_many :price_estimates, :as => :estimate_of
+  has_and_belongs_to_many :rich_people, join_table: 'peoples_treasures', validate: false
 
   accepts_nested_attributes_for :looter
 end
-- 
cgit v1.2.3


From 3baace687cfbf4c98367fda31e0a4b0f85ce813f Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 13 Mar 2014 21:35:58 -0700
Subject: Use teardown helper method.

Follow-Up to https://github.com/rails/rails/pull/14348

Ensure that SQLCounter.clear_log is called after each test.

This is a step to prevent side effects when running tests. This will allow us to run them in random order.
---
 activerecord/test/cases/adapter_test.rb                               | 2 +-
 activerecord/test/cases/adapters/mysql/active_schema_test.rb          | 2 +-
 activerecord/test/cases/adapters/mysql/reserved_word_test.rb          | 2 +-
 activerecord/test/cases/adapters/mysql2/active_schema_test.rb         | 2 +-
 activerecord/test/cases/adapters/mysql2/reserved_word_test.rb         | 2 +-
 activerecord/test/cases/adapters/postgresql/active_schema_test.rb     | 2 +-
 activerecord/test/cases/adapters/postgresql/array_test.rb             | 2 +-
 activerecord/test/cases/adapters/postgresql/bytea_test.rb             | 2 +-
 activerecord/test/cases/adapters/postgresql/citext_test.rb            | 2 +-
 activerecord/test/cases/adapters/postgresql/composite_test.rb         | 2 +-
 activerecord/test/cases/adapters/postgresql/datatype_test.rb          | 2 +-
 activerecord/test/cases/adapters/postgresql/enum_test.rb              | 2 +-
 activerecord/test/cases/adapters/postgresql/hstore_test.rb            | 2 +-
 activerecord/test/cases/adapters/postgresql/json_test.rb              | 2 +-
 activerecord/test/cases/adapters/postgresql/ltree_test.rb             | 2 +-
 activerecord/test/cases/adapters/postgresql/range_test.rb             | 2 +-
 .../test/cases/adapters/postgresql/schema_authorization_test.rb       | 2 +-
 activerecord/test/cases/adapters/postgresql/schema_test.rb            | 2 +-
 activerecord/test/cases/adapters/postgresql/view_test.rb              | 2 +-
 activerecord/test/cases/adapters/postgresql/xml_test.rb               | 2 +-
 activerecord/test/cases/ar_schema_test.rb                             | 2 +-
 .../test/cases/associations/eager_load_nested_include_test.rb         | 4 ++--
 activerecord/test/cases/associations/eager_singularization_test.rb    | 2 +-
 activerecord/test/cases/attribute_methods_test.rb                     | 2 +-
 activerecord/test/cases/bind_parameter_test.rb                        | 2 +-
 .../test/cases/connection_adapters/connection_handler_test.rb         | 2 +-
 activerecord/test/cases/connection_pool_test.rb                       | 3 +--
 activerecord/test/cases/defaults_test.rb                              | 2 +-
 activerecord/test/cases/disconnected_test.rb                          | 2 +-
 activerecord/test/cases/explain_subscriber_test.rb                    | 2 +-
 activerecord/test/cases/inheritance_test.rb                           | 2 +-
 activerecord/test/cases/invalid_connection_test.rb                    | 2 +-
 activerecord/test/cases/invertible_migration_test.rb                  | 2 +-
 activerecord/test/cases/migration/change_schema_test.rb               | 3 +--
 activerecord/test/cases/migration/change_table_test.rb                | 2 +-
 activerecord/test/cases/migration/column_positioning_test.rb          | 3 +--
 activerecord/test/cases/migration/create_join_table_test.rb           | 3 +--
 activerecord/test/cases/migration/index_test.rb                       | 3 +--
 activerecord/test/cases/migration/logger_test.rb                      | 3 +--
 activerecord/test/cases/migration/references_index_test.rb            | 3 +--
 activerecord/test/cases/migration_test.rb                             | 4 ++--
 activerecord/test/cases/migrator_test.rb                              | 3 +--
 activerecord/test/cases/modules_test.rb                               | 2 +-
 activerecord/test/cases/nested_attributes_test.rb                     | 2 +-
 activerecord/test/cases/pooled_connections_test.rb                    | 2 +-
 activerecord/test/cases/reaper_test.rb                                | 3 +--
 activerecord/test/cases/serialized_attribute_test.rb                  | 3 +--
 activerecord/test/cases/unconnected_test.rb                           | 2 +-
 activerecord/test/cases/validations/i18n_validation_test.rb           | 2 +-
 49 files changed, 51 insertions(+), 61 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 0eb1231c79..696b859b36 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -218,7 +218,7 @@ module ActiveRecord
       @connection = Klass.connection
     end
 
-    def teardown
+    teardown do
       Klass.remove_connection
     end
 
diff --git a/activerecord/test/cases/adapters/mysql/active_schema_test.rb b/activerecord/test/cases/adapters/mysql/active_schema_test.rb
index 0878925a6c..e77138eb1d 100644
--- a/activerecord/test/cases/adapters/mysql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql/active_schema_test.rb
@@ -11,7 +11,7 @@ class ActiveSchemaTest < ActiveRecord::TestCase
     end
   end
 
-  def teardown
+  teardown do
     ActiveRecord::Base.remove_connection
     ActiveRecord::Base.establish_connection(@connection)
   end
diff --git a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
index 8eb9565963..61ae0abfd1 100644
--- a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
@@ -37,7 +37,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
       'distinct_select'=>'distinct_id int, select_id int'
   end
 
-  def teardown
+  teardown do
     drop_tables_directly ['group', 'select', 'values', 'distinct', 'distinct_select', 'order']
   end
 
diff --git a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
index 4ccf568406..7905edaf83 100644
--- a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
@@ -11,7 +11,7 @@ class ActiveSchemaTest < ActiveRecord::TestCase
     end
   end
 
-  def teardown
+  teardown do
     ActiveRecord::Base.remove_connection
     ActiveRecord::Base.establish_connection(@connection)
   end
diff --git a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
index 1a82308176..799d927ee4 100644
--- a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
@@ -37,7 +37,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
       'distinct_select'=>'distinct_id int, select_id int'
   end
 
-  def teardown
+  teardown do
     drop_tables_directly ['group', 'select', 'values', 'distinct', 'distinct_select', 'order']
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
index 22dd48e113..3808db5141 100644
--- a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
@@ -7,7 +7,7 @@ class PostgresqlActiveSchemaTest < ActiveRecord::TestCase
     end
   end
 
-  def teardown
+  teardown do
     ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
       remove_method :execute
     end
diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index 3090f4478f..f5f1c791e1 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -19,7 +19,7 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
     @column = PgArray.columns.find { |c| c.name == 'tags' }
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists pg_arrays'
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/bytea_test.rb b/activerecord/test/cases/adapters/postgresql/bytea_test.rb
index b8dd35c4c5..c3394d7712 100644
--- a/activerecord/test/cases/adapters/postgresql/bytea_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/bytea_test.rb
@@ -23,7 +23,7 @@ class PostgresqlByteaTest < ActiveRecord::TestCase
     assert(@column.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLColumn))
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists bytea_data_type'
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/citext_test.rb b/activerecord/test/cases/adapters/postgresql/citext_test.rb
index ebb9ff98b1..148dc9d07c 100644
--- a/activerecord/test/cases/adapters/postgresql/citext_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/citext_test.rb
@@ -25,7 +25,7 @@ class PostgresqlCitextTest < ActiveRecord::TestCase
     @column = Citext.columns_hash['cival']
   end
 
-  def teardown
+  teardown do
     @connection.execute 'DROP TABLE IF EXISTS citexts;'
     @connection.execute 'DROP EXTENSION IF EXISTS citext CASCADE;'
   end
diff --git a/activerecord/test/cases/adapters/postgresql/composite_test.rb b/activerecord/test/cases/adapters/postgresql/composite_test.rb
index 7202cce390..ed39204145 100644
--- a/activerecord/test/cases/adapters/postgresql/composite_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/composite_test.rb
@@ -8,7 +8,7 @@ class PostgresqlCompositeTest < ActiveRecord::TestCase
     self.table_name = "postgresql_composites"
   end
 
-  def teardown
+  teardown do
     @connection.execute 'DROP TABLE IF EXISTS postgresql_composites'
     @connection.execute 'DROP TYPE IF EXISTS full_address'
   end
diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
index 158bc6ee89..e7dda1a1af 100644
--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
@@ -67,7 +67,7 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     @connection.execute("INSERT INTO postgresql_timestamp_with_zones (id, time) VALUES (1, '2010-01-01 10:00:00-1')")
   end
 
-  def teardown
+  teardown do
     [PostgresqlArray, PostgresqlTsvector, PostgresqlMoney, PostgresqlNumber, PostgresqlTime, PostgresqlNetworkAddress,
      PostgresqlBitString, PostgresqlOid, PostgresqlTimestampWithZone].each(&:delete_all)
   end
diff --git a/activerecord/test/cases/adapters/postgresql/enum_test.rb b/activerecord/test/cases/adapters/postgresql/enum_test.rb
index 62f84caf91..7208edef5f 100644
--- a/activerecord/test/cases/adapters/postgresql/enum_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/enum_test.rb
@@ -8,7 +8,7 @@ class PostgresqlEnumTest < ActiveRecord::TestCase
     self.table_name = "postgresql_enums"
   end
 
-  def teardown
+  teardown do
     @connection.execute 'DROP TABLE IF EXISTS postgresql_enums'
     @connection.execute 'DROP TYPE IF EXISTS mood'
   end
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index f2502430de..90ec1524b5 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -31,7 +31,7 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
     @column = Hstore.columns.find { |c| c.name == 'tags' }
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists hstores'
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index 3daef399d8..10c0a6c395 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -26,7 +26,7 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
     @column = JsonDataType.columns.find { |c| c.name == 'payload' }
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists json_data_type'
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/ltree_test.rb b/activerecord/test/cases/adapters/postgresql/ltree_test.rb
index 5d12ca75ca..e72fd4360d 100644
--- a/activerecord/test/cases/adapters/postgresql/ltree_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/ltree_test.rb
@@ -19,7 +19,7 @@ class PostgresqlLtreeTest < ActiveRecord::TestCase
     skip "do not test on PG without ltree"
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists ltrees'
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/range_test.rb b/activerecord/test/cases/adapters/postgresql/range_test.rb
index 4e84335e9b..a9d4312fb3 100644
--- a/activerecord/test/cases/adapters/postgresql/range_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/range_test.rb
@@ -8,7 +8,7 @@ if ActiveRecord::Base.connection.supports_ranges?
   end
 
   class PostgresqlRangeTest < ActiveRecord::TestCase
-    def teardown
+    teardown do
       @connection.execute 'DROP TABLE IF EXISTS postgresql_ranges'
       @connection.execute 'DROP TYPE IF EXISTS floatrange'
     end
diff --git a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
index d5e1838543..99c26c4bf7 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
@@ -27,7 +27,7 @@ class SchemaAuthorizationTest < ActiveRecord::TestCase
     end
   end
 
-  def teardown
+  teardown do
     set_session_auth
     @connection.execute "RESET search_path"
     USERS.each do |u|
diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index 3f7009c1d1..5e5f653d17 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -71,7 +71,7 @@ class SchemaTest < ActiveRecord::TestCase
     @connection.execute "CREATE TABLE #{SCHEMA_NAME}.#{UNMATCHED_PK_TABLE_NAME} (id integer NOT NULL DEFAULT nextval('#{SCHEMA_NAME}.#{UNMATCHED_SEQUENCE_NAME}'::regclass), CONSTRAINT unmatched_pkey PRIMARY KEY (id))"
   end
 
-  def teardown
+  teardown do
     @connection.execute "DROP SCHEMA #{SCHEMA2_NAME} CASCADE"
     @connection.execute "DROP SCHEMA #{SCHEMA_NAME} CASCADE"
   end
diff --git a/activerecord/test/cases/adapters/postgresql/view_test.rb b/activerecord/test/cases/adapters/postgresql/view_test.rb
index 66e07b71a0..08071894c4 100644
--- a/activerecord/test/cases/adapters/postgresql/view_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/view_test.rb
@@ -24,7 +24,7 @@ class ViewTest < ActiveRecord::TestCase
     @connection.execute "CREATE VIEW #{SCHEMA_NAME}.#{VIEW_NAME} AS SELECT id,name,email,moment FROM #{SCHEMA_NAME}.#{TABLE_NAME}"
   end
 
-  def teardown
+  teardown do
     @connection.execute "DROP SCHEMA #{SCHEMA_NAME} CASCADE"
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/xml_test.rb b/activerecord/test/cases/adapters/postgresql/xml_test.rb
index dd2a727afe..ae299697b1 100644
--- a/activerecord/test/cases/adapters/postgresql/xml_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/xml_test.rb
@@ -23,7 +23,7 @@ class PostgresqlXMLTest < ActiveRecord::TestCase
     @column = XmlDataType.columns.find { |c| c.name == 'payload' }
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists xml_data_type'
   end
 
diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index 500df52cd8..811695938e 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -10,7 +10,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::SchemaMigration.drop_table
     end
 
-    def teardown
+    teardown do
       @connection.drop_table :fruits rescue nil
       @connection.drop_table :nep_fruits rescue nil
       @connection.drop_table :nep_schema_migrations rescue nil
diff --git a/activerecord/test/cases/associations/eager_load_nested_include_test.rb b/activerecord/test/cases/associations/eager_load_nested_include_test.rb
index 5ff117eaa0..0ff87d53ea 100644
--- a/activerecord/test/cases/associations/eager_load_nested_include_test.rb
+++ b/activerecord/test/cases/associations/eager_load_nested_include_test.rb
@@ -68,7 +68,7 @@ class EagerLoadPolyAssocsTest < ActiveRecord::TestCase
     generate_test_object_graphs
   end
 
-  def teardown
+  teardown do
     [Circle, Square, Triangle, PaintColor, PaintTexture,
      ShapeExpression, NonPolyOne, NonPolyTwo].each do |c|
       c.delete_all
@@ -111,7 +111,7 @@ class EagerLoadNestedIncludeWithMissingDataTest < ActiveRecord::TestCase
     @first_categorization = @davey_mcdave.categorizations.create(:category => Category.first, :post => @first_post)
   end
 
-  def teardown
+  teardown do
     @davey_mcdave.destroy
     @first_post.destroy
     @first_comment.destroy
diff --git a/activerecord/test/cases/associations/eager_singularization_test.rb b/activerecord/test/cases/associations/eager_singularization_test.rb
index b12bc355e8..a61a070331 100644
--- a/activerecord/test/cases/associations/eager_singularization_test.rb
+++ b/activerecord/test/cases/associations/eager_singularization_test.rb
@@ -90,7 +90,7 @@ class EagerSingularizationTest < ActiveRecord::TestCase
     end
   end
 
-  def teardown
+  teardown do
     connection.drop_table :viri
     connection.drop_table :octopi
     connection.drop_table :passes
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 173081cb28..952baaca36 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -22,7 +22,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     @target.table_name = 'topics'
   end
 
-  def teardown
+  teardown do
     ActiveRecord::Base.send(:attribute_method_matchers).clear
     ActiveRecord::Base.send(:attribute_method_matchers).concat(@old_matchers)
   end
diff --git a/activerecord/test/cases/bind_parameter_test.rb b/activerecord/test/cases/bind_parameter_test.rb
index 291751c435..24eb91bef9 100644
--- a/activerecord/test/cases/bind_parameter_test.rb
+++ b/activerecord/test/cases/bind_parameter_test.rb
@@ -25,7 +25,7 @@ module ActiveRecord
       ActiveSupport::Notifications.subscribe('sql.active_record', @listener)
     end
 
-    def teardown
+    teardown do
       ActiveSupport::Notifications.unsubscribe(@listener)
     end
 
diff --git a/activerecord/test/cases/connection_adapters/connection_handler_test.rb b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
index 599e8c762c..bca63f6b97 100644
--- a/activerecord/test/cases/connection_adapters/connection_handler_test.rb
+++ b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
@@ -13,7 +13,7 @@ module ActiveRecord
         @previous_database_url = ENV.delete("DATABASE_URL")
       end
 
-      def teardown
+      teardown do
         ENV["DATABASE_URL"] = @previous_database_url
       end
 
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 1cf215017b..c4108ad7f6 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -22,8 +22,7 @@ module ActiveRecord
         end
       end
 
-      def teardown
-        super
+      teardown do
         @pool.disconnect!
       end
 
diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb
index 7e3d91e08c..7d438803a1 100644
--- a/activerecord/test/cases/defaults_test.rb
+++ b/activerecord/test/cases/defaults_test.rb
@@ -206,7 +206,7 @@ if current_adapter?(:PostgreSQLAdapter)
       assert_equal "some text", Default.new.text_col, "Default of text column was not correctly parse after updating default using '::text' since postgreSQL will add parens to the default in db"
     end
 
-    def teardown
+    teardown do
       @connection.schema_search_path = @old_search_path
       Default.reset_column_information
     end
diff --git a/activerecord/test/cases/disconnected_test.rb b/activerecord/test/cases/disconnected_test.rb
index 9e268dad74..94447addc1 100644
--- a/activerecord/test/cases/disconnected_test.rb
+++ b/activerecord/test/cases/disconnected_test.rb
@@ -10,7 +10,7 @@ class TestDisconnectedAdapter < ActiveRecord::TestCase
     @connection = ActiveRecord::Base.connection
   end
 
-  def teardown
+  teardown do
     return if in_memory_db?
     spec = ActiveRecord::Base.connection_config
     ActiveRecord::Base.establish_connection(spec)
diff --git a/activerecord/test/cases/explain_subscriber_test.rb b/activerecord/test/cases/explain_subscriber_test.rb
index b00e2744b9..8de2ddb10d 100644
--- a/activerecord/test/cases/explain_subscriber_test.rb
+++ b/activerecord/test/cases/explain_subscriber_test.rb
@@ -48,7 +48,7 @@ if ActiveRecord::Base.connection.supports_explain?
       assert queries.empty?
     end
 
-    def teardown
+    teardown do
       ActiveRecord::ExplainRegistry.reset
     end
 
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index e2ff2aa451..f5f85f2412 100644
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -339,7 +339,7 @@ class InheritanceComputeTypeTest < ActiveRecord::TestCase
     ActiveSupport::Dependencies.log_activity = true
   end
 
-  def teardown
+  teardown do
     ActiveSupport::Dependencies.log_activity = false
     self.class.const_remove :FirmOnTheFly rescue nil
     Firm.const_remove :FirmOnTheFly rescue nil
diff --git a/activerecord/test/cases/invalid_connection_test.rb b/activerecord/test/cases/invalid_connection_test.rb
index f6774d7ef4..8416c81f45 100644
--- a/activerecord/test/cases/invalid_connection_test.rb
+++ b/activerecord/test/cases/invalid_connection_test.rb
@@ -12,7 +12,7 @@ class TestAdapterWithInvalidConnection < ActiveRecord::TestCase
     Bird.establish_connection adapter: 'mysql', database: 'i_do_not_exist'
   end
 
-  def teardown
+  teardown do
     Bird.remove_connection
   end
 
diff --git a/activerecord/test/cases/invertible_migration_test.rb b/activerecord/test/cases/invertible_migration_test.rb
index 2b1749cf70..285172d33e 100644
--- a/activerecord/test/cases/invertible_migration_test.rb
+++ b/activerecord/test/cases/invertible_migration_test.rb
@@ -122,7 +122,7 @@ module ActiveRecord
       end
     end
 
-    def teardown
+    teardown do
       %w[horses new_horses].each do |table|
         if ActiveRecord::Base.connection.table_exists?(table)
           ActiveRecord::Base.connection.drop_table(table)
diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb
index 294f2eb9fe..5418d913b0 100644
--- a/activerecord/test/cases/migration/change_schema_test.rb
+++ b/activerecord/test/cases/migration/change_schema_test.rb
@@ -11,8 +11,7 @@ module ActiveRecord
         @table_name = :testings
       end
 
-      def teardown
-        super
+      teardown do
         connection.drop_table :testings rescue nil
         ActiveRecord::Base.primary_key_prefix_type = nil
       end
diff --git a/activerecord/test/cases/migration/change_table_test.rb b/activerecord/test/cases/migration/change_table_test.rb
index c1d7cd5874..a6d506b04a 100644
--- a/activerecord/test/cases/migration/change_table_test.rb
+++ b/activerecord/test/cases/migration/change_table_test.rb
@@ -8,7 +8,7 @@ module ActiveRecord
         @connection = Minitest::Mock.new
       end
 
-      def teardown
+      teardown do
         assert @connection.verify
       end
 
diff --git a/activerecord/test/cases/migration/column_positioning_test.rb b/activerecord/test/cases/migration/column_positioning_test.rb
index 87e29e41ba..77a752f050 100644
--- a/activerecord/test/cases/migration/column_positioning_test.rb
+++ b/activerecord/test/cases/migration/column_positioning_test.rb
@@ -18,8 +18,7 @@ module ActiveRecord
         end
       end
 
-      def teardown
-        super
+      teardown do
         connection.drop_table :testings rescue nil
         ActiveRecord::Base.primary_key_prefix_type = nil
       end
diff --git a/activerecord/test/cases/migration/create_join_table_test.rb b/activerecord/test/cases/migration/create_join_table_test.rb
index efaec0f823..62b60f7f7b 100644
--- a/activerecord/test/cases/migration/create_join_table_test.rb
+++ b/activerecord/test/cases/migration/create_join_table_test.rb
@@ -10,8 +10,7 @@ module ActiveRecord
         @connection = ActiveRecord::Base.connection
       end
 
-      def teardown
-        super
+      teardown do
         %w(artists_musics musics_videos catalog).each do |table_name|
           connection.drop_table table_name if connection.tables.include?(table_name)
         end
diff --git a/activerecord/test/cases/migration/index_test.rb b/activerecord/test/cases/migration/index_test.rb
index 8d1daa0a04..35af11f672 100644
--- a/activerecord/test/cases/migration/index_test.rb
+++ b/activerecord/test/cases/migration/index_test.rb
@@ -21,8 +21,7 @@ module ActiveRecord
         end
       end
 
-      def teardown
-        super
+      teardown do
         connection.drop_table :testings rescue nil
         ActiveRecord::Base.primary_key_prefix_type = nil
       end
diff --git a/activerecord/test/cases/migration/logger_test.rb b/activerecord/test/cases/migration/logger_test.rb
index 97efb94b66..84224e6e4c 100644
--- a/activerecord/test/cases/migration/logger_test.rb
+++ b/activerecord/test/cases/migration/logger_test.rb
@@ -19,8 +19,7 @@ module ActiveRecord
         ActiveRecord::SchemaMigration.delete_all
       end
 
-      def teardown
-        super
+      teardown do
         ActiveRecord::SchemaMigration.drop_table
       end
 
diff --git a/activerecord/test/cases/migration/references_index_test.rb b/activerecord/test/cases/migration/references_index_test.rb
index 19eb7d3c9e..4485701a4e 100644
--- a/activerecord/test/cases/migration/references_index_test.rb
+++ b/activerecord/test/cases/migration/references_index_test.rb
@@ -11,8 +11,7 @@ module ActiveRecord
         @table_name = :testings
       end
 
-      def teardown
-        super
+      teardown do
         connection.drop_table :testings rescue nil
       end
 
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 1bda472d23..455ec78f68 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -33,7 +33,7 @@ class MigrationTest < ActiveRecord::TestCase
     ActiveRecord::Base.connection.schema_cache.clear!
   end
 
-  def teardown
+  teardown do
     ActiveRecord::Base.table_name_prefix = ""
     ActiveRecord::Base.table_name_suffix = ""
 
@@ -585,7 +585,7 @@ if ActiveRecord::Base.connection.supports_bulk_alter?
       Person.reset_sequence_name
     end
 
-    def teardown
+    teardown do
       Person.connection.drop_table(:delete_me) rescue nil
     end
 
diff --git a/activerecord/test/cases/migrator_test.rb b/activerecord/test/cases/migrator_test.rb
index 3f9854200d..c77a818b93 100644
--- a/activerecord/test/cases/migrator_test.rb
+++ b/activerecord/test/cases/migrator_test.rb
@@ -26,8 +26,7 @@ module ActiveRecord
       ActiveRecord::SchemaMigration.delete_all rescue nil
     end
 
-    def teardown
-      super
+    teardown do
       ActiveRecord::SchemaMigration.delete_all rescue nil
       ActiveRecord::Migration.verbose = true
     end
diff --git a/activerecord/test/cases/modules_test.rb b/activerecord/test/cases/modules_test.rb
index 9124105e6d..f7db195521 100644
--- a/activerecord/test/cases/modules_test.rb
+++ b/activerecord/test/cases/modules_test.rb
@@ -18,7 +18,7 @@ class ModulesTest < ActiveRecord::TestCase
     ActiveRecord::Base.store_full_sti_class = false
   end
 
-  def teardown
+  teardown do
     # reinstate the constants that we undefined in the setup
     @undefined_consts.each do |constant, value|
       Object.send :const_set, constant, value unless value.nil?
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 2f89699df7..6bec760ea7 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -28,7 +28,7 @@ end
 class TestNestedAttributesInGeneral < ActiveRecord::TestCase
   include AssertRaiseWithMessage
 
-  def teardown
+  teardown do
     Pirate.accepts_nested_attributes_for :ship, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
   end
 
diff --git a/activerecord/test/cases/pooled_connections_test.rb b/activerecord/test/cases/pooled_connections_test.rb
index 626c6aeaf8..dd0e934ec2 100644
--- a/activerecord/test/cases/pooled_connections_test.rb
+++ b/activerecord/test/cases/pooled_connections_test.rb
@@ -10,7 +10,7 @@ class PooledConnectionsTest < ActiveRecord::TestCase
     @connection = ActiveRecord::Base.remove_connection
   end
 
-  def teardown
+  teardown do
     ActiveRecord::Base.clear_all_connections!
     ActiveRecord::Base.establish_connection(@connection)
     @per_test_teardown.each {|td| td.call }
diff --git a/activerecord/test/cases/reaper_test.rb b/activerecord/test/cases/reaper_test.rb
index b62a41c08e..015c37cce8 100644
--- a/activerecord/test/cases/reaper_test.rb
+++ b/activerecord/test/cases/reaper_test.rb
@@ -10,8 +10,7 @@ module ActiveRecord
         @pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
       end
 
-      def teardown
-        super
+      teardown do
         @pool.connections.each(&:close)
       end
 
diff --git a/activerecord/test/cases/serialized_attribute_test.rb b/activerecord/test/cases/serialized_attribute_test.rb
index bc67da8d27..5609cf310c 100644
--- a/activerecord/test/cases/serialized_attribute_test.rb
+++ b/activerecord/test/cases/serialized_attribute_test.rb
@@ -10,8 +10,7 @@ class SerializedAttributeTest < ActiveRecord::TestCase
 
   MyObject = Struct.new :attribute1, :attribute2
 
-  def teardown
-    super
+  teardown do
     Topic.serialize("content")
   end
 
diff --git a/activerecord/test/cases/unconnected_test.rb b/activerecord/test/cases/unconnected_test.rb
index e82ca3f93d..afb893a52c 100644
--- a/activerecord/test/cases/unconnected_test.rb
+++ b/activerecord/test/cases/unconnected_test.rb
@@ -11,7 +11,7 @@ class TestUnconnectedAdapter < ActiveRecord::TestCase
     @specification = ActiveRecord::Base.remove_connection
   end
 
-  def teardown
+  teardown do
     @underlying = nil
     ActiveRecord::Base.establish_connection(@specification)
     load_schema if in_memory_db?
diff --git a/activerecord/test/cases/validations/i18n_validation_test.rb b/activerecord/test/cases/validations/i18n_validation_test.rb
index efa0c9b934..3db742c15b 100644
--- a/activerecord/test/cases/validations/i18n_validation_test.rb
+++ b/activerecord/test/cases/validations/i18n_validation_test.rb
@@ -14,7 +14,7 @@ class I18nValidationTest < ActiveRecord::TestCase
     I18n.backend.store_translations('en', :errors => {:messages => {:custom => nil}})
   end
 
-  def teardown
+  teardown do
     I18n.load_path.replace @old_load_path
     I18n.backend = @old_backend
   end
-- 
cgit v1.2.3


From f47421f2a058a5ca845969e8d15be2028c3e6972 Mon Sep 17 00:00:00 2001
From: Eric Steele <eric@iamericsteele.com>
Date: Sat, 15 Mar 2014 21:49:04 -0400
Subject: Extend fixture label replacement to allow string interpolation

Allows fixtures to use their $LABEL as part of a string instead
of limiting use to the entire value.

    mark:
      first_name: $LABEL
      username: $LABEL1973
      email: $LABEL@$LABELmail.com

    users(:mark).first_name # => mark
    users(:mark).username   # => mark1973
    users(:mark).email      # => mark@markmail.com
---
 activerecord/test/cases/fixtures_test.rb | 4 ++++
 activerecord/test/fixtures/pirates.yml   | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 37c6af74da..1147418815 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -782,6 +782,10 @@ class FoxyFixturesTest < ActiveRecord::TestCase
     assert_equal("frederick", parrots(:frederick).name)
   end
 
+  def test_supports_label_string_interpolation
+    assert_equal("X marks the spot!", pirates(:mark).catchphrase)
+  end
+
   def test_supports_polymorphic_belongs_to
     assert_equal(pirates(:redbeard), treasures(:sapphire).looter)
     assert_equal(parrots(:louis), treasures(:ruby).looter)
diff --git a/activerecord/test/fixtures/pirates.yml b/activerecord/test/fixtures/pirates.yml
index 6004f390a4..1bb3bf0051 100644
--- a/activerecord/test/fixtures/pirates.yml
+++ b/activerecord/test/fixtures/pirates.yml
@@ -7,3 +7,6 @@ redbeard:
   parrot: louis
   created_on: "<%= 2.weeks.ago.to_s(:db) %>"
   updated_on: "<%= 2.weeks.ago.to_s(:db) %>"
+
+mark:
+  catchphrase: "X $LABELs the spot!"
-- 
cgit v1.2.3


From 8ba60912ca42a66cb59a31346623a6f9d2439192 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Mon, 17 Mar 2014 14:20:23 +0100
Subject: `where.not` adds `references` for `includes`.

Closes #14406.
---
 activerecord/test/cases/associations/eager_test.rb | 10 ++++++++++
 activerecord/test/cases/relations_test.rb          |  8 ++++++++
 2 files changed, 18 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 416a39ea4c..e59161fc5b 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1203,4 +1203,14 @@ class EagerAssociationTest < ActiveRecord::TestCase
       assert_equal 5, author.posts.size
     }
   end
+
+  test "including associations with where.not adds implicit references" do
+    author = assert_queries(2) {
+      Author.includes(:posts).where.not(posts: { title: 'Welcome to the weblog'} ).last
+    }
+
+    assert_no_queries {
+      assert_equal 2, author.posts.size
+    }
+  end
 end
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 3b4b4c92f0..fddb7c204a 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1366,6 +1366,14 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal ['comments'], scope.references_values
   end
 
+  def test_automatically_added_where_not_references
+    scope = Post.where.not(comments: { body: "Bla" })
+    assert_equal ['comments'], scope.references_values
+
+    scope = Post.where.not('comments.body' => 'Bla')
+    assert_equal ['comments'], scope.references_values
+  end
+
   def test_automatically_added_having_references
     scope = Post.having(:comments => { :body => "Bla" })
     assert_equal ['comments'], scope.references_values
-- 
cgit v1.2.3


From cc0d54bcc09a8ab834041787df69f6795a468b91 Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sat, 8 Mar 2014 01:14:26 +1030
Subject: Teach PostgreSQLAdapter#reset! to actually reset

It wasn't doing anything beyond clearing the statement cache.
---
 .../cases/adapters/postgresql/connection_test.rb   | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb
index 4715fa002d..aa4996133f 100644
--- a/activerecord/test/cases/adapters/postgresql/connection_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -45,6 +45,37 @@ module ActiveRecord
       assert_equal 'off', expect
     end
 
+    def test_reset
+      @connection.query('ROLLBACK')
+      @connection.query('SET geqo TO off')
+
+      # Verify the setting has been applied.
+      expect = @connection.query('show geqo').first.first
+      assert_equal 'off', expect
+
+      @connection.reset!
+
+      # Verify the setting has been cleared.
+      expect = @connection.query('show geqo').first.first
+      assert_equal 'on', expect
+    end
+
+    def test_reset_with_transaction
+      @connection.query('ROLLBACK')
+      @connection.query('SET geqo TO off')
+
+      # Verify the setting has been applied.
+      expect = @connection.query('show geqo').first.first
+      assert_equal 'off', expect
+
+      @connection.query('BEGIN')
+      @connection.reset!
+
+      # Verify the setting has been cleared.
+      expect = @connection.query('show geqo').first.first
+      assert_equal 'on', expect
+    end
+
     def test_tables_logs_name
       @connection.tables('hello')
       assert_equal 'SCHEMA', @subscriber.logged[0][1]
-- 
cgit v1.2.3


From 9e457a8654fa89fe329719f88ae3679aefb21e56 Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sat, 8 Mar 2014 00:06:09 +1030
Subject: Reap connections based on owning-thread death

.. not a general timeout.

Now, if a thread checks out a connection then dies, we can immediately
recover that connection and re-use it.

This should alleviate the pool exhaustion discussed in #12867. More
importantly, it entirely avoids the potential issues of the reaper
attempting to check whether connections are still active: as long as the
owning thread is alive, the connection is its business alone.

As a no-op reap is now trivial (only entails checking a thread status
per connection), we can also perform one in-line any time we decide to
sleep for a connection.
---
 .../connection_adapters/abstract_adapter_test.rb   |  6 ------
 activerecord/test/cases/connection_pool_test.rb    | 23 ++++++++++++----------
 activerecord/test/cases/reaper_test.rb             | 17 ++++++++++------
 3 files changed, 24 insertions(+), 22 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
index eb2fe5639b..deed226eab 100644
--- a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
+++ b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
@@ -29,12 +29,6 @@ module ActiveRecord
         assert_not adapter.lease, 'should not lease adapter'
       end
 
-      def test_last_use
-        assert_not adapter.last_use
-        adapter.lease
-        assert adapter.last_use
-      end
-
       def test_expire_mutates_in_use
         assert adapter.lease, 'lease adapter'
         assert adapter.in_use?, 'adapter is in use'
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index c4108ad7f6..6300011f4a 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -124,7 +124,6 @@ module ActiveRecord
         @pool.checkout
         @pool.checkout
         @pool.checkout
-        @pool.dead_connection_timeout = 0
 
         connections = @pool.connections.dup
 
@@ -134,21 +133,25 @@ module ActiveRecord
       end
 
       def test_reap_inactive
+        ready = false
         @pool.checkout
-        @pool.checkout
-        @pool.checkout
-        @pool.dead_connection_timeout = 0
-
-        connections = @pool.connections.dup
-        connections.each do |conn|
-          conn.extend(Module.new { def active_threadsafe?; false; end; })
+        child = Thread.new do
+          @pool.checkout
+          @pool.checkout
+          ready = true
+          Thread.stop
         end
+        Thread.pass until ready
+
+        assert_equal 3, active_connections(@pool).size
 
+        child.terminate
+        child.join
         @pool.reap
 
-        assert_equal 0, @pool.connections.length
+        assert_equal 1, active_connections(@pool).size
       ensure
-        connections.each(&:close)
+        @pool.connections.each(&:close)
       end
 
       def test_remove_connection
diff --git a/activerecord/test/cases/reaper_test.rb b/activerecord/test/cases/reaper_test.rb
index 015c37cce8..f52fd22489 100644
--- a/activerecord/test/cases/reaper_test.rb
+++ b/activerecord/test/cases/reaper_test.rb
@@ -63,17 +63,22 @@ module ActiveRecord
         spec.config[:reaping_frequency] = 0.0001
 
         pool = ConnectionPool.new spec
-        pool.dead_connection_timeout = 0
 
-        conn = pool.checkout
-        count = pool.connections.length
+        conn = nil
+        child = Thread.new do
+          conn = pool.checkout
+          Thread.stop
+        end
+        Thread.pass while conn.nil?
+
+        assert conn.in_use?
 
-        conn.extend(Module.new { def active_threadsafe?; false; end; })
+        child.terminate
 
-        while count == pool.connections.length
+        while conn.in_use?
           Thread.pass
         end
-        assert_equal(count - 1, pool.connections.length)
+        assert !conn.in_use?
       end
     end
   end
-- 
cgit v1.2.3


From 4db4f909174420904d48a9712e337b697d372ac3 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 17 Mar 2014 17:29:33 -0700
Subject: use a latch to avoid busy loops

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 6300011f4a..c0d5e3707c 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -1,4 +1,5 @@
 require "cases/helper"
+require 'active_support/concurrency/latch'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -133,15 +134,15 @@ module ActiveRecord
       end
 
       def test_reap_inactive
-        ready = false
+        ready = ActiveSupport::Concurrency::Latch.new
         @pool.checkout
         child = Thread.new do
           @pool.checkout
           @pool.checkout
-          ready = true
+          ready.release
           Thread.stop
         end
-        Thread.pass until ready
+        ready.await
 
         assert_equal 3, active_connections(@pool).size
 
-- 
cgit v1.2.3


From 34e54fa0542ebb3403932ab785239119e449dc3c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 17 Mar 2014 17:37:05 -0700
Subject: test should only pass if the pool.size+1 checkout fails

Previously, any of the connection checkouts could have failed, and this
test would pass.
---
 activerecord/test/cases/connection_pool_test.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index c0d5e3707c..8d15a76735 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -89,10 +89,9 @@ module ActiveRecord
       end
 
       def test_full_pool_exception
+        @pool.size.times { @pool.checkout }
         assert_raises(ConnectionTimeoutError) do
-          (@pool.size + 1).times do
-            @pool.checkout
-          end
+          @pool.checkout
         end
       end
 
-- 
cgit v1.2.3


From e64875ffde5787eee24a96070f3cf51727347304 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 17 Mar 2014 21:23:54 -0400
Subject: Add counter cache test for class_name

Backport test from #14410
---
 .../test/cases/associations/belongs_to_associations_test.rb   | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 9340bc0a83..56ac284331 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -824,6 +824,17 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal 0, comments(:greetings).reload.children_count
   end
 
+  def test_belongs_to_with_id_assigning
+    post = posts(:welcome)
+    comment = Comment.create! body: "foo", post: post
+    parent = comments(:greetings)
+    assert_equal 0, parent.reload.children_count
+    comment.parent_id = parent.id
+
+    comment.save!
+    assert_equal 1, parent.reload.children_count
+  end
+
   def test_polymorphic_with_custom_primary_key
     toy = Toy.create!
     sponsor = Sponsor.create!(:sponsorable => toy)
-- 
cgit v1.2.3


From c80ca4c7803b4e8ed7f125ada9acc6b7c499af5f Mon Sep 17 00:00:00 2001
From: Thiago Pinto <tapgyn@gmail.com>
Date: Wed, 19 Mar 2014 21:13:03 -0400
Subject: ActiveRecord#touch should accept multiple attributes #14423

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

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index 717e0e1866..5308fa8808 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -89,6 +89,18 @@ class TimestampTest < ActiveRecord::TestCase
     assert_in_delta Time.now, task.ending, 1
   end
 
+  def test_touching_many_attributes_updates_them
+    task = Task.first
+    previous_starting = task.starting
+    previous_ending = task.ending
+    task.touch(:starting, :ending)
+    
+    assert_not_equal previous_starting, task.starting
+    assert_not_equal previous_ending, task.ending
+    assert_in_delta Time.now, task.starting, 1
+    assert_in_delta Time.now, task.ending, 1
+  end
+
   def test_touching_a_record_without_timestamps_is_unexceptional
     assert_nothing_raised { Car.first.touch }
   end
-- 
cgit v1.2.3


From 0110d7b714a6ecc810a38ef5a27b66ec321995e5 Mon Sep 17 00:00:00 2001
From: Josh Williams <jwilliams@endpoint.com>
Date: Tue, 19 Nov 2013 15:50:14 -0500
Subject: Postgres schema: Constrain sequence search classid

The pk_an_sequence_for query previously joined against pg_class's oid
for rows in pg_depend, but pg_depend's objid may point to other system
tables, such as pg_attrdef.  If a row in one of those other tables
coincidentally has the same oid as an (unrelated) sequence, that
sequence name may be returned instead of the real one.

This ensures that only the pg_depend entries pointing to pg_class are
considered.
---
 .../adapters/postgresql/postgresql_adapter_test.rb | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index 019406dd84..de7acdf3ab 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -176,6 +176,51 @@ module ActiveRecord
         assert_nil @connection.pk_and_sequence_for('unobtainium')
       end
 
+      def test_pk_and_sequence_for_with_collision_pg_class_oid
+        @connection.exec_query('create table ex(id serial primary key)')
+        @connection.exec_query('create table ex2(id serial primary key)')
+
+        correct_depend_record = [
+          "'pg_class'::regclass",
+          "'ex_id_seq'::regclass",
+          '0',
+          "'pg_class'::regclass",
+          "'ex'::regclass",
+          '1',
+          "'a'"
+        ]
+
+        collision_depend_record = [
+          "'pg_attrdef'::regclass",
+          "'ex2_id_seq'::regclass",
+          '0',
+          "'pg_class'::regclass",
+          "'ex'::regclass",
+          '1',
+          "'a'"
+        ]
+
+        @connection.exec_query(
+          "DELETE FROM pg_depend WHERE objid = 'ex_id_seq'::regclass AND refobjid = 'ex'::regclass AND deptype = 'a'"
+        )
+        @connection.exec_query(
+          "INSERT INTO pg_depend VALUES(#{collision_depend_record.join(',')})"
+        )
+        @connection.exec_query(
+          "INSERT INTO pg_depend VALUES(#{correct_depend_record.join(',')})"
+        )
+
+        seq = @connection.pk_and_sequence_for('ex').last
+        assert_equal 'ex_id_seq', seq
+
+        @connection.exec_query(
+          "DELETE FROM pg_depend WHERE objid = 'ex2_id_seq'::regclass AND refobjid = 'ex'::regclass AND deptype = 'a'"
+        )
+      ensure
+        @connection.exec_query('DROP TABLE IF EXISTS ex')
+        @connection.exec_query('DROP TABLE IF EXISTS ex2')
+      end
+
       def test_exec_insert_number
         with_example_table do
           insert(@connection, 'number' => 10)
-- 
cgit v1.2.3


From 656f4f29fa497a13d13b39b12506e0505072b472 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Thu, 20 Mar 2014 08:40:31 -0300
Subject: Remove extra indirection for testing exceptions and messages

assert_raise + assert_equal on the returned exception message work
just fine, there is no need for extra work, specially like this overly
complicated helper.
---
 activerecord/test/cases/nested_attributes_test.rb | 40 +++++++----------------
 1 file changed, 12 insertions(+), 28 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 6bec760ea7..cf96c3fccf 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -11,23 +11,7 @@ require "models/owner"
 require "models/pet"
 require 'active_support/hash_with_indifferent_access'
 
-module AssertRaiseWithMessage
-  def assert_raise_with_message(expected_exception, expected_message)
-    begin
-      error_raised = false
-      yield
-    rescue expected_exception => error
-      error_raised = true
-      actual_message = error.message
-    end
-    assert error_raised
-    assert_equal expected_message, actual_message
-  end
-end
-
 class TestNestedAttributesInGeneral < ActiveRecord::TestCase
-  include AssertRaiseWithMessage
-
   teardown do
     Pirate.accepts_nested_attributes_for :ship, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
   end
@@ -71,9 +55,10 @@ class TestNestedAttributesInGeneral < ActiveRecord::TestCase
   end
 
   def test_should_raise_an_ArgumentError_for_non_existing_associations
-    assert_raise_with_message ArgumentError, "No association found for name `honesty'. Has it been defined yet?" do
+    exception = assert_raise ArgumentError do
       Pirate.accepts_nested_attributes_for :honesty
     end
+    assert_equal "No association found for name `honesty'. Has it been defined yet?", exception.message
   end
 
   def test_should_disable_allow_destroy_by_default
@@ -213,17 +198,16 @@ class TestNestedAttributesInGeneral < ActiveRecord::TestCase
 end
 
 class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase
-  include AssertRaiseWithMessage
-
   def setup
     @pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?")
     @ship = @pirate.create_ship(:name => 'Nights Dirty Lightning')
   end
 
   def test_should_raise_argument_error_if_trying_to_build_polymorphic_belongs_to
-    assert_raise_with_message ArgumentError, "Cannot build association `looter'. Are you trying to build a polymorphic one-to-one association?" do
+    exception = assert_raise ArgumentError do
       Treasure.new(:name => 'pearl', :looter_attributes => {:catchphrase => "Arrr"})
     end
+    assert_equal "Cannot build association `looter'. Are you trying to build a polymorphic one-to-one association?", exception.message
   end
 
   def test_should_define_an_attribute_writer_method_for_the_association
@@ -275,9 +259,10 @@ class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase
   end
 
   def test_should_raise_RecordNotFound_if_an_id_is_given_but_doesnt_return_a_record
-    assert_raise_with_message ActiveRecord::RecordNotFound, "Couldn't find Ship with ID=1234567890 for Pirate with ID=#{@pirate.id}" do
+    exception = assert_raise ActiveRecord::RecordNotFound do
       @pirate.ship_attributes = { :id => 1234567890 }
     end
+    assert_equal "Couldn't find Ship with ID=1234567890 for Pirate with ID=#{@pirate.id}", exception.message
   end
 
   def test_should_take_a_hash_with_string_keys_and_update_the_associated_model
@@ -403,8 +388,6 @@ class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase
 end
 
 class TestNestedAttributesOnABelongsToAssociation < ActiveRecord::TestCase
-  include AssertRaiseWithMessage
-
   def setup
     @ship = Ship.new(:name => 'Nights Dirty Lightning')
     @pirate = @ship.build_pirate(:catchphrase => 'Aye')
@@ -460,9 +443,10 @@ class TestNestedAttributesOnABelongsToAssociation < ActiveRecord::TestCase
   end
 
   def test_should_raise_RecordNotFound_if_an_id_is_given_but_doesnt_return_a_record
-    assert_raise_with_message ActiveRecord::RecordNotFound, "Couldn't find Pirate with ID=1234567890 for Ship with ID=#{@ship.id}" do
+    exception = assert_raise ActiveRecord::RecordNotFound do
       @ship.pirate_attributes = { :id => 1234567890 }
     end
+    assert_equal "Couldn't find Pirate with ID=1234567890 for Ship with ID=#{@ship.id}", exception.message
   end
 
   def test_should_take_a_hash_with_string_keys_and_update_the_associated_model
@@ -579,8 +563,6 @@ class TestNestedAttributesOnABelongsToAssociation < ActiveRecord::TestCase
 end
 
 module NestedAttributesOnACollectionAssociationTests
-  include AssertRaiseWithMessage
-
   def test_should_define_an_attribute_writer_method_for_the_association
     assert_respond_to @pirate, association_setter
   end
@@ -670,9 +652,10 @@ module NestedAttributesOnACollectionAssociationTests
   end
 
   def test_should_raise_RecordNotFound_if_an_id_is_given_but_doesnt_return_a_record
-    assert_raise_with_message ActiveRecord::RecordNotFound, "Couldn't find #{@child_1.class.name} with ID=1234567890 for Pirate with ID=#{@pirate.id}" do
+    exception = assert_raise ActiveRecord::RecordNotFound do
       @pirate.attributes = { association_getter => [{ :id => 1234567890 }] }
     end
+    assert_equal "Couldn't find #{@child_1.class.name} with ID=1234567890 for Pirate with ID=#{@pirate.id}", exception.message
   end
 
   def test_should_automatically_build_new_associated_models_for_each_entry_in_a_hash_where_the_id_is_missing
@@ -727,9 +710,10 @@ module NestedAttributesOnACollectionAssociationTests
     assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, {}) }
     assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, Hash.new) }
 
-    assert_raise_with_message ArgumentError, 'Hash or Array expected, got String ("foo")' do
+    exception = assert_raise ArgumentError do
       @pirate.send(association_setter, "foo")
     end
+    assert_equal 'Hash or Array expected, got String ("foo")', exception.message
   end
 
   def test_should_work_with_update_as_well
-- 
cgit v1.2.3


From 79405a07a45dfaeb6c39d794b42b72ee73e420e9 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 18 Mar 2014 19:06:44 -0700
Subject: Extract with_example_table into helper method.

This setups the helper method which other tests can benefit from.
---
 .../test/cases/adapters/postgresql/postgresql_adapter_test.rb | 11 +++++------
 activerecord/test/support/ddl_helper.rb                       |  8 ++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 activerecord/test/support/ddl_helper.rb

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index de7acdf3ab..49d8ec238d 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -1,9 +1,12 @@
 # encoding: utf-8
 require "cases/helper"
+require 'support/ddl_helper'
 
 module ActiveRecord
   module ConnectionAdapters
     class PostgreSQLAdapterTest < ActiveRecord::TestCase
+      include DdlHelper
+
       def setup
         @connection = ActiveRecord::Base.connection
       end
@@ -369,12 +372,8 @@ module ActiveRecord
         ctx.exec_insert(sql, 'SQL', binds)
       end
 
-      def with_example_table(definition = nil)
-        definition ||= 'id serial primary key, number integer, data character varying(255)'
-        @connection.exec_query("create table ex(#{definition})")
-        yield
-      ensure
-        @connection.exec_query('drop table if exists ex')
+      def with_example_table(definition = 'id serial primary key, number integer, data character varying(255)', &block)
+        super(@connection, 'ex', definition, &block)
       end
 
       def connection_without_insert_returning
diff --git a/activerecord/test/support/ddl_helper.rb b/activerecord/test/support/ddl_helper.rb
new file mode 100644
index 0000000000..0107babaaf
--- /dev/null
+++ b/activerecord/test/support/ddl_helper.rb
@@ -0,0 +1,8 @@
+module DdlHelper
+  def with_example_table(connection, table_name, definition = nil)
+    connection.exec_query("CREATE TABLE #{table_name}(#{definition})")
+    yield
+  ensure
+    connection.exec_query("DROP TABLE #{table_name}")
+  end
+end
-- 
cgit v1.2.3


From 1db36c411ae91e9df7f899664f25019c5110d5eb Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 20 Mar 2014 14:41:09 -0700
Subject: Clean up tables after each test.

Follow-Up to https://github.com/rails/rails/pull/14400

This ensures that all tables are removed after each test and thereby
allowing us to run the tests in a random order.
---
 .../test/cases/adapters/mysql/connection_test.rb   |  80 +++++++--------
 .../cases/adapters/mysql/mysql_adapter_test.rb     | 108 +++++++++++----------
 2 files changed, 96 insertions(+), 92 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 5cd5d8ac5f..42ffb91095 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -1,6 +1,9 @@
 require "cases/helper"
+require 'support/ddl_helper'
 
 class MysqlConnectionTest < ActiveRecord::TestCase
+  include DdlHelper
+
   class Klass < ActiveRecord::Base
   end
 
@@ -69,59 +72,50 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   end
 
   def test_exec_no_binds
-    @connection.exec_query('drop table if exists ex')
-    @connection.exec_query(<<-eosql)
-      CREATE TABLE `ex` (`id` int(11) auto_increment PRIMARY KEY,
-        `data` varchar(255))
-    eosql
-    result = @connection.exec_query('SELECT id, data FROM ex')
-    assert_equal 0, result.rows.length
-    assert_equal 2, result.columns.length
-    assert_equal %w{ id data }, result.columns
+    with_example_table do
+      result = @connection.exec_query('SELECT id, data FROM ex')
+      assert_equal 0, result.rows.length
+      assert_equal 2, result.columns.length
+      assert_equal %w{ id data }, result.columns
 
-    @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+      @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
 
-    # if there are no bind parameters, it will return a string (due to
-    # the libmysql api)
-    result = @connection.exec_query('SELECT id, data FROM ex')
-    assert_equal 1, result.rows.length
-    assert_equal 2, result.columns.length
+      # if there are no bind parameters, it will return a string (due to
+      # the libmysql api)
+      result = @connection.exec_query('SELECT id, data FROM ex')
+      assert_equal 1, result.rows.length
+      assert_equal 2, result.columns.length
 
-    assert_equal [['1', 'foo']], result.rows
+      assert_equal [['1', 'foo']], result.rows
+    end
   end
 
   def test_exec_with_binds
-    @connection.exec_query('drop table if exists ex')
-    @connection.exec_query(<<-eosql)
-      CREATE TABLE `ex` (`id` int(11) auto_increment PRIMARY KEY,
-        `data` varchar(255))
-    eosql
-    @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
-    result = @connection.exec_query(
-      'SELECT id, data FROM ex WHERE id = ?', nil, [[nil, 1]])
+    with_example_table do
+      @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+      result = @connection.exec_query(
+        'SELECT id, data FROM ex WHERE id = ?', nil, [[nil, 1]])
 
-    assert_equal 1, result.rows.length
-    assert_equal 2, result.columns.length
+      assert_equal 1, result.rows.length
+      assert_equal 2, result.columns.length
 
-    assert_equal [[1, 'foo']], result.rows
+      assert_equal [[1, 'foo']], result.rows
+    end
   end
 
   def test_exec_typecasts_bind_vals
-    @connection.exec_query('drop table if exists ex')
-    @connection.exec_query(<<-eosql)
-      CREATE TABLE `ex` (`id` int(11) auto_increment PRIMARY KEY,
-        `data` varchar(255))
-    eosql
-    @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
-    column = @connection.columns('ex').find { |col| col.name == 'id' }
+    with_example_table do
+      @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+      column = @connection.columns('ex').find { |col| col.name == 'id' }
 
-    result = @connection.exec_query(
-      'SELECT id, data FROM ex WHERE id = ?', nil, [[column, '1-fuu']])
+      result = @connection.exec_query(
+        'SELECT id, data FROM ex WHERE id = ?', nil, [[column, '1-fuu']])
 
-    assert_equal 1, result.rows.length
-    assert_equal 2, result.columns.length
+      assert_equal 1, result.rows.length
+      assert_equal 2, result.columns.length
 
-    assert_equal [[1, 'foo']], result.rows
+      assert_equal [[1, 'foo']], result.rows
+    end
   end
 
   # Test that MySQL allows multiple results for stored procedures
@@ -174,4 +168,12 @@ class MysqlConnectionTest < ActiveRecord::TestCase
       ActiveRecord::Base.establish_connection(original_connection)
     end
   end
+
+  def with_example_table(&block)
+    definition ||= <<-SQL
+      `id` int(11) auto_increment PRIMARY KEY,
+      `data` varchar(255)
+    SQL
+    super(@connection, 'ex', definition, &block)
+  end
 end
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index 578f6301bd..1699380eb3 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -1,19 +1,15 @@
 # encoding: utf-8
 
 require "cases/helper"
+require 'support/ddl_helper'
 
 module ActiveRecord
   module ConnectionAdapters
     class MysqlAdapterTest < ActiveRecord::TestCase
+      include DdlHelper
+
       def setup
         @conn = ActiveRecord::Base.connection
-        @conn.exec_query('drop table if exists ex')
-        @conn.exec_query(<<-eosql)
-          CREATE TABLE `ex` (
-            `id` int(11) auto_increment PRIMARY KEY,
-            `number` integer,
-            `data` varchar(255))
-        eosql
       end
 
       def test_bad_connection_mysql
@@ -25,8 +21,10 @@ module ActiveRecord
       end
 
       def test_valid_column
-        column = @conn.columns('ex').find { |col| col.name == 'id' }
-        assert @conn.valid_type?(column.type)
+        with_example_table do
+          column = @conn.columns('ex').find { |col| col.name == 'id' }
+          assert @conn.valid_type?(column.type)
+        end
       end
 
       def test_invalid_column
@@ -38,31 +36,35 @@ module ActiveRecord
       end
 
       def test_exec_insert_number
-        insert(@conn, 'number' => 10)
+        with_example_table do
+          insert(@conn, 'number' => 10)
 
-        result = @conn.exec_query('SELECT number FROM ex WHERE number = 10')
+          result = @conn.exec_query('SELECT number FROM ex WHERE number = 10')
 
-        assert_equal 1, result.rows.length
-        # if there are no bind parameters, it will return a string (due to
-        # the libmysql api)
-        assert_equal '10', result.rows.last.last
+          assert_equal 1, result.rows.length
+          # if there are no bind parameters, it will return a string (due to
+          # the libmysql api)
+          assert_equal '10', result.rows.last.last
+        end
       end
 
       def test_exec_insert_string
-        str = 'いただきます！'
-        insert(@conn, 'number' => 10, 'data' => str)
+        with_example_table do
+          str = 'いただきます！'
+          insert(@conn, 'number' => 10, 'data' => str)
 
-        result = @conn.exec_query('SELECT number, data FROM ex WHERE number = 10')
+          result = @conn.exec_query('SELECT number, data FROM ex WHERE number = 10')
 
-        value = result.rows.last.last
+          value = result.rows.last.last
 
-        # FIXME: this should probably be inside the mysql AR adapter?
-        value.force_encoding(@conn.client_encoding)
+          # FIXME: this should probably be inside the mysql AR adapter?
+          value.force_encoding(@conn.client_encoding)
 
-        # The strings in this file are utf-8, so transcode to utf-8
-        value.encode!(Encoding::UTF_8)
+          # The strings in this file are utf-8, so transcode to utf-8
+          value.encode!(Encoding::UTF_8)
 
-        assert_equal str, value
+          assert_equal str, value
+        end
       end
 
       def test_tables_quoting
@@ -74,46 +76,37 @@ module ActiveRecord
       end
 
       def test_pk_and_sequence_for
-        pk, seq = @conn.pk_and_sequence_for('ex')
-        assert_equal 'id', pk
-        assert_equal @conn.default_sequence_name('ex', 'id'), seq
+        with_example_table do
+          pk, seq = @conn.pk_and_sequence_for('ex')
+          assert_equal 'id', pk
+          assert_equal @conn.default_sequence_name('ex', 'id'), seq
+        end
       end
 
       def test_pk_and_sequence_for_with_non_standard_primary_key
-        @conn.exec_query('drop table if exists ex_with_non_standard_pk')
-        @conn.exec_query(<<-eosql)
-          CREATE TABLE `ex_with_non_standard_pk` (
-            `code` INT(11) auto_increment,
-             PRIMARY KEY  (`code`))
-        eosql
-        pk, seq = @conn.pk_and_sequence_for('ex_with_non_standard_pk')
-        assert_equal 'code', pk
-        assert_equal @conn.default_sequence_name('ex_with_non_standard_pk', 'code'), seq
+        with_example_table '`code` INT(11) auto_increment, PRIMARY KEY (`code`)' do
+          pk, seq = @conn.pk_and_sequence_for('ex')
+          assert_equal 'code', pk
+          assert_equal @conn.default_sequence_name('ex', 'code'), seq
+        end
       end
 
       def test_pk_and_sequence_for_with_custom_index_type_pk
-        @conn.exec_query('drop table if exists ex_with_custom_index_type_pk')
-        @conn.exec_query(<<-eosql)
-          CREATE TABLE `ex_with_custom_index_type_pk` (
-            `id` INT(11) auto_increment,
-             PRIMARY KEY  USING BTREE (`id`))
-        eosql
-        pk, seq = @conn.pk_and_sequence_for('ex_with_custom_index_type_pk')
-        assert_equal 'id', pk
-        assert_equal @conn.default_sequence_name('ex_with_custom_index_type_pk', 'id'), seq
+        with_example_table '`id` INT(11) auto_increment, PRIMARY KEY USING BTREE (`id`)' do
+          pk, seq = @conn.pk_and_sequence_for('ex')
+          assert_equal 'id', pk
+          assert_equal @conn.default_sequence_name('ex', 'id'), seq
+        end
       end
 
       def test_tinyint_integer_typecasting
-        @conn.exec_query('drop table if exists ex_with_non_boolean_tinyint_column')
-        @conn.exec_query(<<-eosql)
-          CREATE TABLE `ex_with_non_boolean_tinyint_column` (
-            `status` TINYINT(4))
-        eosql
-        insert(@conn, { 'status' => 2 }, 'ex_with_non_boolean_tinyint_column')
+        with_example_table '`status` TINYINT(4)' do
+          insert(@conn, { 'status' => 2 }, 'ex')
 
-        result = @conn.exec_query('SELECT status FROM ex_with_non_boolean_tinyint_column')
+          result = @conn.exec_query('SELECT status FROM ex')
 
-        assert_equal 2, result.column_types['status'].type_cast(result.last['status'])
+          assert_equal 2, result.column_types['status'].type_cast(result.last['status'])
+        end
       end
 
       def test_supports_extensions
@@ -140,6 +133,15 @@ module ActiveRecord
 
         ctx.exec_insert(sql, 'SQL', binds)
       end
+
+      def with_example_table(definition = nil, &block)
+        definition ||= <<-SQL
+          `id` int(11) auto_increment PRIMARY KEY,
+          `number` integer,
+          `data` varchar(255)
+        SQL
+        super(@conn, 'ex', definition, &block)
+      end
     end
   end
 end
-- 
cgit v1.2.3


From c7191e31957a4c8adca492a3f0ce1909a7b68e23 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 24 Mar 2014 17:20:55 -0700
Subject: use ARel factory methods for building AST nodes

This abstracts us from the actual construction of the nodes
---
 .../test/cases/relation/predicate_builder_test.rb  |  4 +--
 .../test/cases/relation/where_chain_test.rb        | 30 +++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/relation/predicate_builder_test.rb b/activerecord/test/cases/relation/predicate_builder_test.rb
index 14a8d97d36..4057835688 100644
--- a/activerecord/test/cases/relation/predicate_builder_test.rb
+++ b/activerecord/test/cases/relation/predicate_builder_test.rb
@@ -5,10 +5,10 @@ module ActiveRecord
   class PredicateBuilderTest < ActiveRecord::TestCase
     def test_registering_new_handlers
       PredicateBuilder.register_handler(Regexp, proc do |column, value|
-        Arel::Nodes::InfixOperation.new('~', column, value.source)
+        Arel::Nodes::InfixOperation.new('~', column, Arel.sql(value.source))
       end)
 
-      assert_match %r{["`]topics["`].["`]title["`] ~ 'rails'}i, Topic.where(title: /rails/).to_sql
+      assert_match %r{["`]topics["`].["`]title["`] ~ rails}i, Topic.where(title: /rails/).to_sql
     end
   end
 end
diff --git a/activerecord/test/cases/relation/where_chain_test.rb b/activerecord/test/cases/relation/where_chain_test.rb
index fd2420cb88..c628ca44ff 100644
--- a/activerecord/test/cases/relation/where_chain_test.rb
+++ b/activerecord/test/cases/relation/where_chain_test.rb
@@ -12,13 +12,13 @@ module ActiveRecord
     end
 
     def test_not_eq
-      expected = Arel::Nodes::NotEqual.new(Post.arel_table[@name], 'hello')
+      expected = Post.arel_table[@name].not_eq('hello')
       relation = Post.where.not(title: 'hello')
       assert_equal([expected], relation.where_values)
     end
 
     def test_not_null
-      expected = Arel::Nodes::NotEqual.new(Post.arel_table[@name], nil)
+      expected = Post.arel_table[@name].not_eq(nil)
       relation = Post.where.not(title: nil)
       assert_equal([expected], relation.where_values)
     end
@@ -30,13 +30,13 @@ module ActiveRecord
     end
 
     def test_not_in
-      expected = Arel::Nodes::NotIn.new(Post.arel_table[@name], %w[hello goodbye])
+      expected = Post.arel_table[@name].not_in(%w[hello goodbye])
       relation = Post.where.not(title: %w[hello goodbye])
       assert_equal([expected], relation.where_values)
     end
 
     def test_association_not_eq
-      expected = Arel::Nodes::NotEqual.new(Comment.arel_table[@name], 'hello')
+      expected = Comment.arel_table[@name].not_eq('hello')
       relation = Post.joins(:comments).where.not(comments: {title: 'hello'})
       assert_equal(expected.to_sql, relation.where_values.first.to_sql)
     end
@@ -44,20 +44,20 @@ module ActiveRecord
     def test_not_eq_with_preceding_where
       relation = Post.where(title: 'hello').where.not(title: 'world')
 
-      expected = Arel::Nodes::Equality.new(Post.arel_table[@name], 'hello')
+      expected = Post.arel_table[@name].eq('hello')
       assert_equal(expected, relation.where_values.first)
 
-      expected = Arel::Nodes::NotEqual.new(Post.arel_table[@name], 'world')
+      expected = Post.arel_table[@name].not_eq('world')
       assert_equal(expected, relation.where_values.last)
     end
 
     def test_not_eq_with_succeeding_where
       relation = Post.where.not(title: 'hello').where(title: 'world')
 
-      expected = Arel::Nodes::NotEqual.new(Post.arel_table[@name], 'hello')
+      expected = Post.arel_table[@name].not_eq('hello')
       assert_equal(expected, relation.where_values.first)
 
-      expected = Arel::Nodes::Equality.new(Post.arel_table[@name], 'world')
+      expected = Post.arel_table[@name].eq('world')
       assert_equal(expected, relation.where_values.last)
     end
 
@@ -76,17 +76,17 @@ module ActiveRecord
     def test_chaining_multiple
       relation = Post.where.not(author_id: [1, 2]).where.not(title: 'ruby on rails')
 
-      expected = Arel::Nodes::NotIn.new(Post.arel_table['author_id'], [1, 2])
+      expected = Post.arel_table['author_id'].not_in([1, 2])
       assert_equal(expected, relation.where_values[0])
 
-      expected = Arel::Nodes::NotEqual.new(Post.arel_table[@name], 'ruby on rails')
+      expected = Post.arel_table[@name].not_eq('ruby on rails')
       assert_equal(expected, relation.where_values[1])
     end
     
     def test_rewhere_with_one_condition
       relation = Post.where(title: 'hello').where(title: 'world').rewhere(title: 'alone')
 
-      expected = Arel::Nodes::Equality.new(Post.arel_table[@name], 'alone')
+      expected = Post.arel_table[@name].eq('alone')
       assert_equal 1, relation.where_values.size
       assert_equal expected, relation.where_values.first
     end
@@ -94,8 +94,8 @@ module ActiveRecord
     def test_rewhere_with_multiple_overwriting_conditions
       relation = Post.where(title: 'hello').where(body: 'world').rewhere(title: 'alone', body: 'again')
 
-      title_expected = Arel::Nodes::Equality.new(Post.arel_table['title'], 'alone')
-      body_expected  = Arel::Nodes::Equality.new(Post.arel_table['body'], 'again')
+      title_expected = Post.arel_table['title'].eq('alone')
+      body_expected  = Post.arel_table['body'].eq('again')
 
       assert_equal 2, relation.where_values.size
       assert_equal title_expected, relation.where_values.first
@@ -105,8 +105,8 @@ module ActiveRecord
     def test_rewhere_with_one_overwriting_condition_and_one_unrelated
       relation = Post.where(title: 'hello').where(body: 'world').rewhere(title: 'alone')
 
-      title_expected = Arel::Nodes::Equality.new(Post.arel_table['title'], 'alone')
-      body_expected  = Arel::Nodes::Equality.new(Post.arel_table['body'], 'world')
+      title_expected = Post.arel_table['title'].eq('alone')
+      body_expected  = Post.arel_table['body'].eq('world')
 
       assert_equal 2, relation.where_values.size
       assert_equal body_expected, relation.where_values.first
-- 
cgit v1.2.3


From f72058a94d8ebbcaf3b8ef0b36dfa1acb64fa8f0 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 24 Mar 2014 17:38:18 -0700
Subject: do not rely on method_missing hitting arel

arel methods are not supposed to be public API for ActiveRecord
---
 activerecord/test/cases/scoping/relation_scoping_test.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/scoping/relation_scoping_test.rb b/activerecord/test/cases/scoping/relation_scoping_test.rb
index 0018fc06f2..d8a467ec4d 100644
--- a/activerecord/test/cases/scoping/relation_scoping_test.rb
+++ b/activerecord/test/cases/scoping/relation_scoping_test.rb
@@ -192,8 +192,9 @@ class NestedRelationScopingTest < ActiveRecord::TestCase
     Developer.where('salary = 80000').scoping do
       Developer.limit(10).scoping do
         devs = Developer.all
-        assert_match '(salary = 80000)', devs.to_sql
-        assert_equal 10, devs.taken
+        sql = devs.to_sql
+        assert_match '(salary = 80000)', sql
+        assert_match 'LIMIT 10', sql
       end
     end
   end
-- 
cgit v1.2.3