full_search 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a86070d05b32fc24ce6ac007a33c673c3831760ce76554bbb9d636e6e0c6be0f
-  data.tar.gz: 293b0be9931c7ffa5de9971aa52b2bf9014c2b0816d1364f839ccba57af8f814
+  metadata.gz: d8865ec65e8e55ecc1648ab56cd7f65f77ea7a05b6928f0771492a1e2ed1bf68
+  data.tar.gz: 8bbe570d9fa72cd9ed8d567174501807bc4b4d1726fcc4600e857219c3d59b2c
 SHA512:
-  metadata.gz: cd9854cc22d14bd739723e5011a831fd34d0e523ef6a6df09bf45fa1f3a7880c466f4ba121eb07d9d92daf65449edf74b5e0ddc42dc15b521ea34e78b496be3a
-  data.tar.gz: f704e822cee03ad98f2ed96dbc802e3e5b777df659ecdc3d8187ace6088494ab318b6f1598c74b840697909b465e539a76ee9f758d6a709041d9e0b198d45129
+  metadata.gz: 1d91fea14e22584bca2ecdd617119068a54ef60d3f8d79d9109c5e51a6f8b4cd562f0a37e34a3e0ce01ec4dda29ebe5e0ef85d7ef7a51a8d5a922efa59086fdc
+  data.tar.gz: 2089966acfa5bc274cde458cb27a7a739e70493d75027b507794ffa905048f772f2e72d8a213c8ad779f312424c8509181cf57ae1aeaccf252a9522e690099a4

data/README.md

