activerecord-spatial 0.0.1 → 0.1.0

data/test/spatial_scopes_geographies_tests.rb

@@ -8,7 +8,7 @@ class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
   end
 
   def ids_tester(method, args, ids = [], options = {})
-    geoms = FooGeography.send(method, *Array.wrap(args)).all(options)
+    geoms = FooGeography.send(method, *Array.wrap(args)).where(options[:conditions]).to_a
     assert_equal(ids.sort, geoms.collect(&:id).sort)
   end
 
@@ -42,39 +42,39 @@ class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
   end
 
   def test_with_column
-    assert_equal([3], FooGeography.st_covers('POINT(7 7)', :column => :the_other_geom).all.collect(&:id).sort)
+    assert_equal([3], FooGeography.st_covers('POINT(7 7)', :column => :the_other_geom).to_a.collect(&:id).sort)
   end
 
   def test_with_srid_switching
-    assert_equal([3], FooGeography.st_covers('SRID=4326; POINT(3 3)').all.collect(&:id).sort)
+    assert_equal([3], FooGeography.st_covers('SRID=4326; POINT(3 3)').to_a.collect(&:id).sort)
   end
 
   def test_with_srid_default
-    assert_equal([3], FooGeography.st_covers('SRID=default; POINT(3 3)').all.collect(&:id).sort)
+    assert_equal([3], FooGeography.st_covers('SRID=default; POINT(3 3)').to_a.collect(&:id).sort)
   end
 
   def test_with_srid_transform
-    assert_equal([3], FooGeography.st_covers('SRID=4269; POINT(7 7)', :column => :the_other_geom).all.collect(&:id).sort)
+    assert_equal([3], FooGeography.st_covers('SRID=4269; POINT(7 7)', :column => :the_other_geom).to_a.collect(&:id).sort)
   end
 
   def test_order_by_st_distance
-    assert_equal([3, 1, 2], FooGeography.order_by_st_distance('POINT(1 1)').all.collect(&:id))
+    assert_equal([3, 1, 2], FooGeography.order_by_st_distance('POINT(1 1)').to_a.collect(&:id))
   end
 
   def test_order_by_st_distance_desc
-    assert_equal([2, 1, 3], FooGeography.order_by_st_distance('POINT(1 1)', :desc => true).all.collect(&:id))
+    assert_equal([2, 1, 3], FooGeography.order_by_st_distance('POINT(1 1)', :desc => true).to_a.collect(&:id))
   end
 
   def test_order_by_st_area
-    assert_equal([1, 2, 3], FooGeography.order_by_st_area.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(FooGeography.order_by_st_area).to_a.collect(&:id))
   end
 
   def test_order_by_st_area_desc
