pg_search 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0dac0584f13909a05901de21df0de7ccee6312b
-  data.tar.gz: 5eafba8855a040b9bfea3ea7df2a6e9fadb7bb02
+  metadata.gz: cfa2efbbbc811da8b5c62690f0084c9ddd60615d
+  data.tar.gz: 90e7078224516ca17fdc503b418f309fd72560ae
 SHA512:
-  metadata.gz: 4ff3d3978df858242d44590e1dfde3107c943e4496ce251b2d71663beb800b922a742d5c2dea65f017946630d34b63eef2c29b206514ce2debfabdb2a969d922
-  data.tar.gz: ebaea869e71b1c2239aaa8cb1d613623e6a41ce14628fc5afa96f210a0ee52dca39151ae0b156aca9fc6fe81cfc5dd9b75de561bd8d675bdbce01bae8463c8eb
+  metadata.gz: 9c177eb231f004b44affdd5006ab5de2d75b13b4b4da0fbc0c4cb85b9d4394a1d96e26a27f28d23c4200638fc523e1dda1f414067a350c417f160ab0d2a96a2c
+  data.tar.gz: 7e98e612c9d089f5bab6c19365485c6190ad0b6338f662bfeb8864516592618f7883508c019bb031c7472ff3b5793b51f35ec27aaafcee748b9b85a5006fffe0

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # pg_search changelog
 
+## 1.0.2
+
+*   Don’t use SQL to rebuild search documents when models are multisearchable against dynamic methods and not just columns. Iterate over each record with `find_each` instead.
+
 ## 1.0.1
 
-*   Call `.unscoped` on relation used to build subquery, to eliminate unnecessary JOINs. (Markus Doits)  
+*   Call `.unscoped` on relation used to build subquery, to eliminate unnecessary JOINs. (Markus Doits)
 
 ## 1.0.0
 

data/lib/pg_search/multisearch/rebuilder.rb

@@ -13,7 +13,7 @@ module PgSearch
       def rebuild
         if model.respond_to?(:rebuild_pg_search_documents)
           model.rebuild_pg_search_documents
-        elsif model.pg_search_multisearchable_options.key?(:if) || model.pg_search_multisearchable_options.key?(:unless)
+        elsif conditional? || dynamic?
           model.find_each { |record| record.update_pg_search_document }
         else
           model.connection.execute(rebuild_sql)
@@ -24,6 +24,15 @@ module PgSearch
 
       attr_reader :model
 
+      def conditional?
+        model.pg_search_multisearchable_options.key?(:if) || model.pg_search_multisearchable_options.key?(:unless)
+      end
+
+      def dynamic?
+        column_names = model.columns.map(&:name)
+        columns.any? { |column| !column_names.include?(column.to_s) }
+      end
+
       def connection
         model.connection
       end

data/lib/pg_search/version.rb

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

data/spec/lib/pg_search/multisearch/rebuilder_spec.rb

@@ -23,7 +23,7 @@ describe PgSearch::Multisearch::Rebuilder do
         end
       end
 
-      context "when multisearch is conditional" do
+      context "and multisearchable is conditional" do
         [:if, :unless].each do |conditional_key|
           context "via :#{conditional_key}" do
             with_model :Model do
@@ -51,55 +51,56 @@ describe PgSearch::Multisearch::Rebuilder do
     end
 
     context "when the model does not define .rebuild_pg_search_documents" do
-      context "when multisearchable is not conditional" do
-        with_model :Model do
-          table do |t|
-            t.string :name
-          end
+      context "and multisearchable is not conditional" do
+        context "when :against only includes columns" do
+          with_model :Model do
+            table do |t|
+              t.string :name
+            end
 
-          model do
-            include PgSearch
-            multisearchable :against => :name
+            model do
+              include PgSearch
+              multisearchable :against => :name
+            end
           end
-        end
 
-        it "should not call :rebuild_pg_search_documents" do
-          rebuilder = PgSearch::Multisearch::Rebuilder.new(Model)
+          it "should not call :rebuild_pg_search_documents" do
+            rebuilder = PgSearch::Multisearch::Rebuilder.new(Model)
 
