From 3044ffeb350ffab5a8b701956958592adc1699eb Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Wed, 16 Apr 2014 14:35:29 -0400
Subject: [PATCH] Revert "Merge pull request #628 from
jzelenkov/fix-postresql-oid"
This reverts commit 2a29613acda2468e23056921cc257252d2128ea8, reversing
changes made to c5c459409db3163cd2d4670506c3c7575ae9af22.
---
lib/geocoder/stores/active_record.rb | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
index 9587d840..38d0abc0 100644
--- a/lib/geocoder/stores/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -194,16 +194,13 @@ module Geocoder::Store
else
clause = (columns || full_column_name("*"))
end
-
- identifierType = using_postgresql? ? "::character(255)" : ""
-
if distance
clause += ", " unless clause.empty?
- clause += "'#{distance}'#{identifierType} AS #{distance_column}"
+ clause += "#{distance} AS #{distance_column}"
end
if bearing
clause += ", " unless clause.empty?
- clause += "'#{bearing}'#{identifierType} AS #{bearing_column}"
+ clause += "#{bearing} AS #{bearing_column}"
end
clause
end
@@ -225,11 +222,6 @@ module Geocoder::Store
connection.adapter_name.match(/sqlite/i)
end
- def using_postgresql?
- connection.adapter_name.match(/postgres/i)
- end
-
-
##
# Value which can be passed to where() to produce no results.
#
--
GitLab