Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'identity_map' of https://github.com/jasoncodes/rails in…

…to jasoncodes-identity_map

* 'identity_map' of https://github.com/jasoncodes/rails:
  Bypass IdentityMap in PostgreSQL geometric tests.
  • Loading branch information...
commit da80d87f4dbe56f23cac4f265f5c7de878272516 2 parents 3dc4d54 + 0fd0d68
@tenderlove tenderlove authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 activerecord/test/cases/base_test.rb
View
4 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
Please sign in to comment.
Something went wrong with that request. Please try again.