ActiveRecord::Base.connection.adapter_name == 'Mysql2'

publiclab · Aug 11, 2018 · e4a72e5 · e4a72e5
1 parent 9aa3ef5
commit e4a72e5
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/app/services/srch_scope.rb b/app/services/srch_scope.rb
@@ -66,12 +66,23 @@ def self.find_questions(input, limit, order)
   end
 
   def self.find_locations(limit, user_tag = nil)
-    user_locations = User.where('rusers.status <> 0')\
-                         .joins(:user_tags)\
-                         .where('value LIKE "lat:%"')\
-                         .joins(:revisions)\
-                         .order("node_revisions.timestamp DESC")\
-                         .distinct
+    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
     if user_tag.present?
       user_locations = User.joins(:user_tags)\
                        .where('user_tags.value LIKE ?', user_tag)\