From b2ae9f1d26093492217d61775a1171073f4f89fc Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Sat, 29 Sep 2012 14:27:03 -0400
Subject: [PATCH] Allow setting :order => nil to omit ORDER clause.
---
lib/geocoder/stores/active_record.rb | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
index 5002a9f0..84498be1 100644
--- a/lib/geocoder/stores/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -111,10 +111,11 @@ module Geocoder::Store
else
conditions = ["#{distance} <= ?", radius]
end
- default_near_scope_options(latitude, longitude, radius, options).merge(
+ {
:select => select_clause(options[:select], distance, bearing),
- :conditions => add_exclude_condition(conditions, options[:exclude])
- )
+ :conditions => add_exclude_condition(conditions, options[:exclude]),
+ :order => options.include?(:order) ? options[:order] : "distance ASC"
+ }
end
def distance_from_sql_options(latitude, longitude, options = {})
@@ -157,17 +158,6 @@ module Geocoder::Store
(bearing ? ", #{bearing} AS bearing" : "")
end
- ##
- # Options used for any near-like scope.
- #
- def default_near_scope_options(latitude, longitude, radius, options)
- {
- :order => options[:order] || "distance",
- :limit => options[:limit],
- :offset => options[:offset]
- }
- end
-
##
# Adds a condition to exclude a given object by ID.
# Expects conditions as an array or string. Returns array.
--
GitLab