Merge branch 'identity_map' of https://github.com/jasoncodes/rails into jasoncodes-identity_map

* 'identity_map' of https://github.com/jasoncodes/rails:
  Bypass IdentityMap in PostgreSQL geometric tests.

activerecord/test/cases/base_test.rb

@@ -895,7 +895,7 @@ def test_geometric_content
       assert g.save
 
       # Reload and check that we have all the geometric attributes.
-      h = Geometric.find(g.id)
+      h = ActiveRecord::IdentityMap.without { Geometric.find(g.id) }
 
       assert_equal '(5,6.1)', h.a_point
       assert_equal '[(2,3),(5.5,7)]', h.a_line_segment
@@ -923,7 +923,7 @@ def test_geometric_content
       assert g.save
 
       # Reload and check that we have all the geometric attributes.
-      h = Geometric.find(g.id)
+      h = ActiveRecord::IdentityMap.without { Geometric.find(g.id) }
 
       assert_equal '(5,6.1)', h.a_point
       assert_equal '[(2,3),(5.5,7)]', h.a_line_segment