full_search 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50bb1c53fe9f326612a2413a441a37acfe48f25bf4730786de3631c7230b2572
-  data.tar.gz: ab53bbd57f8fd9cb464af29d37aa70cd0efb18a2835eff1b501d61a14d0de43f
+  metadata.gz: 866994a5c7f55cea4237fb2edcbf59f1f7c8c32772c6830df737bcbea4a6f1c6
+  data.tar.gz: 5a11ccf1c48abd1050288bbb7107b8ade82132e009ac23ed5803ed153675f535
 SHA512:
-  metadata.gz: ab98601c786c02808246cf4657ef7c3912e36e0fbc429417c0ff564a3ec1e2575216fda8d64ee2ab22db32c707bcbce0915fcc3d57038059f1dfe05bde48963e
-  data.tar.gz: 52564a1ce083d5aa0f6cb624f8f9aa4a0bb0ac13a85216f14a857a5c2c2c744d37fa4370272679c3bd13c76eb6ec732814463cfa143bb714654243968c6c800c
+  metadata.gz: 35eb2afacd021899e68eb808b65a6f323db3d66770940471aa94d9c3238e41c409c678ac79d82dc609dcafaf3117d937895fa8effc9a8e665790a8625ef1f231
+  data.tar.gz: 5f1f25fe9e2c268e4f6b95c988ddb7958c34649fcf53aa941d0b19d1b605a5b4345864bb7206b597fc509b9802a110db6c3900a40fe1ab3d3ce1468db28aef85

data/lib/full_search/index.rb

@@ -190,12 +190,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 +322,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/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.1"
 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: full_search
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 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