Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix conenction check in product scopes for full text search extensions (#12788)

Damian Legawieccba431a953e2
diff --git a/core/app/models/concerns/spree/product_scopes.rb b/core/app/models/concerns/spree/product_scopes.rb
index c42c3dd79e..6a48962154 100644
--- a/core/app/models/concerns/spree/product_scopes.rb
+++ b/core/app/models/concerns/spree/product_scopes.rb
@@ -306,14 +306,9 @@ module Spree
if defined?(PgSearch)
include PgSearch::Model
- begin
- if ActiveRecord::Base.connection.extension_enabled?('pg_trgm')
- pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { trigram: { threshold: 0.3, word_similarity: true } }
- else
- pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { tsearch: { any_word: true, prefix: true } }
- end
- rescue ActiveRecord::ConnectionNotEstablished, PG::Error => e
- Rails.logger.warn("Could not check pg_trgm extension, falling back to tsearch for product search: #{e.message}")
+ if connected? && connection.extension_enabled?('pg_trgm')
+ pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { trigram: { threshold: 0.3, word_similarity: true } }
+ else
pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { tsearch: { any_word: true, prefix: true } }
end
else
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index 6de47253ad..40383961f6 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -50,14 +50,9 @@ module Spree
if defined?(PgSearch)
include PgSearch::Model
- begin
- if ActiveRecord::Base.connection.extension_enabled?('pg_trgm')
- pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { trigram: { threshold: 0.3, word_similarity: true } }
- else
- pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { tsearch: { any_word: true, prefix: true } }
- end
- rescue ActiveRecord::ConnectionNotEstablished, PG::Error => e
- Rails.logger.warn("Could not check pg_trgm extension, falling back to tsearch for product search: #{e.message}")
+ if connected? && connection.extension_enabled?('pg_trgm')
+ pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { trigram: { threshold: 0.3, word_similarity: true } }
+ else
pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' }, using: { tsearch: { any_word: true, prefix: true } }
end
end