diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-17 11:49:52 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-17 11:49:52 -0700 |
| commit | da80d87f4dbe56f23cac4f265f5c7de878272516 (patch) | |
| tree | 7f7dffc7ad50ba2035c1b8d775d1fc905e0186af | |
| parent | 3dc4d543f177e57cb08ac8fd16a5fff6f635822f (diff) | |
| parent | 0fd0d68962bfde407b6a35116efe277293e43962 (diff) | |
| download | rails-da80d87f4dbe56f23cac4f265f5c7de878272516.tar.gz rails-da80d87f4dbe56f23cac4f265f5c7de878272516.tar.bz2 rails-da80d87f4dbe56f23cac4f265f5c7de878272516.zip | |
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.
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index e57c5b3b87..815ff7b825 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -895,7 +895,7 @@ class BasicsTest < ActiveRecord::TestCase 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 @@ class BasicsTest < ActiveRecord::TestCase 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 |