From d1ecc2e16fba9da87aa8dbdeab6e2dee7ec2a591 Mon Sep 17 00:00:00 2001
From: David Gil <dgilperez@gmail.com>
Date: Thu, 16 Oct 2014 23:58:04 +0200
Subject: [PATCH] add table_name to AR geocoded and not_geocoded scopes to
prevent ambiguous clauses
---
lib/geocoder/stores/active_record.rb | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
index c1f4ae85..91fabe05 100644
--- a/lib/geocoder/stores/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -18,14 +18,14 @@ module Geocoder::Store
# scope: geocoded objects
scope :geocoded, lambda {
- where("#{geocoder_options[:latitude]} IS NOT NULL " +
- "AND #{geocoder_options[:longitude]} IS NOT NULL")
+ where("#{table_name}.#{geocoder_options[:latitude]} IS NOT NULL " +
+ "AND #{table_name}.#{geocoder_options[:longitude]} IS NOT NULL")
}
# scope: not-geocoded objects
scope :not_geocoded, lambda {
- where("#{geocoder_options[:latitude]} IS NULL " +
- "OR #{geocoder_options[:longitude]} IS NULL")
+ where("#{table_name}.#{geocoder_options[:latitude]} IS NULL " +
+ "OR #{table_name}.#{geocoder_options[:longitude]} IS NULL")
}
##
@@ -107,7 +107,7 @@ module Geocoder::Store
# * +:exclude+ - an object to exclude (used by the +nearbys+ method)
# * +:distance_column+ - used to set the column name of the calculated distance.
# * +:bearing_column+ - used to set the column name of the calculated bearing.
- # * +:min_radius+ - the value to use as the minimum radius.
+ # * +:min_radius+ - the value to use as the minimum radius.
# ignored if database is sqlite.
# default is 0.0
#
--
GitLab