pg_search 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c1314fe8a375215c28cab705710050ceffcef3
-  data.tar.gz: 4055f33418dfca0cbb94259b0a3fb0befc53342c
+  metadata.gz: f0dac0584f13909a05901de21df0de7ccee6312b
+  data.tar.gz: 5eafba8855a040b9bfea3ea7df2a6e9fadb7bb02
 SHA512:
-  metadata.gz: 7ce28204b8e03ecaf75d5d65d810f84d20a4104fd82a9eafed9e4abcc25849466861b86075fab54212c6974228f1a8b873ac2aa805e74d46c0f15d25d9040588
-  data.tar.gz: de01412dbad07868ed1f71ad29bb992fcfa7b085e2cf9301e5c47c2afacbf16de7c6f602692c60e474a77bc15dd26b4405c9a2f59773262f75141cc749b338f0
+  metadata.gz: 4ff3d3978df858242d44590e1dfde3107c943e4496ce251b2d71663beb800b922a742d5c2dea65f017946630d34b63eef2c29b206514ce2debfabdb2a969d922
+  data.tar.gz: ebaea869e71b1c2239aaa8cb1d613623e6a41ce14628fc5afa96f210a0ee52dca39151ae0b156aca9fc6fe81cfc5dd9b75de561bd8d675bdbce01bae8463c8eb

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # pg_search changelog
 
+## 1.0.1
+
+*   Call `.unscoped` on relation used to build subquery, to eliminate unnecessary JOINs. (Markus Doits)  
+
 ## 1.0.0
 
 *   Support more `ActiveRecord::Relation` methods, such as `#pluck` and `#select` by moving search-related operations to subquery.

data/lib/pg_search/scope_options.rb

@@ -41,7 +41,7 @@ module PgSearch
 
     def subquery
       model
-        .except(:select)
+        .unscoped
         .select("#{primary_key} AS pg_search_id")
         .select("#{rank} AS rank")
         .joins(subquery_join)

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

data/spec/integration/pg_search_spec.rb

@@ -186,6 +186,68 @@ describe "an Active Record model which includes PgSearch" do
         end
       end
 
+      context "chained to a cross-table scope" do
+        with_model :House do
+          table do |t|
+            t.references :person
+            t.string :city
+          end
+
+          model do
+            belongs_to :person
+          end
+        end
+
+        with_model :Person do
+          table do |t|
+            t.string :name
+          end
+
+          model do
+            include PgSearch
+            has_many :houses
+            pg_search_scope :named, against: [:name]
+            scope :with_house_in_city, ->(city) {
+              joins(:houses).where(House.table_name.to_sym => {city: city})
+            }
+          end
+        end
+
+        it "works when the other scope is last" do
+          house_in_duluth = House.create!(city: "Duluth")
+          second_house_in_duluth = House.create!(city: "Duluth")
+          house_in_sheboygan = House.create!(city: "Sheboygan")
+
+          bob_in_duluth =
+            Person.create!(name: "Bob", houses: [house_in_duluth])
+          bob_in_sheboygan =
+            Person.create!(name: "Bob", houses: [house_in_sheboygan])
+          sally_in_duluth =
+            Person.create!(name: "Sally", houses: [second_house_in_duluth])
+
+          results = Person.named("bob").with_house_in_city("Duluth")
+          expect(results).to include bob_in_duluth
+          expect(results).not_to include [bob_in_sheboygan, sally_in_duluth]
+        end
+
+        it "works when the other scope is first" do
+          house_in_duluth = House.create!(city: "Duluth")
+          second_house_in_duluth = House.create!(city: "Duluth")
+          house_in_sheboygan = House.create!(city: "Sheboygan")
+
+          bob_in_duluth =
+            Person.create!(name: "Bob", houses: [house_in_duluth])
+          bob_in_sheboygan =
+            Person.create!(name: "Bob", houses: [house_in_sheboygan])
+          sally_in_duluth =
+            Person.create!(name: "Sally", houses: [second_house_in_duluth])
+
+          results = Person.with_house_in_city("Duluth").named("Bob")
+          expect(results).to include bob_in_duluth
+          expect(results).not_to include [bob_in_sheboygan, sally_in_duluth]
+        end
+      end
+
       it "returns an empty array when a blank query is passed in" do
         ModelWithPgSearch.create!(:content => 'foo')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord