full_search 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50bb1c53fe9f326612a2413a441a37acfe48f25bf4730786de3631c7230b2572
-  data.tar.gz: ab53bbd57f8fd9cb464af29d37aa70cd0efb18a2835eff1b501d61a14d0de43f
+  metadata.gz: 540d8604b539de87bf3d8448c33319a80853132d5d1911d8d0c12bbc35f87ea0
+  data.tar.gz: 63d7304396d67181ed0b35d35b37996801b901c7c9998d08945b6be88754d09f
 SHA512:
-  metadata.gz: ab98601c786c02808246cf4657ef7c3912e36e0fbc429417c0ff564a3ec1e2575216fda8d64ee2ab22db32c707bcbce0915fcc3d57038059f1dfe05bde48963e
-  data.tar.gz: 52564a1ce083d5aa0f6cb624f8f9aa4a0bb0ac13a85216f14a857a5c2c2c744d37fa4370272679c3bd13c76eb6ec732814463cfa143bb714654243968c6c800c
+  metadata.gz: aeb01d6b88bcf617d83f273dbdbb3ace5bb1f12fa8094ad978d96f88f31ab058d12000e6964454d8f6630bd1f6fe70b6debe5ed3937445e8e07ac8de091e0fd7
+  data.tar.gz: ba24e0621fcf6ebb6857cc820a96b0a2a9fde6c43953602dd9a295592fdb5e162a8e63dd91bcdca17ec8e63d913d08fd475b77402dac2a7f0b17f232996cfabd

data/README.md

@@ -6,7 +6,7 @@ SQLite FTS5 full-text search for Rails/ActiveRecord. A lightweight, self-contain
 
 ## Requirements
 
-- Ruby 3.1+
+- Ruby 3.2+
 - Rails 8.0+
 - SQLite 3.34+ (if using typo tolerance)
 

data/lib/full_search/callbacks.rb

@@ -59,12 +59,16 @@ module FullSearch
       conn.execute(
         "UPDATE #{table} SET #{qc(field.name)} = #{q(value.to_s)} WHERE rowid = #{q(record.id)}"
       )
+    rescue => e
+      raise unless e.message.include?("no such table")
     end
 
     def self.remove_record!(record)
       table = qt(FullSearch::Index.fts_table_name(record.class))
       conn = ActiveRecord::Base.connection
       conn.execute("DELETE FROM #{table} WHERE rowid = #{q(record.id)}")
+    rescue => e
+      raise unless e.message.include?("no such table")
     end
 
     def self.reindex_dependents!(parent_record, dependent_model, field)

data/lib/full_search/index.rb

@@ -14,7 +14,13 @@ end
 module FullSearch
   class Index
     class << self
+      def verified_tables
+        @verified_tables ||= Set.new
+      end
+
       def ensure_table!(model)
+        return if model.respond_to?(:table_name) && verified_tables.include?(model.table_name)
+
         sqlite!(model)
 
         conn = connection
@@ -44,6 +50,8 @@ module FullSearch
 
         store_config_hash!(model)
         ensure_triggers!(model) if model_table_exists?(model)
+
+        verified_tables.add(model.table_name)
       end
 
       def rebuild!(model)
@@ -70,6 +78,7 @@ module FullSearch
           create_triggers!(model)
           optimize!(model)
           store_config_hash!(model, rebuilt_at: Time.current)
+          verified_tables.add(model.table_name)
         end
       end
 
@@ -103,6 +112,7 @@ module FullSearch
       end
 
       def drop!(model)
+        verified_tables.delete(model.table_name)
         sqlite!(model)
         drop_triggers!(model)
         connection.execute("DROP TABLE IF EXISTS #{qt(fts_table_name(model))};")
@@ -190,12 +200,7 @@ module FullSearch
         columns = (dsl.fields + dsl.filters.map { |f| FilterColumnPlaceholder.new(name: f.name) })
         column_list = columns.map { |c| (c.respond_to?(:unindexed?) && c.unindexed?) ? "#{qc(c.name)} UNINDEXED" : qc(c.name) }.join(", ")
 
