pg_search 0.7.3 → 0.7.4

data/lib/pg_search/multisearch/rebuilder.rb

@@ -28,20 +28,26 @@ module PgSearch
         model.connection
       end
 
-      REBUILD_SQL_TEMPLATE = <<-SQL.strip_heredoc
-        INSERT INTO :documents_table (searchable_type, searchable_id, content, created_at, updated_at)
-          SELECT :model_name AS searchable_type,
-                 :model_table.id AS searchable_id,
-                 (
-                   :content_expressions
-                 ) AS content,
-                 :current_time AS created_at,
-                 :current_time AS updated_at
-          FROM :model_table
-      SQL
+      def primary_key
+        model.primary_key
+      end
+
+      def rebuild_sql_template
+         <<-SQL.strip_heredoc
+          INSERT INTO :documents_table (searchable_type, searchable_id, content, created_at, updated_at)
+            SELECT :model_name AS searchable_type,
+                   :model_table.#{primary_key} AS searchable_id,
+                   (
+                     :content_expressions
+                   ) AS content,
+                   :current_time AS created_at,
+                   :current_time AS updated_at
+            FROM :model_table
+        SQL
+      end
 
       def rebuild_sql
-        replacements.inject(REBUILD_SQL_TEMPLATE) do |sql, key|
+        replacements.inject(rebuild_sql_template) do |sql, key|
           sql.gsub ":#{key}", send(key)
         end
       end

data/lib/pg_search/multisearchable.rb

@@ -23,7 +23,10 @@ module PgSearch
         unless_conditions.all? { |condition| !condition.to_proc.call(self) }
 
       if should_have_document
-        pg_search_document ? pg_search_document.save : create_pg_search_document
+        unless pg_search_document.present?
+          build_pg_search_document.searchable_type = self.class.name
+        end
+        pg_search_document.save
       else
         pg_search_document.destroy if pg_search_document
       end

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "0.7.3".freeze
+  VERSION = "0.7.4".freeze
 end

data/spec/integration/pg_search_spec.rb

@@ -1052,6 +1052,49 @@ describe "an Active Record model which includes PgSearch" do
         it { should_not include(soundalike_record) }
       end
     end
+
+    context "on an STI subclass" do
+      with_model :ASuperclassModel do
+        table do |t|
+          t.text 'content'
+          t.string 'type'
+        end
+      end
+
+      before do
+
+        class SearchableSubclassModel < ASuperclassModel
+          include PgSearch
+          multisearchable :against => :content
+        end
+
+        class NonSearchableSubclassModel < ASuperclassModel
+        end
+      end
+
+      it "returns only results for that subclass" do
+        included = [
+          SearchableSubclassModel.create!(:content => "foo bar")
+        ]
+        excluded = [
+          SearchableSubclassModel.create!(:content => "baz"),
+          ASuperclassModel.create!(:content => "foo bar"),
+          ASuperclassModel.create!(:content => "baz"),
+          NonSearchableSubclassModel.create!(:content => "foo bar"),
+          NonSearchableSubclassModel.create!(:content => "baz")
+        ]
+
+        expect(ASuperclassModel.count).to be 6
+        expect(SearchableSubclassModel.count).to be 2
+
+        results = PgSearch.multisearch("foo bar")
+
+        expect(results.map(&:searchable_id)).to include(*included.map(&:id))
+        expect(results.map(&:searchable_id)).not_to include(*excluded.map(&:id))
+        expect(results.map(&:searchable_type)).to include(*%w[SearchableSubclassModel])
+        expect(results.map(&:searchable_type)).not_to include(*%w[ASuperclassModel NonSearchableSubclassModel])
+      end
+    end
   end
 
   describe ".disable_multisearch" do

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

@@ -99,11 +99,10 @@ describe PgSearch::Multisearch::Rebuilder do
               "2001-01-01 00:00:00"
             end
 
-
           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}.id AS searchable_id,
+                     #{Model.quoted_table_name}.#{Model.primary_key} AS searchable_id,
                      (
                        coalesce(#{Model.quoted_table_name}.name::text, '')
                      ) AS content,
@@ -115,7 +114,7 @@ describe PgSearch::Multisearch::Rebuilder do
           executed_sql = []
 
           notifier = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, start, finish, id, payload|
-            executed_sql << payload[:sql]
+            executed_sql << payload[:sql] if payload[:sql].include?(%Q{INSERT INTO "pg_search_documents"})
           end
 
           rebuilder.rebuild
@@ -124,6 +123,63 @@ describe PgSearch::Multisearch::Rebuilder do
           executed_sql.length.should == 1
           executed_sql.first.should == expected_sql
         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
+            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 } )
+
+            # 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
+
+            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,
+                       (
+                         coalesce(#{ModelWithNonStandardPrimaryKey.quoted_table_name}.name::text, '')
+                       ) AS content,
+                       '#{expected_timestamp}' AS created_at,
+                       '#{expected_timestamp}' AS updated_at
+                FROM #{ModelWithNonStandardPrimaryKey.quoted_table_name}
+            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
+
+            rebuilder.rebuild
+            ActiveSupport::Notifications.unsubscribe(notifier)
+
+            executed_sql.length.should == 1
+            executed_sql.first.should == expected_sql
+          end
+        end
       end
 
       context "when multisearchable is conditional" do

data/spec/spec_helper.rb

@@ -9,16 +9,16 @@ if ENV["TRAVIS"]
   end
 end
 
-begin
-  if defined? JRUBY_VERSION
-    require 'activerecord-jdbcpostgresql-adapter'
-    error_class = ActiveRecord::JDBCError
-  else
-    require "pg"
-    error_class = PGError
-  end
+if defined? JRUBY_VERSION
+  require 'activerecord-jdbcpostgresql-adapter'
+  error_classes = [ActiveRecord::JDBCError]
+else
+  require "pg"
+  error_classes = [PGError]
 end
 
+error_classes << ActiveRecord::NoDatabaseError if defined? ActiveRecord::NoDatabaseError
+
 begin
   database_user = if ENV["TRAVIS"]
                     "postgres"
@@ -33,7 +33,7 @@ begin
   connection = ActiveRecord::Base.connection
   postgresql_version = connection.send(:postgresql_version)
   connection.execute("SELECT 1")
-rescue error_class
+rescue *error_classes
   at_exit do
     puts "-" * 80
     puts "Unable to connect to database.  Please run:"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: with_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's
@@ -118,10 +118,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
-- .gitignore
-- .rspec
-- .travis.yml
+- ".autotest"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -188,17 +188,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's