Merge branch 'master' into set_binds

* master: (2794 commits)
  doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]
  Restore DATABASE_URL even if it's nil in connection_handler test
  [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users
  Ensure Active Record connection consistency
  Revert "ask the fixture set for the sql statements"
  Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
  Adding Hash#compact and Hash#compact! methods
  MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users.
  clear cache on body close so that cache remains during rendering
  add a more restricted codepath for templates fixes #13390
  refactor generator tests to use block form of Tempfile
  Fix typo [ci skip]
  Move finish_template as the last public method in the generator
  Minor typos fix [ci skip]
  make `change_column_null` reversible. Closes #13576.
  create/drop test and development databases only if RAILS_ENV is nil
  Revert "Speedup String#to"
  typo fix in test name. [ci skip].
  `core_ext/string/access.rb` test what we are documenting.
  Fix typo in image_tag documentation
  ...

Conflicts:
	activerecord/lib/active_record/associations/join_dependency/join_association.rb
	activerecord/lib/active_record/relation/query_methods.rb

1 files changed, 62 insertions, 349 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
index b5d7ea603e..04a458fbce 100644
--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
@@ -3,9 +3,6 @@ require "cases/helper"
 class PostgresqlArray < ActiveRecord::Base
 end
 
-class PostgresqlRange < ActiveRecord::Base
-end
-
 class PostgresqlTsvector < ActiveRecord::Base
 end
 
@@ -46,104 +43,6 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     @connection.execute("INSERT INTO postgresql_arrays (id, commission_by_quarter, nicknames) VALUES (1, '{35000,21000,18000,17000}', '{foo,bar,baz}')")
     @first_array = PostgresqlArray.find(1)
 
-    @connection.execute <<_SQL if @connection.supports_ranges?
-    INSERT INTO postgresql_ranges (
-      date_range,
-      num_range,
-      ts_range,
-      tstz_range,
-      int4_range,
-      int8_range
-    ) VALUES (
-      '[''2012-01-02'', ''2012-01-04'']',
-      '[0.1, 0.2]',
-      '[''2010-01-01 14:30'', ''2011-01-01 14:30'']',
-      '[''2010-01-01 14:30:00+05'', ''2011-01-01 14:30:00-03'']',
-      '[1, 10]',
-      '[10, 100]'
-    )
-_SQL
-
-    @connection.execute <<_SQL if @connection.supports_ranges?
-    INSERT INTO postgresql_ranges (
-      date_range,
-      num_range,
-      ts_range,
-      tstz_range,
-      int4_range,
-      int8_range
-    ) VALUES (
-      '(''2012-01-02'', ''2012-01-04'')',
-      '[0.1, 0.2)',
-      '[''2010-01-01 14:30'', ''2011-01-01 14:30'')',
-      '[''2010-01-01 14:30:00+05'', ''2011-01-01 14:30:00-03'')',
-      '(1, 10)',
-      '(10, 100)'
-    )
-_SQL
-
-    @connection.execute <<_SQL if @connection.supports_ranges?
-    INSERT INTO postgresql_ranges (
-      date_range,
-      num_range,
-      ts_range,
-      tstz_range,
-      int4_range,
-      int8_range
-    ) VALUES (
-      '(''2012-01-02'',]',
-      '[0.1,]',
-      '[''2010-01-01 14:30'',]',
-      '[''2010-01-01 14:30:00+05'',]',
-      '(1,]',
-      '(10,]'
-    )
-_SQL
-
-    @connection.execute <<_SQL if @connection.supports_ranges?
-    INSERT INTO postgresql_ranges (
-      date_range,
-      num_range,
-      ts_range,
-      tstz_range,
-      int4_range,
-      int8_range
-    ) VALUES (
-      '[,]',
-      '[,]',
-      '[,]',
-      '[,]',
-      '[,]',
-      '[,]'
-    )
-_SQL
-
-    @connection.execute <<_SQL if @connection.supports_ranges?
-    INSERT INTO postgresql_ranges (
-      date_range,
-      num_range,
-      ts_range,
-      tstz_range,
-      int4_range,
-      int8_range
-    ) VALUES (
-      '(''2012-01-02'', ''2012-01-02'')',
-      '(0.1, 0.1)',
-      '(''2010-01-01 14:30'', ''2010-01-01 14:30'')',
-      '(''2010-01-01 14:30:00+05'', ''2010-01-01 06:30:00-03'')',
-      '(1, 1)',
-      '(10, 10)'
-    )
-_SQL
-
-    if @connection.supports_ranges?
-      @first_range = PostgresqlRange.find(1)
-      @second_range = PostgresqlRange.find(2)
-      @third_range = PostgresqlRange.find(3)
-      @fourth_range = PostgresqlRange.find(4)
-      @empty_range = PostgresqlRange.find(5)
-    end
-
     @connection.execute("INSERT INTO postgresql_tsvectors (id, text_vector) VALUES (1, ' ''text'' ''vector'' ')")
 
     @first_tsvector = PostgresqlTsvector.find(1)
@@ -184,16 +83,6 @@ _SQL
     assert_equal :text, @first_array.column_for_attribute(:nicknames).type
   end
 
-  def test_data_type_of_range_types
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    assert_equal :daterange, @first_range.column_for_attribute(:date_range).type
-    assert_equal :numrange, @first_range.column_for_attribute(:num_range).type
-    assert_equal :tsrange, @first_range.column_for_attribute(:ts_range).type
-    assert_equal :tstzrange, @first_range.column_for_attribute(:tstz_range).type
-    assert_equal :int4range, @first_range.column_for_attribute(:int4_range).type
-    assert_equal :int8range, @first_range.column_for_attribute(:int8_range).type
-  end
-
   def test_data_type_of_tsvector_types
     assert_equal :tsvector, @first_tsvector.column_for_attribute(:text_vector).type
   end
@@ -240,208 +129,28 @@ _SQL
     assert_equal "'text' 'vector'", @first_tsvector.text_vector
   end
 
-  def test_int4range_values
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    assert_equal 1...11, @first_range.int4_range
-    assert_equal 2...10, @second_range.int4_range
-    assert_equal 2...Float::INFINITY, @third_range.int4_range
-    assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.int4_range)
-    assert_equal nil, @empty_range.int4_range
-  end
-
-  def test_int8range_values
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    assert_equal 10...101, @first_range.int8_range
-    assert_equal 11...100, @second_range.int8_range
-    assert_equal 11...Float::INFINITY, @third_range.int8_range
-    assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.int8_range)
-    assert_equal nil, @empty_range.int8_range
-  end
-
-  def test_daterange_values
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    assert_equal Date.new(2012, 1, 2)...Date.new(2012, 1, 5), @first_range.date_range
-    assert_equal Date.new(2012, 1, 3)...Date.new(2012, 1, 4), @second_range.date_range
-    assert_equal Date.new(2012, 1, 3)...Float::INFINITY, @third_range.date_range
-    assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.date_range)
-    assert_equal nil, @empty_range.date_range
-  end
-
-  def test_numrange_values
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    assert_equal BigDecimal.new('0.1')..BigDecimal.new('0.2'), @first_range.num_range
-    assert_equal BigDecimal.new('0.1')...BigDecimal.new('0.2'), @second_range.num_range
-    assert_equal BigDecimal.new('0.1')...BigDecimal.new('Infinity'), @third_range.num_range
-    assert_equal BigDecimal.new('-Infinity')...BigDecimal.new('Infinity'), @fourth_range.num_range
-    assert_equal nil, @empty_range.num_range
-  end
-
-  def test_tsrange_values
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    tz = ::ActiveRecord::Base.default_timezone
-    assert_equal Time.send(tz, 2010, 1, 1, 14, 30, 0)..Time.send(tz, 2011, 1, 1, 14, 30, 0), @first_range.ts_range
-    assert_equal Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2011, 1, 1, 14, 30, 0), @second_range.ts_range
-    assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.ts_range)
-    assert_equal nil, @empty_range.ts_range
-  end
-
-  def test_tstzrange_values
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    assert_equal Time.parse('2010-01-01 09:30:00 UTC')..Time.parse('2011-01-01 17:30:00 UTC'), @first_range.tstz_range
-    assert_equal Time.parse('2010-01-01 09:30:00 UTC')...Time.parse('2011-01-01 17:30:00 UTC'), @second_range.tstz_range
-    assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.tstz_range)
-    assert_equal nil, @empty_range.tstz_range
-  end
-
   def test_money_values
     assert_equal 567.89, @first_money.wealth
     assert_equal(-567.89, @second_money.wealth)
   end
 
