full_search 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d5cf6b2007aa968f7243df89c2e957288336c03f64500278b88583e3a75035e
-  data.tar.gz: b575ebcb9d41e2a16fe3a86f5201705551c41f2066b4db80e31b2b15ecd2be09
+  metadata.gz: 894bce4229c00412829f531fbb35c78a3b9a3b4ac869ddc23e67421d1abc773b
+  data.tar.gz: 3a9504c246aced49dcef0b9991efddf53fdbff873c0ddf7e6781e6551550af71
 SHA512:
-  metadata.gz: '0740089cb32424858a53942ab6695e7b4c65963a6cfa1ed75ee42aa500f702203c02f460d735d82f1fc9712e8df82f27f1e8b203700cb7e6be793641d4050821'
-  data.tar.gz: 02d341539689e75d8f2064fd457ae241f4008434804ba62931493c2bef64033197a968387b3ded9db17bbbfaa42687ae28249419a3ade9969ebee42aaced5e1c
+  metadata.gz: aea83a66af28bf651dd022c63725d012dea6783e57125c5febbf7e48582fe4ac8990cd30af6d9c72bc9544ae3fbf925e84c03a060c549a1b79aaf65668bb2705
+  data.tar.gz: 9d9d227f097f3c1b5629aa6ced3768e2cb99db6fdafa28ca15ce641afac2ed4af7f15892d6b7fc87316246eb1be7fd02cdd81db1d1f16407fcf2f8a574d20af6

data/lib/full_search/index.rb

@@ -29,6 +29,10 @@ module FullSearch
 
         create_metadata_table!
 
+        if table_exists?(model) && !healthy?(model)
+          rebuild!(model)
+        end
+
         fts_was_created = false
         unless table_exists?(model)
           conn.execute(create_virtual_table_sql(model))
@@ -162,8 +166,14 @@ module FullSearch
         return unless table_exists?(model)
 
         conn = connection
-        conn.execute("DELETE FROM #{qt(fts_table_name(model))};")
-        conn.execute("DELETE FROM #{qt(trigram_table_name(model))};") if trigram_table_needed?(model) && trigram_table_exists?(model)
+        begin
+          conn.execute("DELETE FROM #{qt(fts_table_name(model))};")
+          conn.execute("DELETE FROM #{qt(trigram_table_name(model))};") if trigram_table_needed?(model) && trigram_table_exists?(model)
+        rescue ActiveRecord::StatementInvalid => e
+          raise unless e.message.match?(/fts5: corruption|invalid fts5 file format|malformed database schema/i)
+
+          rebuild!(model)
+        end
       end
 
       def drop!(model)
@@ -211,6 +221,17 @@ module FullSearch
         !table_exists?(model)
       end
 
+      def healthy?(model)
+        return false unless table_exists?(model)
+
+        connection.execute("SELECT count(*) FROM #{qt(fts_table_name(model))}")
+        true
+      rescue ActiveRecord::StatementInvalid => e
+        raise unless e.message.match?(/fts5: corruption|invalid fts5 file format|malformed database schema/i)
+
+        false
+      end
+
       def trigram_table_needed?(model)
         model.full_search_dsl&.typo_tolerance? && model.full_search_dsl.tokenize != "trigram"
       end

data/lib/full_search/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: full_search
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Ben D'Angelo
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '2.0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.10
 specification_version: 4
 summary: SQLite FTS5 full-text search for Rails/ActiveRecord
 test_files: []