Prefer Arel to string interpolation in tsearch feature

Author: nertzy

lib/pg_search/features/feature.rb

@@ -10,7 +10,7 @@ def self.valid_options
         %i[only sort_only]
       end
 
-      delegate :connection, :quoted_table_name, to: :@model
+      delegate :connection, :arel_table, to: :@model
 
       def initialize(query, options, all_columns, model, normalizer)
         @query = query

lib/pg_search/features/tsearch.rb

@@ -12,12 +12,16 @@ def self.valid_options
 
       def conditions
         Arel::Nodes::Grouping.new(
-          Arel::Nodes::InfixOperation.new("@@", arel_wrap(tsdocument), arel_wrap(tsquery))
+          Arel::Nodes::InfixOperation.new("@@", tsdocument, tsquery)
         )
       end
 
       def rank
-        arel_wrap(tsearch_rank)
+        Arel::Nodes::NamedFunction.new("ts_rank", [
+          tsdocument,
+          tsquery,
+          normalization
+        ])
       end
 
       def highlight
@@ -30,7 +34,7 @@ def ts_headline
         Arel::Nodes::NamedFunction.new("ts_headline", [
           dictionary,
           arel_wrap(document),
-          arel_wrap(tsquery),
+          tsquery,
           Arel::Nodes.build_quoted(ts_headline_options)
         ]).to_sql
       end
@@ -131,29 +135,28 @@ def tsquery_expression(term_sql, negated:, prefix:)
       end
 
       def tsquery
-        return "''" if query.blank?
+        return Arel::Nodes.build_quoted("") if query.blank?
 
         query_terms = query.split.compact
         tsquery_terms = query_terms.map { |term| tsquery_for_term(term) }
-        tsquery_terms.join(options[:any_word] ? " || " : " && ")
+        tsquery_string = tsquery_terms.join(options[:any_word] ? " || " : " && ")
+
+        arel_wrap(tsquery_string)
       end
 
       def tsdocument
-        tsdocument_terms = (columns_to_use || []).map do |search_column|
-          column_to_tsvector(search_column)
-        end
+        tsdocument_terms = [
+          *(columns_to_use || []).map { column_to_tsvector(_1) },
+          *Array.wrap(options[:tsvector_column]).map { arel_table[_1] }
+        ]
 
-        if options[:tsvector_column]
-          tsvector_columns = Array.wrap(options[:tsvector_column])
-
-          tsdocument_terms << tsvector_columns.map do |tsvector_column|
-            column_name = connection.quote_column_name(tsvector_column)
+        return Arel::Nodes.build_quoted(nil) if tsdocument_terms.empty?
 
-            "#{quoted_table_name}.#{column_name}"
+        Arel::Nodes::Grouping.new(
+          tsdocument_terms.reduce do |memo, term|
+            Arel::Nodes::InfixOperation.new("||", memo, term)
           end
-        end
-
-        tsdocument_terms.join(" || ")
+        )
       end
 
       # From http://www.postgresql.org/docs/8.3/static/textsearch-controls.html
@@ -169,14 +172,6 @@ def normalization
         options[:normalization] || 0
       end
 
-      def tsearch_rank
-        Arel::Nodes::NamedFunction.new("ts_rank", [
-          arel_wrap(tsdocument),
-          arel_wrap(tsquery),
-          normalization
-        ]).to_sql
-      end
-
       def dictionary
         Arel::Nodes.build_quoted(options[:dictionary] || :simple)
       end
@@ -197,12 +192,13 @@ def column_to_tsvector(search_column)
         tsvector = Arel::Nodes::NamedFunction.new(
           "to_tsvector",
           [dictionary, Arel.sql(normalize(search_column.to_sql))]
-        ).to_sql
+        )
 
         if search_column.weight.nil?
           tsvector
         else
-          "setweight(#{tsvector}, #{connection.quote(search_column.weight)})"
+          weight = Arel::Nodes.build_quoted(search_column.weight)
+          Arel::Nodes::NamedFunction.new("setweight", [tsvector, weight])
         end
       end
     end

spec/lib/pg_search/features/dmetaphone_spec.rb

@@ -23,7 +23,7 @@
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.rank.to_sql).to eq(
-        %{(ts_rank((to_tsvector('simple', pg_search_dmetaphone(coalesce((#{Model.quoted_table_name}."name")::text, ''))) || to_tsvector('simple', pg_search_dmetaphone(coalesce((#{Model.quoted_table_name}."content")::text, '')))), (to_tsquery('simple', ''' ' || pg_search_dmetaphone('query') || ' ''')), 0))}
+        %{ts_rank((to_tsvector('simple', pg_search_dmetaphone(coalesce((#{Model.quoted_table_name}."name")::text, ''))) || to_tsvector('simple', pg_search_dmetaphone(coalesce((#{Model.quoted_table_name}."content")::text, '')))), (to_tsquery('simple', ''' ' || pg_search_dmetaphone('query') || ' ''')), 0)}
       )
     end
   end

spec/lib/pg_search/features/tsearch_spec.rb

@@ -24,7 +24,7 @@
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.rank.to_sql).to eq(
-        %{(ts_rank((to_tsvector('simple', coalesce((#{Model.quoted_table_name}."name")::text, '')) || to_tsvector('simple', coalesce((#{Model.quoted_table_name}."content")::text, ''))), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 0))}
+        %{ts_rank((to_tsvector('simple', coalesce((#{Model.quoted_table_name}."name")::text, '')) || to_tsvector('simple', coalesce((#{Model.quoted_table_name}."content")::text, ''))), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 0)}
       )
     end
 
@@ -41,7 +41,7 @@
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.rank.to_sql).to eq(
-          %{(ts_rank((#{Model.quoted_table_name}."my_tsvector"), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 2))}
+          %{ts_rank((#{Model.quoted_table_name}."my_tsvector"), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 2)}
         )
       end
     end