-  def test_create_tstzrange
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    tstzrange = Time.parse('2010-01-01 14:30:00 +0100')...Time.parse('2011-02-02 14:30:00 CDT')
-    range = PostgresqlRange.new(:tstz_range => tstzrange)
-    assert range.save
-    assert range.reload
-    assert_equal range.tstz_range, tstzrange
-    assert_equal range.tstz_range, Time.parse('2010-01-01 13:30:00 UTC')...Time.parse('2011-02-02 19:30:00 UTC')
-  end
-
-  def test_update_tstzrange
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    new_tstzrange = Time.parse('2010-01-01 14:30:00 CDT')...Time.parse('2011-02-02 14:30:00 CET')
-    assert @first_range.tstz_range = new_tstzrange
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.tstz_range, new_tstzrange
-    assert @first_range.tstz_range = Time.parse('2010-01-01 14:30:00 +0100')...Time.parse('2010-01-01 13:30:00 +0000')
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.tstz_range, nil
-  end
-
-  def test_create_tsrange
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    tz = ::ActiveRecord::Base.default_timezone
-    tsrange = Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2011, 2, 2, 14, 30, 0)
-    range = PostgresqlRange.new(:ts_range => tsrange)
-    assert range.save
-    assert range.reload
-    assert_equal range.ts_range, tsrange
-  end
-
-  def test_update_tsrange
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    tz = ::ActiveRecord::Base.default_timezone
-    new_tsrange = Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2011, 2, 2, 14, 30, 0)
-    assert @first_range.ts_range = new_tsrange
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.ts_range, new_tsrange
-    assert @first_range.ts_range = Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2010, 1, 1, 14, 30, 0)
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.ts_range, nil
-  end
-
-  def test_create_numrange
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    numrange = BigDecimal.new('0.5')...BigDecimal.new('1')
-    range = PostgresqlRange.new(:num_range => numrange)
-    assert range.save
-    assert range.reload
-    assert_equal range.num_range, numrange
-  end
-
-  def test_update_numrange
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    new_numrange = BigDecimal.new('0.5')...BigDecimal.new('1')
-    assert @first_range.num_range = new_numrange
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.num_range, new_numrange
-    assert @first_range.num_range = BigDecimal.new('0.5')...BigDecimal.new('0.5')
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.num_range, nil
-  end
-
-  def test_create_daterange
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    daterange = Range.new(Date.new(2012, 1, 1), Date.new(2013, 1, 1), true)
-    range = PostgresqlRange.new(:date_range => daterange)
-    assert range.save
-    assert range.reload
-    assert_equal range.date_range, daterange
-  end
-
-  def test_update_daterange
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    new_daterange = Date.new(2012, 2, 3)...Date.new(2012, 2, 10)
-    assert @first_range.date_range = new_daterange
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.date_range, new_daterange
-    assert @first_range.date_range = Date.new(2012, 2, 3)...Date.new(2012, 2, 3)
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.date_range, nil
-  end
-
-  def test_create_int4range
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    int4range = Range.new(3, 50, true)
-    range = PostgresqlRange.new(:int4_range => int4range)
-    assert range.save
-    assert range.reload
-    assert_equal range.int4_range, int4range
-  end
-
-  def test_update_int4range
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    new_int4range = 6...10
-    assert @first_range.int4_range = new_int4range
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.int4_range, new_int4range
-    assert @first_range.int4_range = 3...3
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.int4_range, nil
-  end
-
-  def test_create_int8range
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    int8range = Range.new(30, 50, true)
-    range = PostgresqlRange.new(:int8_range => int8range)
-    assert range.save
-    assert range.reload
-    assert_equal range.int8_range, int8range
-  end
-
-  def test_update_int8range
-    skip "PostgreSQL 9.2 required for range datatypes" unless @connection.supports_ranges?
-    new_int8range = 60000...10000000
-    assert @first_range.int8_range = new_int8range
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.int8_range, new_int8range
-    assert @first_range.int8_range = 39999...39999
-    assert @first_range.save
-    assert @first_range.reload
-    assert_equal @first_range.int8_range, nil
+  def test_money_type_cast
+    column = PostgresqlMoney.columns.find { |c| c.name == 'wealth' }
+    assert_equal(12345678.12, column.type_cast("$12,345,678.12"))
+    assert_equal(12345678.12, column.type_cast("$12.345.678,12"))
+    assert_equal(-1.15, column.type_cast("-$1.15"))
+    assert_equal(-2.25, column.type_cast("($2.25)"))
   end
 
   def test_update_tsvector
     new_text_vector = "'new' 'text' 'vector'"