-    assert_equal([3, 1, 2], FooGeography.order_by_st_area(:desc => true).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(FooGeography.order_by_st_area(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_length
-    assert_equal([1, 2, 3], FooGeography.order_by_st_length.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(FooGeography.order_by_st_length).to_a.collect(&:id))
   end
 
   def test_order_by_st_length_desc
@@ -84,23 +84,23 @@ class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
       [3, 1, 2]
     end
 
-    assert_equal(expected, FooGeography.order_by_st_length(:desc => true).order('id').where('true = true').all.collect(&:id))
+    assert_equal(expected, apply_id_order_scope(FooGeography.order_by_st_length(:desc => true)).where('true = true').to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter
     skip('requires PostGIS 2+') unless FooGeography.respond_to?(:order_by_st_perimeter)
 
-    assert_equal([1, 2, 3], FooGeography.order_by_st_perimeter.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(FooGeography.order_by_st_perimeter).to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter_desc
     skip('requires PostGIS 2+') unless FooGeography.respond_to?(:order_by_st_perimeter)
 
-    assert_equal([3, 1, 2], FooGeography.order_by_st_perimeter(:desc => true).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(FooGeography.order_by_st_perimeter(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_area_with_desc_symbol
-    assert_equal([3, 1, 2], FooGeography.order_by_st_area(:desc).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(FooGeography.order_by_st_area(:desc)).to_a.collect(&:id))
   end
 end
 

data/test/spatial_scopes_tests.rb

@@ -8,7 +8,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def ids_tester(method, args, ids = [], klass = Foo)
-    geoms = klass.send(method, *Array.wrap(args)).all
+    geoms = klass.send(method, *Array.wrap(args))
     assert_equal(ids.sort, geoms.collect(&:id).sort)
   end
 
@@ -84,141 +84,141 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_nil_relationship
-    assert_equal([ 1, 2, 3 ], Foo.st_within(nil).all.collect(&:id).sort)
+    assert_equal([ 1, 2, 3 ], Foo.st_within(nil).to_a.collect(&:id).sort)
   end
 
   def test_with_column
-    assert_equal([1, 2, 3], Foo.st_disjoint('POINT(100 100)', :column => :the_other_geom).all.collect(&:id).sort)
+    assert_equal([1, 2, 3], Foo.st_disjoint('POINT(100 100)', :column => :the_other_geom).to_a.collect(&:id).sort)
   end
 
   def test_with_srid_switching
-    assert_equal([1, 2, 3], Foo.st_disjoint('SRID=4326; POINT(100 100)').all.collect(&:id).sort)
+    assert_equal([1, 2, 3], Foo.st_disjoint('SRID=4326; POINT(100 100)').to_a.collect(&:id).sort)
   end
 
   def test_with_srid_default
-    assert_equal([1, 2, 3], Foo.st_disjoint('SRID=default; POINT(100 100)').all.collect(&:id).sort)
-    assert_equal([3], Foo.st_contains('SRID=default; POINT(-3 -3)').all.collect(&:id).sort)
+    assert_equal([1, 2, 3], Foo.st_disjoint('SRID=default; POINT(100 100)').to_a.collect(&:id).sort)
+    assert_equal([3], Foo.st_contains('SRID=default; POINT(-3 -3)').to_a.collect(&:id).sort)
   end
 
   def test_with_srid_transform
-    assert_equal([1, 2, 3], Foo.st_disjoint('SRID=4269; POINT(100 100)', :column => :the_other_geom).all.collect(&:id).sort)
-    assert_equal([3], Foo.st_contains('SRID=4269; POINT(7 7)', :column => :the_other_geom).all.collect(&:id).sort)
+    assert_equal([1, 2, 3], Foo.st_disjoint('SRID=4269; POINT(100 100)', :column => :the_other_geom).to_a.collect(&:id).sort)
+    assert_equal([3], Foo.st_contains('SRID=4269; POINT(7 7)', :column => :the_other_geom).to_a.collect(&:id).sort)
   end
 
   def test_order_by_st_distance
-    assert_equal([3, 1, 2], Foo.order_by_st_distance('POINT(1 1)').all.collect(&:id))
+    assert_equal([3, 1, 2], Foo.order_by_st_distance('POINT(1 1)').to_a.collect(&:id))
   end
 
   def test_order_by_st_distance_desc
-    assert_equal([2, 1, 3], Foo.order_by_st_distance('POINT(1 1)', :desc => true).all.collect(&:id))
+    assert_equal([2, 1, 3], Foo.order_by_st_distance('POINT(1 1)', :desc => true).to_a.collect(&:id))
   end
 
   def test_order_by_st_distance_sphere
-    assert_equal([3, 1, 2], Foo.order_by_st_distance_sphere('POINT(1 1)').all.collect(&:id))
+    assert_equal([3, 1, 2], Foo.order_by_st_distance_sphere('POINT(1 1)').to_a.collect(&:id))
   end
 
   def test_order_by_st_distance_sphere_desc
-    assert_equal([2, 1, 3], Foo.order_by_st_distance_sphere('POINT(1 1)', :desc => true).all.collect(&:id))
+    assert_equal([2, 1, 3], Foo.order_by_st_distance_sphere('POINT(1 1)', :desc => true).to_a.collect(&:id))
   end
 
   def test_order_by_st_max_distance
-    assert_equal([1, 3, 2], Foo.order_by_st_maxdistance('POINT(1 1)').all.collect(&:id))
+    assert_equal([1, 3, 2], Foo.order_by_st_maxdistance('POINT(1 1)').to_a.collect(&:id))
   end
 
   def test_order_by_st_max_distance_desc
-    assert_equal([2, 3, 1], Foo.order_by_st_maxdistance('POINT(1 1)', :desc => true).all.collect(&:id))
+    assert_equal([2, 3, 1], Foo.order_by_st_maxdistance('POINT(1 1)', :desc => true).to_a.collect(&:id))
   end
 
   def test_order_by_st_area
-    assert_equal([1, 2, 3], Foo.order_by_st_area.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_area).to_a.collect(&:id))
   end
 
   def test_order_by_st_area_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_area(:desc => true).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(Foo.order_by_st_area(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_ndims
-    assert_equal([1, 2, 3], Foo.order_by_st_ndims.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_ndims).to_a.collect(&:id))
   end
 
   def test_order_by_st_ndims_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_ndims(:desc => true).order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_ndims(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_npoints
-    assert_equal([1, 2, 3], Foo.order_by_st_npoints.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_npoints).to_a.collect(&:id))
   end
 
   def test_order_by_st_npoints_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_npoints(:desc => true).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(Foo.order_by_st_npoints(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_nrings
-    assert_equal([1, 2, 3], Foo.order_by_st_nrings.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_nrings).to_a.collect(&:id))
   end
 
   def test_order_by_st_nrings_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_nrings(:desc => true).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(Foo.order_by_st_nrings(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_numgeometries
-    assert_equal([1, 2, 3], Foo.order_by_st_numgeometries.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_numgeometries).to_a.collect(&:id))
   end
 
   def test_order_by_st_numgeometries_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_numgeometries(:desc => true).order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_numgeometries(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_numinteriorring
-    assert_equal([3, 1, 2], Foo.order_by_st_numinteriorring.order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(Foo.order_by_st_numinteriorring).to_a.collect(&:id))
   end
 
   def test_order_by_st_numinteriorring_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_numinteriorring(:desc => true).order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_numinteriorring(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_numinteriorrings
-    assert_equal([3, 1, 2], Foo.order_by_st_numinteriorrings.order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(Foo.order_by_st_numinteriorrings).to_a.collect(&:id))
   end
 
   def test_order_by_st_numinteriorrings_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_numinteriorrings(:desc => true).order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_numinteriorrings(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_numpoints
-    assert_equal([1, 2, 3], Foo.order_by_st_numpoints.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_numpoints.order('id').to_a.collect(&:id))
   end
 
   def test_order_by_st_numpoints_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_numpoints(:desc => true).order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_numpoints(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_length3d
-    assert_equal([1, 2, 3], Foo.order_by_st_length3d.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_length3d.order('id').to_a.collect(&:id))
   end
 
   def test_order_by_st_length3d_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_length3d(:desc => true).order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_length3d(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_length
-    assert_equal([1, 2, 3], Foo.order_by_st_length.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_length).to_a.collect(&:id))
   end
 
   def test_order_by_st_length_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_length(:desc => true).order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_length(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_length2d
-    assert_equal([1, 2, 3], Foo.order_by_st_length2d.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_length2d.order('id').to_a.collect(&:id))
   end
 
   def test_order_by_st_length2d_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_length2d(:desc => true).order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_length2d(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_length3d_spheroid
-    assert_equal([1, 2, 3], Foo.order_by_st_length3d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]').order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_length3d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]')).to_a.collect(&:id))
   end
 
   def test_order_by_st_length3d_spheroid_desc
@@ -228,19 +228,19 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
       [1, 2, 3]
     end
 
-    assert_equal(expected, Foo.order_by_st_length3d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true).order('id').all.collect(&:id))
+    assert_equal(expected, apply_id_order_scope(Foo.order_by_st_length3d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_length2d_spheroid
-    assert_equal([1, 2, 3], Foo.order_by_st_length2d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]').order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_length2d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]')).to_a.collect(&:id))
   end
 
   def test_order_by_st_length2d_spheroid_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_length2d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(Foo.order_by_st_length2d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_length_spheroid
-    assert_equal([1, 2, 3], Foo.order_by_st_length_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]').order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_length_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]')).to_a.collect(&:id))
   end
 
   def test_order_by_st_length_spheroid_desc
@@ -250,55 +250,55 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
       [1, 2, 3]
     end
 
-    assert_equal(expected, Foo.order_by_st_length_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true).order('id').all.collect(&:id))
+    assert_equal(expected, apply_id_order_scope(Foo.order_by_st_length_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter
-    assert_equal([1, 2, 3], Foo.order_by_st_perimeter.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_perimeter).to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_perimeter(:desc => true).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(Foo.order_by_st_perimeter(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter2d
-    assert_equal([1, 2, 3], Foo.order_by_st_perimeter2d.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], apply_id_order_scope(Foo.order_by_st_perimeter2d).to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter2d_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_perimeter2d(:desc => true).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(Foo.order_by_st_perimeter2d(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter3d
-    assert_equal([1, 2, 3], Foo.order_by_st_perimeter3d.order('id').all.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_perimeter3d.order('id').to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter3d_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_perimeter3d(:desc => true).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(Foo.order_by_st_perimeter3d(:desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_hausdorffdistance
-    assert_equal([1, 3, 2], Foo.order_by_st_hausdorffdistance('POINT(1 1)').all.collect(&:id))
+    assert_equal([1, 3, 2], Foo.order_by_st_hausdorffdistance('POINT(1 1)').to_a.collect(&:id))
   end
 
   def test_order_by_st_hausdorffdistance_desc
-    assert_equal([2, 3, 1], Foo.order_by_st_hausdorffdistance('POINT(1 1)', :desc => true).all.collect(&:id))
+    assert_equal([2, 3, 1], Foo.order_by_st_hausdorffdistance('POINT(1 1)', :desc => true).to_a.collect(&:id))
   end
 
   def test_order_by_st_hausdorffdistance_with_densify_frac
-    assert_equal([1, 3, 2], Foo.order_by_st_hausdorffdistance('POINT(1 1)', 0.314).all.collect(&:id))
+    assert_equal([1, 3, 2], Foo.order_by_st_hausdorffdistance('POINT(1 1)', 0.314).to_a.collect(&:id))
   end
 
   def test_order_by_st_distance_spheroid
-    assert_equal([2, 3, 1], Foo.order_by_st_distance_spheroid('POINT(10 10)', 'SPHEROID["WGS 84", 6378137, 298.257223563]').order('id').all.collect(&:id))
+    assert_equal([2, 3, 1], apply_id_order_scope(Foo.order_by_st_distance_spheroid('POINT(10 10)', 'SPHEROID["WGS 84", 6378137, 298.257223563]')).to_a.collect(&:id))
   end
 
   def test_order_by_st_distance_spheroid_desc
-    assert_equal([1, 3, 2], Foo.order_by_st_distance_spheroid('POINT(10 10)', 'SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true).order('id').all.collect(&:id))
+    assert_equal([1, 3, 2], apply_id_order_scope(Foo.order_by_st_distance_spheroid('POINT(10 10)', 'SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true)).to_a.collect(&:id))
   end
 
   def test_order_by_st_area_with_desc_symbol
-    assert_equal([3, 1, 2], Foo.order_by_st_area(:desc).order('id').all.collect(&:id))
+    assert_equal([3, 1, 2], apply_id_order_scope(Foo.order_by_st_area(:desc)).to_a.collect(&:id))
   end
 
   def test_3dintersects
@@ -310,13 +310,13 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   def test_3ddistance
     skip('ST_3ddistance is unavailable') unless Foo3d.respond_to?(:order_by_st_3ddistance)
 
-    assert_equal([3, 2, 1], Foo3d.order_by_st_3ddistance('POINT(10 10)').order('id').all.collect(&:id))
+    assert_equal([3, 2, 1], apply_id_order_scope(Foo3d.order_by_st_3ddistance('POINT(10 10)')).to_a.collect(&:id))
   end
 
   def test_3dmaxdistance
     skip('ST_3dmaxdistance is unavailable') unless Foo3d.respond_to?(:order_by_st_3dmaxdistance)
 
-    assert_equal([2, 1, 3], Foo3d.order_by_st_3dmaxdistance('POINT(10 10)').order('id').all.collect(&:id))
+    assert_equal([2, 1, 3], apply_id_order_scope(Foo3d.order_by_st_3dmaxdistance('POINT(10 10)')).to_a.collect(&:id))
   end
 
   def test_3ddwithin
@@ -335,13 +335,13 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     values = nil
 
     assert_sql(/ST_envelope\("foos"."the_geom"\)/) do
-      values = Foo.
+      values = apply_id_order_scope(Foo.
         order_by_st_perimeter(
           :desc => true,
           :column => {
             :wrapper => :envelope
           }
-        ).order('id').all.collect(&:id)
+        )).to_a.collect(&:id)
     end
 
     assert_equal([3, 1, 2], values)
@@ -351,7 +351,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     values = nil
 
     assert_sql(/ST_geometryn\("foos"."the_geom", 1\)/) do
-      values = Foo.
+      values = apply_id_order_scope(Foo.
         order_by_st_perimeter(
           :desc => true,
           :column => {
@@ -359,7 +359,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
               :geometryn => 1
             }
           }
-        ).order('id').all.collect(&:id)
+        )).to_a.collect(&:id)
     end
 
     assert_equal([3, 1, 2], values)
@@ -369,7 +369,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     values = nil
 
     assert_sql(/ST_snap\("foos"."the_geom", 'POINT \(0 0\)', 1.0\)/) do
-      values = Foo.
+      values = apply_id_order_scope(Foo.
         order_by_st_perimeter(
           :desc => true,
           :column => {
@@ -380,7 +380,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
               ]
             }
           }
-        ).order('id').all.collect(&:id)
+        )).to_a.collect(&:id)
     end
 
     assert_equal([3, 1, 2], values)
@@ -390,13 +390,13 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     values = nil
 
     assert_sql(/ST_centroid\("foos"."the_geom"\)/) do
-      values = Foo.
+      values = apply_id_order_scope(Foo.
         st_within(
           'POLYGON((-5 -5, 5 10, 20 20, 10 5, -5 -5))',
           :column => {
             :wrapper => :centroid
           }
-        ).order('id').all.collect(&:id)
+        )).to_a.collect(&:id)
     end
 
     assert_equal([1, 2, 3], values)
@@ -406,7 +406,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     values = nil
 
     assert_sql(/ST_geometryn\("foos"."the_geom", 1\)/) do
-      values = Foo.
+      values = apply_id_order_scope(Foo.
         st_within(
           'POLYGON((-5 -5, 5 10, 20 20, 10 5, -5 -5))',
           :column => {
@@ -414,7 +414,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
               :geometryn => 1
             }
           }
-        ).order('id').all.collect(&:id)
+        )).to_a.collect(&:id)
     end
 
     assert_equal([1, 2], values)
@@ -424,7 +424,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     values = nil
 
     assert_sql(/ST_snap\("foos"."the_geom", 'POINT \(0 0\)', 1.0\)/) do
-      values = Foo.
+      values = apply_id_order_scope(Foo.
         st_within(
           'POLYGON((-5 -5, 5 10, 20 20, 10 5, -5 -5))',
           :column => {
@@ -435,7 +435,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
               ]
             }
           }
-        ).order('id').all.collect(&:id)
+        )).to_a.collect(&:id)
     end
 
     assert_equal([1, 2], values)