pg_search 2.3.8 → 2.4.0

data/spec/lib/pg_search/configuration/foreign_column_spec.rb

@@ -3,37 +3,69 @@
 require "spec_helper"
 
 describe PgSearch::Configuration::ForeignColumn do
-  describe "#alias" do
-    with_model :AssociatedModel do
-      table do |t|
-        t.string "title"
-      end
+  with_model :AssociatedModel do
+    table do |t|
+      t.string :title
     end
+  end
 
-    with_model :Model do
-      table do |t|
-        t.string "title"
-        t.belongs_to :another_model, index: false
-      end
+  with_model :Model do
+    table do |t|
+      t.string :name
+      t.belongs_to :associated_model, index: false, null: true
+    end
 
-      model do
-        include PgSearch::Model
+    model do
+      include PgSearch::Model
 
-        belongs_to :another_model, class_name: "AssociatedModel"
+      belongs_to :associated_model, class_name: "AssociatedModel", optional: true
 
-        pg_search_scope :with_another, associated_against: {another_model: :title}
-      end
+      pg_search_scope :with_title, associated_against: {associated_model: :title}
     end
+  end
 
-    it "returns a consistent string" do
-      association = PgSearch::Configuration::Association.new(Model,
-        :another_model,
-        :title)
-      foreign_column = described_class.new("title", nil, Model, association)
+  let(:association) do
+    PgSearch::Configuration::Association.new(Model, :associated_model, :title)
+  end
+  let(:foreign_column) { described_class.new("title", nil, Model, association) }
 
+  describe "#alias" do
+    it "returns a consistent string" do
       column_alias = foreign_column.alias
       expect(column_alias).to be_a String
       expect(foreign_column.alias).to eq column_alias
     end
   end
+
+  describe "#to_arel" do
+    def selected_value(model)
+      relation = Model
+        .joins(association.to_arel(Model.arel_table[:id]))
+        .where(Model.arel_table[:id].eq(model.id))
+        .select(foreign_column.to_arel.as("value"))
+      sql = Model.connection.visitor.compile(relation.arel.ast)
+
+      Model.connection.select_value(sql)
+    end
+
+    it "evaluates the associated value through the association join alias" do
+      associated = AssociatedModel.create!(title: "hello world")
+      model = Model.create!(name: "example", associated_model: associated)
+
+      expect(selected_value(model)).to eq("hello world")
+    end
+
+    it "coalesces a NULL associated value through the association join alias" do
+      associated = AssociatedModel.create!(title: nil)
+      model = Model.create!(name: "example", associated_model: associated)
+
+      expect(selected_value(model)).to eq("")
+    end
+
+    it "coalesces a missing association through the outer join alias" do
+      model = Model.create!(name: "example", associated_model: nil)
+
+      expect(selected_value(model)).to eq("")
+    end
+  end
 end

data/spec/lib/pg_search/features/dmetaphone_spec.rb