-    assert @first_tsvector.text_vector = new_text_vector
+    @first_tsvector.text_vector = new_text_vector
     assert @first_tsvector.save
     assert @first_tsvector.reload
-    assert @first_tsvector.text_vector = new_text_vector
+    @first_tsvector.text_vector = new_text_vector
     assert @first_tsvector.save
     assert @first_tsvector.reload
-    assert_equal @first_tsvector.text_vector, new_text_vector
+    assert_equal new_text_vector, @first_tsvector.text_vector
   end
 
   def test_number_values
@@ -479,31 +188,31 @@ _SQL
 
   def test_update_integer_array
     new_value = [32800,95000,29350,17000]
-    assert @first_array.commission_by_quarter = new_value
+    @first_array.commission_by_quarter = new_value
     assert @first_array.save
     assert @first_array.reload
-    assert_equal @first_array.commission_by_quarter, new_value
-    assert @first_array.commission_by_quarter = new_value
+    assert_equal new_value, @first_array.commission_by_quarter
+    @first_array.commission_by_quarter = new_value
     assert @first_array.save
     assert @first_array.reload
-    assert_equal @first_array.commission_by_quarter, new_value
+    assert_equal new_value, @first_array.commission_by_quarter
   end
 
   def test_update_text_array
     new_value = ['robby','robert','rob','robbie']