@@ -223,6 +223,18 @@ The rebuild task checks each model's stored config hash against the current DSL
 bin/rails full_search:reset
 ```
 
+### Schema dump
+
+By default, `full_search` includes its FTS virtual tables in `db/schema.rb` so that `db:schema:load` produces a complete, loadable database. To exclude them:
+
+```ruby
+FullSearch.configure do |config|
+  config.dump_schema_virtual_tables = false
+end
+```
+
+When disabled, you must run `bin/rails full_search:prepare` after every `db:schema:load` to recreate the indexes.
+
 ### Rake tasks
 
 | Task | Description |

data/lib/full_search/config.rb

@@ -4,7 +4,8 @@ module FullSearch
   class Config
     attr_accessor :auto_rebuild_schema, :stale_query_behavior, :lock_rebuilds,
       :default_async_reindex, :default_async_source_reindex,
-      :default_tokenizer, :auto_rebuild_on_stale_query, :min_like_prefix_length
+      :default_tokenizer, :auto_rebuild_on_stale_query, :min_like_prefix_length,
+      :dump_schema_virtual_tables
 
     def initialize
       @auto_rebuild_schema = false
@@ -15,6 +16,7 @@ module FullSearch
       @default_tokenizer = FullSearch::Constants::DEFAULT_TOKENIZER
       @auto_rebuild_on_stale_query = false
       @min_like_prefix_length = FullSearch::Constants::DEFAULT_MIN_LIKE_PREFIX_LENGTH
+      @dump_schema_virtual_tables = true
     end
   end
 

data/lib/full_search/constants.rb

@@ -6,7 +6,7 @@ module FullSearch
     TWO_TYPO_MIN_LENGTH = 9
     DEFAULT_MIN_LIKE_PREFIX_LENGTH = 3
     REBUILDING_HASH = "__rebuilding__"
-    DEFAULT_TOKENIZER = "unicode61"
+    DEFAULT_TOKENIZER = "porter"
     MAX_EXACT_MATCH_BOOST_IDS = 100
   end
 end

data/lib/full_search/index.rb

@@ -36,7 +36,7 @@ module FullSearch
         end
 
         trigram_was_created = false
-        if dsl.typo_tolerance? && !trigram_table_exists?(model)
+        if trigram_table_needed?(model) && !trigram_table_exists?(model)
           FullSearch::Typo.warn_unsupported!(model) unless FullSearch::Typo.supported?(model)
           conn.execute(create_trigram_virtual_table_sql(model))
           trigram_was_created = true
@@ -70,12 +70,12 @@ module FullSearch
             conn.execute("DROP TABLE IF EXISTS #{qt(fts_table_name(model))};")
             conn.execute("DROP TABLE IF EXISTS #{qt(trigram_table_name(model))};")
             conn.execute(create_virtual_table_sql(model))
-            if dsl.typo_tolerance?
+            if trigram_table_needed?(model)
               FullSearch::Typo.warn_unsupported!(model) unless FullSearch::Typo.supported?(model)
               conn.execute(create_trigram_virtual_table_sql(model))
             end
             conn.execute(backfill_sql(model))
-            conn.execute(backfill_trigram_sql(model)) if dsl.typo_tolerance?
+            conn.execute(backfill_trigram_sql(model)) if trigram_table_needed?(model)
             reindex_source_fields!(model) if dsl.fields.any?(&:source)
             create_triggers!(model)
             optimize!(model)
@@ -141,7 +141,7 @@ module FullSearch
         if model.full_search_dsl.soft_delete_column
           connection.execute(soft_delete_removal_trigger_sql(model))
         end
-        if model.full_search_dsl.typo_tolerance?
+        if trigram_table_needed?(model)
           connection.execute(insert_trigram_trigger_sql(model))
           connection.execute(delete_trigram_trigger_sql(model))
           connection.execute(update_trigram_trigger_sql(model))
@@ -199,6 +199,16 @@ module FullSearch
         !table_exists?(model)
       end
 
+      def trigram_table_needed?(model)
+        model.full_search_dsl&.typo_tolerance? && model.full_search_dsl.tokenize != "trigram"
+      end
+
+      def trigram_table_exists?(model)
+        connection.execute(
+          "SELECT name FROM sqlite_master WHERE type='table' AND name=#{q(trigram_table_name(model))} LIMIT 1"
+        ).any?
+      end
+
       private
 
       def connection
@@ -292,7 +302,7 @@ module FullSearch
         ).map { |r| r["name"] }
 
         expected = trigger_names(model)
-        expected += trigram_trigger_names(model) if model.full_search_dsl.typo_tolerance?
+        expected += trigram_trigger_names(model) if trigram_table_needed?(model)
         return if (expected - existing).empty? && (existing - expected).empty?
 
         rebuild!(model)
@@ -391,12 +401,6 @@ module FullSearch
         SQL
       end
 
-      def trigram_table_exists?(model)
-        connection.execute(
-          "SELECT name FROM sqlite_master WHERE type='table' AND name=#{q(trigram_table_name(model))} LIMIT 1"
-        ).any?
-      end
-
       def create_trigram_virtual_table_sql(model)
         dsl = model.full_search_dsl
         columns = (dsl.fields + dsl.filters.map { |f| FilterColumnPlaceholder.new(name: f.name) } + extra_columns(model))

data/lib/full_search/schema_dumper_patch.rb

@@ -11,6 +11,8 @@ module FullSearch
     private
 
     def virtual_tables(stream)
+      return unless FullSearch.config.dump_schema_virtual_tables
+
       virtual_tables = @connection.virtual_tables.reject { |name, _| ignored?(name) }
 
       if virtual_tables.any?

data/lib/full_search/search.rb

@@ -146,6 +146,8 @@ module FullSearch
         return like_prefix_ids(term, candidate_limit: candidate_limit)
       end
 
+      return [] unless FullSearch::Index.trigram_table_exists?(model)
+
       trigram_table = qt(FullSearch::Index.trigram_table_name(model))
       tbl = qt(model.table_name)
 

data/lib/full_search/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FullSearch
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/lib/generators/full_search/install/templates/full_search.rb

@@ -12,4 +12,8 @@ FullSearch.configure do |config|
   # Reindex computed source: fields synchronously (false) or via background job (true).
   # Bulk imports should use FullSearch.bulk_import(Model) { ... } to defer reindexing.
   config.default_async_source_reindex = true
+
+  # Uncomment to exclude full_search virtual tables from db/schema.rb.
+  # When false, you must run `bin/rails full_search:prepare` after db:schema:load.
+  # config.dump_schema_virtual_tables = false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: full_search
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Ben D'Angelo