Using PostgreSQL's array_agg function if it exists (v8.4 or newer).

steveklabnik · Sep 2, 2011 · 14cee4c · 14cee4c
1 parent 780fb80
commit 14cee4c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/HISTORY b/HISTORY
@@ -1,4 +1,5 @@
 Edge:
+* Use PostgreSQL's array_agg function if it exists, instead of array_accum (PG v8.4 or newer).
 * Shuffle multiple Sphinx addresses by default, but allow that to be turned off (Ngan Pham).
 * Fix string attributes when using Sphinx 2.0.1 and bin_path.
 

diff --git a/lib/thinking_sphinx/adapters/postgresql_adapter.rb b/lib/thinking_sphinx/adapters/postgresql_adapter.rb
@@ -20,7 +20,11 @@ def concatenate(clause, separator = ' ')
     end
 
     def group_concatenate(clause, separator = ' ')
-      "array_to_string(array_accum(COALESCE(#{clause}, '0')), '#{separator}')"
+      if connection.raw_connection.server_version >= 80400
+        "array_to_string(array_agg(COALESCE(#{clause}, '0')), '#{separator}')"
+      else
+        "array_to_string(array_accum(COALESCE(#{clause}, '0')), '#{separator}')"
+      end
     end
 
     def cast_to_string(clause)
@@ -105,7 +109,11 @@ def execute_command(command, output_error = false)
     end
 
     def create_array_accum_function
-      if connection.raw_connection.respond_to?(:server_version) && connection.raw_connection.server_version > 80200
+      if connection.raw_connection.respond_to?(:server_version) &&
+        connection.raw_connection.server_version >= 80400
+        return
+      elsif connection.raw_connection.respond_to?(:server_version) &&
+        connection.raw_connection.server_version > 80200
         execute <<-SQL
           CREATE AGGREGATE array_accum (anyelement)
           (