@@ -23,7 +23,7 @@ describe PgSearch::Features::DMetaphone do
 
       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(cast(#{Model.quoted_table_name}."name" AS text), ''))) || to_tsvector('simple', pg_search_dmetaphone(coalesce(cast(#{Model.quoted_table_name}."content" AS text), '')))), (to_tsquery('simple', ''' ' || pg_search_dmetaphone('query') || ' ''')), 0))}
       )
     end
   end
@@ -48,7 +48,7 @@ describe PgSearch::Features::DMetaphone do
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.conditions.to_sql).to eq(
-        %{((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') || ' ''')))}
+        %{((to_tsvector('simple', pg_search_dmetaphone(coalesce(cast(#{Model.quoted_table_name}."name" AS text), ''))) || to_tsvector('simple', pg_search_dmetaphone(coalesce(cast(#{Model.quoted_table_name}."content" AS text), '')))) @@ (to_tsquery('simple', ''' ' || pg_search_dmetaphone('query') || ' ''')))}
       )
     end
   end

data/spec/lib/pg_search/features/trigram_spec.rb

@@ -20,9 +20,9 @@ describe PgSearch::Features::Trigram do
 
   let(:coalesced_columns) do
     <<~SQL.squish
-      coalesce((#{Model.quoted_table_name}."name")::text, '')
+      coalesce(cast(#{Model.quoted_table_name}."name" AS text), '')
         || ' '
-        || coalesce((#{Model.quoted_table_name}."content")::text, '')
+        || coalesce(cast(#{Model.quoted_table_name}."content" AS text), '')
     SQL
   end
 
@@ -87,7 +87,7 @@ describe PgSearch::Features::Trigram do
         let(:options) { {only: :name} }
 
         it "only searches against the select column" do
-          coalesced_column = "coalesce((#{Model.quoted_table_name}.\"name\")::text, '')"
+          coalesced_column = "coalesce(cast(#{Model.quoted_table_name}.\"name\" AS text), '')"
           expect(feature.conditions.to_sql).to eq("('#{query}' % (#{coalesced_column}))")
         end
       end

data/spec/lib/pg_search/features/tsearch_spec.rb

@@ -24,7 +24,7 @@ describe PgSearch::Features::TSearch do
 
       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(cast(#{Model.quoted_table_name}."name" AS text), '')) || to_tsvector('simple', coalesce(cast(#{Model.quoted_table_name}."content" AS text), ''))), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 0))}
       )
     end
 
@@ -67,7 +67,7 @@ describe PgSearch::Features::TSearch do
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.conditions.to_sql).to eq(
-        %{((to_tsvector('simple', coalesce((#{Model.quoted_table_name}."name")::text, '')) || to_tsvector('simple', coalesce((#{Model.quoted_table_name}."content")::text, ''))) @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
+        %{((to_tsvector('simple', coalesce(cast(#{Model.quoted_table_name}."name" AS text), '')) || to_tsvector('simple', coalesce(cast(#{Model.quoted_table_name}."content" AS text), ''))) @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
       )
     end
 
@@ -84,7 +84,7 @@ describe PgSearch::Features::TSearch do
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.conditions.to_sql).to eq(
-          %{((to_tsvector('simple', coalesce((#{Model.quoted_table_name}."name")::text, '')) || to_tsvector('simple', coalesce((#{Model.quoted_table_name}."content")::text, ''))) @@ (to_tsquery('simple', '!' || ''' ' || 'query' || ' ''')))}
+          %{((to_tsvector('simple', coalesce(cast(#{Model.quoted_table_name}."name" AS text), '')) || to_tsvector('simple', coalesce(cast(#{Model.quoted_table_name}."content" AS text), ''))) @@ (to_tsquery('simple', '!' || ''' ' || 'query' || ' ''')))}
         )
       end
     end
@@ -102,7 +102,7 @@ describe PgSearch::Features::TSearch do
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.conditions.to_sql).to eq(
-          %{((to_tsvector('simple', coalesce((#{Model.quoted_table_name}."name")::text, '')) || to_tsvector('simple', coalesce((#{Model.quoted_table_name}."content")::text, ''))) @@ (to_tsquery('simple', ''' ' || '!query' || ' ''')))}
+          %{((to_tsvector('simple', coalesce(cast(#{Model.quoted_table_name}."name" AS text), '')) || to_tsvector('simple', coalesce(cast(#{Model.quoted_table_name}."content" AS text), ''))) @@ (to_tsquery('simple', ''' ' || '!query' || ' ''')))}
         )
       end
     end
@@ -164,7 +164,7 @@ describe PgSearch::Features::TSearch do
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.highlight.to_sql).to eq(
-        "(ts_headline('simple', (coalesce((#{Model.quoted_table_name}.\"name\")::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), ''))"
+        "(ts_headline('simple', (coalesce(cast(#{Model.quoted_table_name}.\"name\" AS text), '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), ''))"
       )
     end
 
@@ -189,7 +189,7 @@ describe PgSearch::Features::TSearch do
 
         feature = described_class.new(query, options, columns, Model, normalizer)
 
-        expected_sql = %{(ts_headline('spanish', (coalesce((#{Model.quoted_table_name}."name")::text, '') || ' ' || coalesce((#{Model.quoted_table_name}."content")::text, '')), (to_tsquery('spanish', ''' ' || 'query' || ' ''')), 'StartSel = "<b>", StopSel = "</b>"'))}
+        expected_sql = %{(ts_headline('spanish', (coalesce(cast(#{Model.quoted_table_name}."name" AS text), '') || ' ' || coalesce(cast(#{Model.quoted_table_name}."content" AS text), '')), (to_tsquery('spanish', ''' ' || 'query' || ' ''')), 'StartSel = "<b>", StopSel = "</b>"'))}
 
         expect(feature.highlight.to_sql).to eq(expected_sql)
       end
@@ -221,7 +221,7 @@ describe PgSearch::Features::TSearch do
 
         feature = described_class.new(query, options, columns, Model, normalizer)
 
-        expected_sql = %{(ts_headline('simple', (coalesce((#{Model.quoted_table_name}."name")::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "<start class=""search"">", StopSel = "<stop>", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "&hellip;", HighlightAll = TRUE'))}
+        expected_sql = %{(ts_headline('simple', (coalesce(cast(#{Model.quoted_table_name}."name" AS text), '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "<start class=""search"">", StopSel = "<stop>", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "&hellip;", HighlightAll = TRUE'))}
 
         expect(feature.highlight.to_sql).to eq(expected_sql)
       end
@@ -252,7 +252,7 @@ describe PgSearch::Features::TSearch do
         feature = described_class.new(query, options, columns, Model, normalizer)
 
         highlight_sql = silence_warnings { feature.highlight.to_sql }
-        expected_sql = %{(ts_headline('simple', (coalesce((#{Model.quoted_table_name}."name")::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "<start class=""search"">", StopSel = "<stop>", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "&hellip;", HighlightAll = FALSE'))}
+        expected_sql = %{(ts_headline('simple', (coalesce(cast(#{Model.quoted_table_name}."name" AS text), '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "<start class=""search"">", StopSel = "<stop>", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "&hellip;", HighlightAll = FALSE'))}
 
         expect(highlight_sql).to eq(expected_sql)
       end