-    assert @first_array.nicknames = new_value
+    @first_array.nicknames = new_value
     assert @first_array.save
     assert @first_array.reload
-    assert_equal @first_array.nicknames, new_value
-    assert @first_array.nicknames = new_value
+    assert_equal new_value, @first_array.nicknames
+    @first_array.nicknames = new_value
     assert @first_array.save
     assert @first_array.reload
-    assert_equal @first_array.nicknames, new_value
+    assert_equal new_value, @first_array.nicknames
   end
 
   def test_update_money
     new_value = BigDecimal.new('123.45')
-    assert @first_money.wealth = new_value
+    @first_money.wealth = new_value
     assert @first_money.save
     assert @first_money.reload
     assert_equal new_value, @first_money.wealth
@@ -512,28 +221,28 @@ _SQL
   def test_update_number
     new_single = 789.012
     new_double = 789012.345
-    assert @first_number.single = new_single
-    assert @first_number.double = new_double
+    @first_number.single = new_single
+    @first_number.double = new_double
     assert @first_number.save
     assert @first_number.reload
-    assert_equal @first_number.single, new_single
-    assert_equal @first_number.double, new_double
+    assert_equal new_single, @first_number.single
+    assert_equal new_double, @first_number.double
   end
 
   def test_update_time
-    assert @first_time.time_interval = '2 years 3 minutes'
+    @first_time.time_interval = '2 years 3 minutes'
     assert @first_time.save
     assert @first_time.reload
-    assert_equal @first_time.time_interval, '2 years 00:03:00'
+    assert_equal '2 years 00:03:00', @first_time.time_interval
   end
 
   def test_update_network_address
     new_inet_address = '10.1.2.3/32'
     new_cidr_address = '10.0.0.0/8'
     new_mac_address = 'bc:de:f0:12:34:56'
-    assert @first_network_address.cidr_address = new_cidr_address
-    assert @first_network_address.inet_address = new_inet_address
-    assert @first_network_address.mac_address = new_mac_address
+    @first_network_address.cidr_address = new_cidr_address
+    @first_network_address.inet_address = new_inet_address
+    @first_network_address.mac_address = new_mac_address
     assert @first_network_address.save
     assert @first_network_address.reload
     assert_equal @first_network_address.cidr_address, new_cidr_address
@@ -544,61 +253,65 @@ _SQL
   def test_update_bit_string
     new_bit_string = '11111111'
     new_bit_string_varying = '0xFF'
