lib/pg_search/features/tsearch.rb in pg_search-0.1.1 vs lib/pg_search/features/tsearch.rb in pg_search-0.2

@@ -22,43 +22,47 @@
       end
 
       private
 
       def interpolations
-        {:query => @query.to_s, :dictionary => @options[:dictionary].to_s}
+        {:query => @query.to_s, :dictionary => dictionary.to_s}
       end
 
       def document
         @columns.map { |column| column.to_sql }.join(" || ' ' || ")
       end
 
       def tsquery
         return "''" if @query.blank?
 
         @query.split(" ").compact.map do |term|
-          sanitized_term = term.gsub(/['?\-\\]/, " ")
+          sanitized_term = term.gsub(/['?\-\\:]/, " ")
 
           term_sql = @normalizer.add_normalization(connection.quote(sanitized_term))
 
           # After this, the SQL expression evaluates to a string containing the term surrounded by single-quotes.
           tsquery_sql = "#{connection.quote("' ")} || #{term_sql} || #{connection.quote(" '")}"
 
           # Add tsearch prefix operator if we're using a prefix search.
           tsquery_sql = "#{tsquery_sql} || #{connection.quote(':*')}" if @options[:prefix]
 
-          "to_tsquery(#{":dictionary," if @options[:dictionary]} #{tsquery_sql})"
+          "to_tsquery(:dictionary, #{tsquery_sql})"
         end.join(" && ")
       end
 
       def tsdocument
         @columns.map do |search_column|
-          tsvector = "to_tsvector(#{":dictionary," if @options[:dictionary]} #{@normalizer.add_normalization(search_column.to_sql)})"
+          tsvector = "to_tsvector(:dictionary, #{@normalizer.add_normalization(search_column.to_sql)})"
           search_column.weight.nil? ? tsvector : "setweight(#{tsvector}, #{connection.quote(search_column.weight)})"
         end.join(" || ")
       end
 
       def tsearch_rank
         ["ts_rank((#{tsdocument}), (#{tsquery}))", interpolations]
+      end
+
+      def dictionary
+        @options[:dictionary] || :simple
       end
     end
   end
 end