Merge branch 'master' into adequaterecord

* master: (108 commits)
  make tests pass on Ruby 2.2
  Use Sqlite3 adapter in examples
  use the body proxy to freeze headers
  just ask the response for the commit status, we do not need to ask the jar
  only write the jar if the response isn't committed
  Fix a grammatical error in the i18n guide [ci skip]
  use method_defined? to check whether or not a method is defined
  Enhance docs for update_attribute [ci-skip]
  Change usec to 0 on tests that compare seconds
  Unit test for mysql quote time usec
  Changelog entry for mysql56 microseconds
  Test microsecond on mysql 5.6
  MySQL 5.6 and later supports microsecond precision in datetime.
  [ci skip] Add documentation for original_fullpath.
  Remove mocking on save, when not necessary
  comment why we are modifying global state. [ci skip]
  `change_table` supports `citext`. Follow up to #12523.
  Removed unnecessary command "application"
  register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]
  Fixes STI when 2+ levels deep.
  ...

3 files changed, 104 insertions, 1 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/citext_test.rb b/activerecord/test/cases/adapters/postgresql/citext_test.rb
new file mode 100644
index 0000000000..ebb9ff98b1
--- /dev/null
+++ b/activerecord/test/cases/adapters/postgresql/citext_test.rb
@@ -0,0 +1,77 @@
+# encoding: utf-8
+
+require 'cases/helper'
+require 'active_record/base'
+require 'active_record/connection_adapters/postgresql_adapter'
+
+class PostgresqlCitextTest < ActiveRecord::TestCase
+  class Citext < ActiveRecord::Base
+    self.table_name = 'citexts'
+  end
+
+  def setup
+    @connection = ActiveRecord::Base.connection
+
+    unless @connection.extension_enabled?('citext')
+      @connection.enable_extension 'citext'
+      @connection.commit_db_transaction
+    end
+
+    @connection.reconnect!
+
+    @connection.create_table('citexts') do |t|
+      t.citext 'cival'
+    end
+    @column = Citext.columns_hash['cival']
+  end
+
+  def teardown
+    @connection.execute 'DROP TABLE IF EXISTS citexts;'
+    @connection.execute 'DROP EXTENSION IF EXISTS citext CASCADE;'
+  end
+
+  def test_citext_enabled
+    assert @connection.extension_enabled?('citext')
+  end
+
+  def test_column_type
+    assert_equal :citext, @column.type
+  end
+
+  def test_column_sql_type
+    assert_equal 'citext', @column.sql_type
+  end
+
+  def test_change_table_supports_json
+    @connection.transaction do
+      @connection.change_table('citexts') do |t|
+        t.citext 'username'
+      end
+      Citext.reset_column_information
+      column = Citext.columns.find { |c| c.name == 'username' }
+      assert_equal :citext, column.type
+
+      raise ActiveRecord::Rollback # reset the schema change
+    end
+  ensure
+    Citext.reset_column_information
+  end
+
+  def test_write
+    x = Citext.new(cival: 'Some CI Text')
+    x.save!
+    citext = Citext.first
+    assert_equal "Some CI Text", citext.cival
+
+    citext.cival = "Some NEW CI Text"
+    citext.save!
+
+    assert_equal "Some NEW CI Text", citext.reload.cival
+  end
+
+  def test_select_case_insensitive
+    @connection.execute "insert into citexts (cival) values('Cased Text')"
+    x = Citext.where(cival: 'cased text').first
+    assert_equal 'Cased Text', x.cival
+  end
+end
diff --git a/activerecord/test/cases/adapters/postgresql/enum_test.rb b/activerecord/test/cases/adapters/postgresql/enum_test.rb
index bf8dbd6c3f..62f84caf91 100644
--- a/activerecord/test/cases/adapters/postgresql/enum_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/enum_test.rb
@@ -23,6 +23,8 @@ class PostgresqlEnumTest < ActiveRecord::TestCase
         t.column :current_mood, :mood
       end
     end
+    # reload type map after creating the enum type
+    @connection.send(:reload_type_map)
   end
 
   def test_enum_mapping
@@ -35,4 +37,28 @@ class PostgresqlEnumTest < ActiveRecord::TestCase
 
     assert_equal "happy", enum.reload.current_mood
   end
+
+  def test_invalid_enum_update
+    @connection.execute "INSERT INTO postgresql_enums VALUES (1, 'sad');"
+    enum = PostgresqlEnum.first
+    enum.current_mood = "angry"
+
+    assert_raise ActiveRecord::StatementInvalid do
+      enum.save
+    end
+  end
+
+  def test_no_oid_warning
+    @connection.execute "INSERT INTO postgresql_enums VALUES (1, 'sad');"
+    stderr_output = capture(:stderr) { PostgresqlEnum.first }
+
+    assert stderr_output.blank?
+  end
+
+  def test_enum_type_cast
+    enum = PostgresqlEnum.new
+    enum.current_mood = :happy
+
+    assert_equal "happy", enum.current_mood
+  end
 end
diff --git a/activerecord/test/cases/adapters/postgresql/range_test.rb b/activerecord/test/cases/adapters/postgresql/range_test.rb
index 306bb09a0d..4e84335e9b 100644
--- a/activerecord/test/cases/adapters/postgresql/range_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/range_test.rb
@@ -156,7 +156,7 @@ _SQL
       assert_equal 0.5..0.7, @first_range.float_range
       assert_equal 0.5...0.7, @second_range.float_range
       assert_equal 0.5...Float::INFINITY, @third_range.float_range
-      assert_equal -Float::INFINITY...Float::INFINITY, @fourth_range.float_range
+      assert_equal (-Float::INFINITY...Float::INFINITY), @fourth_range.float_range
       assert_nil @empty_range.float_range
     end