-          # stub respond_to? to return false since should_not_receive defines the method
-          original_respond_to = Model.method(:respond_to?)
-          allow(Model).to receive(:respond_to?) do |method_name, *args|
-            if method_name == :rebuild_pg_search_documents
-              false
-            else
-              original_respond_to.call(method_name, *args)
+            # stub respond_to? to return false since should_not_receive defines the method
+            original_respond_to = Model.method(:respond_to?)
+            allow(Model).to receive(:respond_to?) do |method_name, *args|
+              if method_name == :rebuild_pg_search_documents
+                false
+              else
+                original_respond_to.call(method_name, *args)
+              end
             end
-          end
 
-          expect(Model).not_to receive(:rebuild_pg_search_documents)
-          rebuilder.rebuild
-        end
+            expect(Model).not_to receive(:rebuild_pg_search_documents)
+            rebuilder.rebuild
+          end
 
-        it "should execute the default SQL" do
-          time = DateTime.parse("2001-01-01")
-          rebuilder = PgSearch::Multisearch::Rebuilder.new(Model, lambda { time } )
+          it "should execute the default SQL" do
+            time = DateTime.parse("2001-01-01")
+            rebuilder = PgSearch::Multisearch::Rebuilder.new(Model, lambda { time } )
 
-          # Handle change in precision of DateTime objects in SQL in Active Record 4.0.1
-          # https://github.com/rails/rails/commit/17f5d8e062909f1fcae25351834d8e89967b645e
-          version_4_0_1_or_newer = (
+            # Handle change in precision of DateTime objects in SQL in Active Record 4.0.1
+            # https://github.com/rails/rails/commit/17f5d8e062909f1fcae25351834d8e89967b645e
+            version_4_0_1_or_newer = (
             (ActiveRecord::VERSION::MAJOR > 4) ||
-            (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1) ||
-            (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0 && ActiveRecord::VERSION::TINY >= 1)
-          )
-
-          expected_timestamp =
-            if version_4_0_1_or_newer
-              "2001-01-01 00:00:00.000000"
-            else
-              "2001-01-01 00:00:00"
-            end
+              (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1) ||
+              (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0 && ActiveRecord::VERSION::TINY >= 1)
+            )
+
+            expected_timestamp =
+              if version_4_0_1_or_newer
+                "2001-01-01 00:00:00.000000"
+              else
+                "2001-01-01 00:00:00"
+              end
 
-          expected_sql = <<-SQL.strip_heredoc
+            expected_sql = <<-SQL.strip_heredoc
             INSERT INTO "pg_search_documents" (searchable_type, searchable_id, content, created_at, updated_at)
               SELECT 'Model' AS searchable_type,
                      #{Model.quoted_table_name}.#{Model.primary_key} AS searchable_id,
@@ -109,53 +110,53 @@ describe PgSearch::Multisearch::Rebuilder do
                      '#{expected_timestamp}' AS created_at,
                      '#{expected_timestamp}' AS updated_at
               FROM #{Model.quoted_table_name}
-          SQL
+            SQL
 
-          executed_sql = []
+            executed_sql = []
 
-          notifier = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, start, finish, id, payload|
-            executed_sql << payload[:sql] if payload[:sql].include?(%Q{INSERT INTO "pg_search_documents"})
-          end
+            notifier = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, start, finish, id, payload|
+              executed_sql << payload[:sql] if payload[:sql].include?(%Q{INSERT INTO "pg_search_documents"})
+            end
 
-          rebuilder.rebuild
-          ActiveSupport::Notifications.unsubscribe(notifier)
+            rebuilder.rebuild
+            ActiveSupport::Notifications.unsubscribe(notifier)
 
-          expect(executed_sql.length).to eq(1)
-          expect(executed_sql.first.strip).to eq(expected_sql.strip)
-        end
+            expect(executed_sql.length).to eq(1)
+            expect(executed_sql.first.strip).to eq(expected_sql.strip)
+          end
 
-        context "for a model with a non-standard primary key" do
-          with_model :ModelWithNonStandardPrimaryKey do
-            table primary_key: :non_standard_primary_key do |t|
-              t.string :name
-            end
+          context "for a model with a non-standard primary key" do
+            with_model :ModelWithNonStandardPrimaryKey do
+              table primary_key: :non_standard_primary_key do |t|
+                t.string :name
+              end
 
-            model do
-              include PgSearch
-              multisearchable :against => :name
+              model do
+                include PgSearch
+                multisearchable :against => :name
+              end
             end
-          end
 