-        <<~SQL
-          CREATE VIRTUAL TABLE #{qt(fts_table_name(model))} USING fts5(
-            #{column_list},
-            tokenize='#{dsl.tokenize}'
-          );
-        SQL
+        "CREATE VIRTUAL TABLE #{qt(fts_table_name(model))} USING fts5(#{column_list}, tokenize='#{dsl.tokenize}');"
       end
 
       def backfill_sql(model)
@@ -327,12 +332,7 @@ module FullSearch
         columns = (dsl.fields + dsl.filters.map { |f| FilterColumnPlaceholder.new(name: f.name) })
         column_list = columns.map { |c| (c.respond_to?(:unindexed?) && c.unindexed?) ? "#{qc(c.name)} UNINDEXED" : qc(c.name) }.join(", ")
 
-        <<~SQL
-          CREATE VIRTUAL TABLE #{qt(trigram_table_name(model))} USING fts5(
-            #{column_list},
-            tokenize='trigram'
-          );
-        SQL
+        "CREATE VIRTUAL TABLE #{qt(trigram_table_name(model))} USING fts5(#{column_list}, tokenize='trigram');"
       end
 
       def backfill_trigram_sql(model)

data/lib/full_search/model.rb

@@ -10,8 +10,8 @@ module FullSearch
           @full_search_dsl ||= FullSearch::Dsl.new(self)
           @full_search_dsl.tokenize(query_or_options[:tokenize]) if query_or_options.is_a?(Hash) && query_or_options.key?(:tokenize)
           @full_search_dsl.instance_eval(&block) if block_given?
-          FullSearch::Index.ensure_table!(self)
           FullSearch::Callbacks.install!(self)
+          FullSearch::Index.ensure_table!(self)
           include InstanceMethods
 
           FullSearch.register_model(self)

data/lib/full_search/schema_dumper_patch.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module FullSearch
+  module VirtualTablesPatch
+    def virtual_tables
+      super.reject { |_, options| options.first.nil? }
+    end
+  end
+
+  module SchemaDumperPatch
+    private
+
+    def virtual_tables(stream)
+      virtual_tables = @connection.virtual_tables.reject { |name, _| ignored?(name) }
+
+      if virtual_tables.any?
+        stream.puts
+        stream.puts "  # Virtual tables defined in this database."
+        stream.puts "  # Note that virtual tables may not work with other database engines. Be careful if changing database."
+        virtual_tables.sort.each do |table_name, options|
+          module_name, arguments = options
+          next if module_name.nil? || arguments.nil?
+
+          stream.puts "  create_virtual_table #{table_name.inspect}, #{module_name.inspect}, #{arguments.split(", ").inspect}"
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  begin
+    require "active_record/connection_adapters/sqlite3_adapter"
+  rescue LoadError
+    next
+  end
+
+  if defined?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
+    ActiveRecord::ConnectionAdapters::SQLite3Adapter.prepend(FullSearch::VirtualTablesPatch)
+  end
+
+  if defined?(ActiveRecord::ConnectionAdapters::SQLite3::SchemaDumper)
+    ActiveRecord::ConnectionAdapters::SQLite3::SchemaDumper.prepend(FullSearch::SchemaDumperPatch)
+  end
+end

data/lib/full_search/version.rb

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

data/lib/full_search.rb

@@ -24,6 +24,7 @@ require "full_search/reindex_job"
 require "full_search/optimize_job"
 require "full_search/test_helpers"
 require "full_search/multi_search"
+require "full_search/schema_dumper_patch"
 
 ActiveSupport.on_load(:active_record) do
   include FullSearch::Model
@@ -46,6 +47,13 @@ module FullSearch
     def optimize!
       models.each { |model| Index.optimize!(model) }
     end
+
+    def setup!
+      models.each do |model|
+        Index.ensure_table!(model)
+        Callbacks.install!(model)
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: full_search
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Ben D'Angelo
@@ -155,6 +155,7 @@ files:
 - lib/full_search/quoting.rb
 - lib/full_search/railtie.rb
 - lib/full_search/reindex_job.rb
+- lib/full_search/schema_dumper_patch.rb
 - lib/full_search/search.rb
 - lib/full_search/soft_delete.rb
 - lib/full_search/test_helpers.rb
@@ -175,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="