Merge branch 'master' into instance_reader

* master:
  Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
  make Range#overlaps? accept Range of Time
  improved test case for partial indices
  Made schema dumper recognize partial indices' where statements
  Added where option to add_index to support postgresql partial indices

1 files changed, 9 insertions, 0 deletions

diff --git a/activerecord/test/cases/migration/index_test.rb b/activerecord/test/cases/migration/index_test.rb
index 89cf0f5e93..dd9492924c 100644
--- a/activerecord/test/cases/migration/index_test.rb
+++ b/activerecord/test/cases/migration/index_test.rb
@@ -171,6 +171,15 @@ module ActiveRecord
         end
       end
 
+      def test_add_partial_index
+        skip 'only on pg' unless current_adapter?(:PostgreSQLAdapter)
+
+        connection.add_index("testings", "last_name", :where => "first_name = 'john doe'")
+        assert connection.index_exists?("testings", "last_name")
+
+        connection.remove_index("testings", "last_name")
+        assert !connection.index_exists?("testings", "last_name")
+      end
     end
   end
 end