From 3d7c5e4f2cc826de32b84a84e9d2b4152036efd6 Mon Sep 17 00:00:00 2001 From: milaaraujo Date: Sat, 11 Aug 2018 15:52:07 -0700 Subject: [PATCH] Version that works on Travis --- app/services/srch_scope.rb | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/app/services/srch_scope.rb b/app/services/srch_scope.rb index 9f2e62520a..95ba3eeb6b 100644 --- a/app/services/srch_scope.rb +++ b/app/services/srch_scope.rb @@ -66,23 +66,12 @@ def self.find_questions(input, limit, order) end def self.find_locations(limit, user_tag = nil) - user_locations = - if ActiveRecord::Base.connection.adapter_name == 'Mysql2' - User.select('rusers.*,node_revisions.timestamp') - .where('rusers.status <> 0')\ - .joins(:user_tags)\ - .where('value LIKE "lat:%"')\ - .joins(:revisions)\ - .order("node_revisions.timestamp DESC")\ - .distinct - else - User.where('rusers.status <> 0')\ - .joins(:user_tags)\ - .where('value LIKE "lat:%"')\ - .joins(:revisions)\ - .order("node_revisions.timestamp DESC")\ - .distinct - end + user_locations = User.where('rusers.status <> 0')\ + .joins(:user_tags)\ + .where('value LIKE "lat:%"')\ + .joins(:revisions)\ + .order("node_revisions.timestamp DESC")\ + .distinct if user_tag.present? user_locations = User.joins(:user_tags)\ .where('user_tags.value LIKE ?', user_tag)\