-          it "generates SQL with the correct primary key" do
-            time = DateTime.parse("2001-01-01")
-            rebuilder = PgSearch::Multisearch::Rebuilder.new(ModelWithNonStandardPrimaryKey, lambda { time } )
+            it "generates SQL with the correct primary key" do
+              time = DateTime.parse("2001-01-01")
+              rebuilder = PgSearch::Multisearch::Rebuilder.new(ModelWithNonStandardPrimaryKey, lambda { time } )
 
-            # Handle change in precision of DateTime objects in SQL in Active Record 4.0.1
-            # https://github.com/rails/rails/commit/17f5d8e062909f1fcae25351834d8e89967b645e
-            version_4_0_1_or_newer = (
+              # Handle change in precision of DateTime objects in SQL in Active Record 4.0.1
+              # https://github.com/rails/rails/commit/17f5d8e062909f1fcae25351834d8e89967b645e
+              version_4_0_1_or_newer = (
               (ActiveRecord::VERSION::MAJOR > 4) ||
-              (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1) ||
-              (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0 && ActiveRecord::VERSION::TINY >= 1)
-            )
-
-            expected_timestamp =
-              if version_4_0_1_or_newer
-                "2001-01-01 00:00:00.000000"
-              else
-                "2001-01-01 00:00:00"
-              end
+                (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1) ||
+                (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0 && ActiveRecord::VERSION::TINY >= 1)
+              )
+
+              expected_timestamp =
+                if version_4_0_1_or_newer
+                  "2001-01-01 00:00:00.000000"
+                else
+                  "2001-01-01 00:00:00"
+                end
 
-            expected_sql = <<-SQL.strip_heredoc
+              expected_sql = <<-SQL.strip_heredoc
               INSERT INTO "pg_search_documents" (searchable_type, searchable_id, content, created_at, updated_at)
                 SELECT 'ModelWithNonStandardPrimaryKey' AS searchable_type,
                        #{ModelWithNonStandardPrimaryKey.quoted_table_name}.non_standard_primary_key AS searchable_id,
@@ -165,24 +166,62 @@ describe PgSearch::Multisearch::Rebuilder do
                        '#{expected_timestamp}' AS created_at,
                        '#{expected_timestamp}' AS updated_at
                 FROM #{ModelWithNonStandardPrimaryKey.quoted_table_name}
-            SQL
+              SQL
 
-            executed_sql = []
+              executed_sql = []
 
-            notifier = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, start, finish, id, payload|
-              executed_sql << payload[:sql] if payload[:sql].include?(%Q{INSERT INTO "pg_search_documents"})
+              notifier = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, start, finish, id, payload|
+                executed_sql << payload[:sql] if payload[:sql].include?(%Q{INSERT INTO "pg_search_documents"})
+              end
+
+              rebuilder.rebuild
+              ActiveSupport::Notifications.unsubscribe(notifier)
+
+              expect(executed_sql.length).to eq(1)
+              expect(executed_sql.first.strip).to eq(expected_sql.strip)
             end
+          end
+        end
+
+        context "when :against includes non-column dynamic methods" do
+          with_model :Model do
+            table do
+            end
+
+            model do
+              include PgSearch
+              multisearchable against: [:foo]
+
+              def foo
+                "bar"
+              end
+            end
+          end
+
+          it "calls update_pg_search_document on each record" do
+            record = Model.create!
+
+            rebuilder = PgSearch::Multisearch::Rebuilder.new(Model)
+
+            # stub respond_to? to return false since should_not_receive defines the method
+            original_respond_to = Model.method(:respond_to?)
+            allow(Model).to receive(:respond_to?) do |method_name, *args|
+              if method_name == :rebuild_pg_search_documents
+                false
+              else
+                original_respond_to.call(method_name, *args)
+              end
+            end
+            expect(Model).not_to receive(:rebuild_pg_search_documents)
 
             rebuilder.rebuild
-            ActiveSupport::Notifications.unsubscribe(notifier)
 
-            expect(executed_sql.length).to eq(1)
-            expect(executed_sql.first.strip).to eq(expected_sql.strip)
+            expect(record.pg_search_document).to be_present
           end
         end
       end
 
-      context "when multisearchable is conditional" do
+      context "and multisearchable is conditional" do
         context "via :if" do
           with_model :Model do
             table do |t|

metadata

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