From 564d70a26e69a19889069a73c1c12e97ecd810ed Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Thu, 8 May 2014 17:38:53 -0400
Subject: [PATCH] Revert "Merge pull request #637 from
jzelenkov/fix-postgres-oid"
This reverts commit 1098046ffd428911f58d18670660485eb78cdebe, reversing
changes made to 8c06687495f0e8490feb4eb12bad6188c0cdd345.
---
lib/geocoder/stores/active_record.rb | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
index 07f29c6f..38d0abc0 100644
--- a/lib/geocoder/stores/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -196,19 +196,11 @@ module Geocoder::Store
end
if distance
clause += ", " unless clause.empty?
- if using_postgresql?
- clause += "'#{distance}'::character(255) AS #{distance_column}"
- else
- clause += "#{distance} AS #{distance_column}"
- end
+ clause += "#{distance} AS #{distance_column}"
end
if bearing
clause += ", " unless clause.empty?
- if using_postgresql?
- clause += "'#{bearing}'::character(255) AS #{bearing_column}"
- else
- clause += "#{bearing} AS #{bearing_column}"
- end
+ clause += "#{bearing} AS #{bearing_column}"
end
clause
end
@@ -230,10 +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