diff --git a/lib/pg_search/configuration/column.rb b/lib/pg_search/configuration/column.rb
index ae0313bf..6de06581 100644
--- a/lib/pg_search/configuration/column.rb
+++ b/lib/pg_search/configuration/column.rb
@@ -9,18 +9,20 @@ class Column
def initialize(column_name, weight, model)
@name = column_name.to_s
- @column_name = column_name.to_s
+ @column_name = column_name
@weight = weight
@model = model
@connection = model.connection
end
def full_name
+ return @column_name if @column_name.is_a?(Arel::Nodes::SqlLiteral)
+
"#{table_name}.#{column_name}"
end
def to_sql
- "coalesce(#{expression}::text, '')"
+ "coalesce((#{expression})::text, '')"
end
private
@@ -30,7 +32,7 @@ def table_name
end
def column_name
- @connection.quote_column_name(@column_name)
+ @connection.quote_column_name(@name)
end
def expression
diff --git a/spec/lib/pg_search/configuration/column_spec.rb b/spec/lib/pg_search/configuration/column_spec.rb
index 50f56b1e..9e933713 100644
--- a/spec/lib/pg_search/configuration/column_spec.rb
+++ b/spec/lib/pg_search/configuration/column_spec.rb
@@ -7,6 +7,7 @@
with_model :Model do
table do |t|
t.string :name
+ t.json :object
end
end
@@ -14,18 +15,29 @@
column = described_class.new("name", nil, Model)
expect(column.full_name).to eq(%(#{Model.quoted_table_name}."name"))
end
+
+ it "returns nested json attributes" do
+ column = described_class.new(Arel.sql("object->>'name'"), nil, Model)
+ expect(column.full_name).to eq(%(object->>'name'))
+ end
end
describe "#to_sql" do
with_model :Model do
table do |t|
t.string :name
+ t.json :object
end
end
it "returns an expression that casts the column to text and coalesces it with an empty string" do
column = described_class.new("name", nil, Model)
- expect(column.to_sql).to eq(%{coalesce(#{Model.quoted_table_name}."name"::text, '')})
+ expect(column.to_sql).to eq(%{coalesce((#{Model.quoted_table_name}."name")::text, '')})
+ end
+
+ it "returns an expression that casts the nested json attribute to text and coalesces it with an empty string" do
+ column = described_class.new(Arel.sql("object->>'name'"), nil, Model)
+ expect(column.to_sql).to eq(%{coalesce((object->>'name')::text, '')})
end
end
end
diff --git a/spec/lib/pg_search/features/dmetaphone_spec.rb b/spec/lib/pg_search/features/dmetaphone_spec.rb
index 995f76b4..8327619d 100644
--- a/spec/lib/pg_search/features/dmetaphone_spec.rb
+++ b/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
@@ -48,7 +48,7 @@
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((#{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') || ' ''')))}
)
end
end
diff --git a/spec/lib/pg_search/features/trigram_spec.rb b/spec/lib/pg_search/features/trigram_spec.rb
index 94a5c95a..5686043a 100644
--- a/spec/lib/pg_search/features/trigram_spec.rb
+++ b/spec/lib/pg_search/features/trigram_spec.rb
@@ -20,9 +20,9 @@
let(:coalesced_columns) do
<<~SQL.squish
- coalesce(#{Model.quoted_table_name}."name"::text, '')
+ coalesce((#{Model.quoted_table_name}."name")::text, '')
|| ' '
- || coalesce(#{Model.quoted_table_name}."content"::text, '')
+ || coalesce((#{Model.quoted_table_name}."content")::text, '')
SQL
end
@@ -88,7 +88,7 @@
let(:options) { {only: :name} }
it "only searches against the select column" do
- coalesced_column = "coalesce(#{Model.quoted_table_name}.\"name\"::text, '')"
+ coalesced_column = "coalesce((#{Model.quoted_table_name}.\"name\")::text, '')"
expect(feature.conditions.to_sql).to eq("('#{query}' % (#{coalesced_column}))")
end
end
diff --git a/spec/lib/pg_search/features/tsearch_spec.rb b/spec/lib/pg_search/features/tsearch_spec.rb
index c51a55f1..de639d1d 100644
--- a/spec/lib/pg_search/features/tsearch_spec.rb
+++ b/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
@@ -67,7 +67,7 @@
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((#{Model.quoted_table_name}."name")::text, '')) || to_tsvector('simple', coalesce((#{Model.quoted_table_name}."content")::text, ''))) @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
)
end
@@ -84,7 +84,7 @@
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((#{Model.quoted_table_name}."name")::text, '')) || to_tsvector('simple', coalesce((#{Model.quoted_table_name}."content")::text, ''))) @@ (to_tsquery('simple', '!' || ''' ' || 'query' || ' ''')))}
)
end
end
@@ -102,7 +102,7 @@
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((#{Model.quoted_table_name}."name")::text, '')) || to_tsvector('simple', coalesce((#{Model.quoted_table_name}."content")::text, ''))) @@ (to_tsquery('simple', ''' ' || '!query' || ' ''')))}
)
end
end
@@ -164,7 +164,7 @@
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((#{Model.quoted_table_name}.\"name\")::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), ''))"
)
end
@@ -189,7 +189,7 @@
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 = "", StopSel = ""'))}
+ expected_sql = %{(ts_headline('spanish', (coalesce((#{Model.quoted_table_name}."name")::text, '') || ' ' || coalesce((#{Model.quoted_table_name}."content")::text, '')), (to_tsquery('spanish', ''' ' || 'query' || ' ''')), 'StartSel = "", StopSel = ""'))}
expect(feature.highlight.to_sql).to eq(expected_sql)
end
@@ -221,7 +221,7 @@
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 = "", StopSel = "", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "…", HighlightAll = TRUE'))}
+ expected_sql = %{(ts_headline('simple', (coalesce((#{Model.quoted_table_name}."name")::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "", StopSel = "", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "…", HighlightAll = TRUE'))}
expect(feature.highlight.to_sql).to eq(expected_sql)
end
@@ -252,7 +252,7 @@
feature = described_class.new(query, options, columns, Model, normalizer)
highlight_sql = ActiveSupport::Deprecation.silence { feature.highlight.to_sql }
- expected_sql = %{(ts_headline('simple', (coalesce(#{Model.quoted_table_name}."name"::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "", StopSel = "", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "…", HighlightAll = FALSE'))}
+ expected_sql = %{(ts_headline('simple', (coalesce((#{Model.quoted_table_name}."name")::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "", StopSel = "", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "…", HighlightAll = FALSE'))}
expect(highlight_sql).to eq(expected_sql)
end