-    assert @first_bit_string.bit_string = new_bit_string
-    assert @first_bit_string.bit_string_varying = new_bit_string_varying
+    @first_bit_string.bit_string = new_bit_string
+    @first_bit_string.bit_string_varying = new_bit_string_varying
     assert @first_bit_string.save
     assert @first_bit_string.reload
-    assert_equal @first_bit_string.bit_string, new_bit_string
+    assert_equal new_bit_string, @first_bit_string.bit_string
     assert_equal @first_bit_string.bit_string, @first_bit_string.bit_string_varying
   end
-	
+
   def test_invalid_hex_string
     new_bit_string = 'FF'
     @first_bit_string.bit_string = new_bit_string
     assert_raise(ActiveRecord::StatementInvalid) { assert @first_bit_string.save }
   end
 
+  def test_invalid_network_address
+    @first_network_address.cidr_address = 'invalid addr'
+    assert_nil @first_network_address.cidr_address
+    assert_equal 'invalid addr', @first_network_address.cidr_address_before_type_cast
+    assert @first_network_address.save
+
+    @first_network_address.reload
+
+    @first_network_address.inet_address = 'invalid addr'
+    assert_nil @first_network_address.inet_address
+    assert_equal 'invalid addr', @first_network_address.inet_address_before_type_cast
+    assert @first_network_address.save
+  end
+
   def test_update_oid
     new_value = 567890
-    assert @first_oid.obj_id = new_value
+    @first_oid.obj_id = new_value
     assert @first_oid.save
     assert @first_oid.reload
-    assert_equal @first_oid.obj_id, new_value
+    assert_equal new_value, @first_oid.obj_id
   end
 
   def test_timestamp_with_zone_values_with_rails_time_zone_support
-    old_tz         = ActiveRecord::Base.time_zone_aware_attributes
-    old_default_tz = ActiveRecord::Base.default_timezone
-
-    ActiveRecord::Base.time_zone_aware_attributes = true
-    ActiveRecord::Base.default_timezone = :utc
+    with_timezone_config default: :utc, aware_attributes: true do
+      @connection.reconnect!
 
-    @connection.reconnect!
-
-    @first_timestamp_with_zone = PostgresqlTimestampWithZone.find(1)
-    assert_equal Time.utc(2010,1,1, 11,0,0), @first_timestamp_with_zone.time
-    assert_instance_of Time, @first_timestamp_with_zone.time
+      @first_timestamp_with_zone = PostgresqlTimestampWithZone.find(1)
+      assert_equal Time.utc(2010,1,1, 11,0,0), @first_timestamp_with_zone.time
+      assert_instance_of Time, @first_timestamp_with_zone.time
+    end
   ensure
-    ActiveRecord::Base.default_timezone = old_default_tz
-    ActiveRecord::Base.time_zone_aware_attributes = old_tz
     @connection.reconnect!
   end
 
   def test_timestamp_with_zone_values_without_rails_time_zone_support
-    old_tz         = ActiveRecord::Base.time_zone_aware_attributes
-    old_default_tz = ActiveRecord::Base.default_timezone
-
-    ActiveRecord::Base.time_zone_aware_attributes = false
-    ActiveRecord::Base.default_timezone = :local
-
-    @connection.reconnect!
-
-    @first_timestamp_with_zone = PostgresqlTimestampWithZone.find(1)
-    assert_equal Time.utc(2010,1,1, 11,0,0), @first_timestamp_with_zone.time
-    assert_instance_of Time, @first_timestamp_with_zone.time
+    with_timezone_config default: :local, aware_attributes: false do
+      @connection.reconnect!
+      # make sure to use a non-UTC time zone
+      @connection.execute("SET time zone 'America/Jamaica'", 'SCHEMA')
+
+      @first_timestamp_with_zone = PostgresqlTimestampWithZone.find(1)
+      assert_equal Time.utc(2010,1,1, 11,0,0), @first_timestamp_with_zone.time
+      assert_instance_of Time, @first_timestamp_with_zone.time
+    end
   ensure
-    ActiveRecord::Base.default_timezone = old_default_tz
-    ActiveRecord::Base.time_zone_aware_attributes = old_tz
     @connection.reconnect!
   end
 end