full_search 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 894bce4229c00412829f531fbb35c78a3b9a3b4ac869ddc23e67421d1abc773b
-  data.tar.gz: 3a9504c246aced49dcef0b9991efddf53fdbff873c0ddf7e6781e6551550af71
+  metadata.gz: 99b631f72162065698bc187ad0b88cb7602cbead185b5c82209db713774e763d
+  data.tar.gz: 5e1dd5a0782e69cba81b0b2c8f32170046f4c0e3ad55debb063837117285a559
 SHA512:
-  metadata.gz: aea83a66af28bf651dd022c63725d012dea6783e57125c5febbf7e48582fe4ac8990cd30af6d9c72bc9544ae3fbf925e84c03a060c549a1b79aaf65668bb2705
-  data.tar.gz: 9d9d227f097f3c1b5629aa6ced3768e2cb99db6fdafa28ca15ce641afac2ed4af7f15892d6b7fc87316246eb1be7fd02cdd81db1d1f16407fcf2f8a574d20af6
+  metadata.gz: 146763f433fba78ed55b6a638b1d8a80bed0ea886daf294ff8e9389d09efef104b7ae6729d8897ee3ea267a4d38cf5d9956e691f4524da4a0861df6827c909ba
+  data.tar.gz: 65c5e59005e1730e12fadda9126b397a5fffdef462bcda088e7f14259b3635d1df7356d91dd23ebb312e6403489bf461b6088fc29a68b86b38fdbb80c4786ac2

data/lib/full_search/index.rb

@@ -71,8 +71,8 @@ module FullSearch
         with_rebuild_lock(model) do
           FullSearch::Instrumentation.instrument("rebuild", model: model.name) do
             drop_triggers!(model)
-            conn.execute("DROP TABLE IF EXISTS #{qt(fts_table_name(model))};")
-            conn.execute("DROP TABLE IF EXISTS #{qt(trigram_table_name(model))};")
+            drop_fts_table_safely!(fts_table_name(model))
+            drop_fts_table_safely!(trigram_table_name(model))
             conn.execute(create_virtual_table_sql(model))
             if trigram_table_needed?(model)
               FullSearch::Typo.warn_unsupported!(model) unless FullSearch::Typo.supported?(model)
@@ -181,8 +181,32 @@ module FullSearch
         verified_tables.delete(model.table_name)
         sqlite!(model)
         drop_triggers!(model)
-        connection.execute("DROP TABLE IF EXISTS #{qt(fts_table_name(model))};")
-        connection.execute("DROP TABLE IF EXISTS #{qt(trigram_table_name(model))};")
+        drop_fts_table_safely!(fts_table_name(model))
+        drop_fts_table_safely!(trigram_table_name(model))
+      end
+      # Drops an FTS5 virtual table, recovering from corruption where a bare
+      # DROP TABLE IF EXISTS raises "invalid fts5 file format" because the
+      # shadow tables were tampered with out-of-band. When that happens we
+      # drop the shadow tables directly, then drop the (now-empty) virtual
+      # table wrapper, so the caller can recreate a clean index.
+      def drop_fts_table_safely!(table_name)
+        connection.execute("DROP TABLE IF EXISTS #{qt(table_name)};")
+      rescue ActiveRecord::StatementInvalid => e
+        raise unless e.message.match?(/fts5: corruption|invalid fts5 file format|malformed database schema/i)
+
+        drop_shadow_tables!(table_name)
+        connection.execute("DROP TABLE IF EXISTS #{qt(table_name)};")
+      end
+
+      # FTS5 stores its index data in a fixed set of shadow tables named
+      # <table>_content, <table>_data, <table>_idx, <table>_docsize and
+      # <table>_config. Dropping these lets SQLite recover a virtual table
+      # that is otherwise undroppable due to internal corruption.
+      def drop_shadow_tables!(table_name)
+        %w[content data idx docsize config].each do |suffix|
+          shadow = "#{table_name}_#{suffix}"
+          connection.execute("DROP TABLE IF EXISTS #{qt(shadow)};")
+        end
       end
 
       def fts_table_name(model)

data/lib/full_search/version.rb

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

metadata

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