full_search 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a941ba183d7dd00eead669ac8b534b4028b32bd1d991db16bc0318345266e14
-  data.tar.gz: 6b7709cd3c9816ee80d5033cca05d8867f6e35df9d73c4294485772c658bc779
+  metadata.gz: c106ce290a8691c0e999d9415ab823b6073251c752f6653092f05bbf2edd22af
+  data.tar.gz: b6bb5c9ccc32f7424b5cf6ba7bd8a591110b02b1cb4321b0b27d1238dceaecf1
 SHA512:
-  metadata.gz: 8cbd0bc9321c9de12c1bea7831ba58f1b7d447c61d9997fc9bdf4ea4dbcd3e4b5d79f559057048ebec79cfcc1c3102ebbd436c939a84dbf82289d13bf339e373
-  data.tar.gz: '069b642037b70d91c2f0afc4491ceebb9bfdd6f40a68bc74366813d77e563915293f4cdbe87c44dc9aa10c38eca92c462916e0bc174926436031bb87f4365e1c'
+  metadata.gz: a07209c3569f34c84da841210a626828e56b48c7e8300045c2e609893e6d750340e3443c62b9d0140e530aa98ceca8766836b84151a68ae54526094261b8d326
+  data.tar.gz: 9b92eb8318b503a3b27af8f3a46426aff657644c4e34d583de68c72810b474660c7cddb1bd0650b03aafe847223928a9cef05f086068a99e50b0089749cfd479

data/lib/full_search/dsl.rb

@@ -4,7 +4,11 @@ module FullSearch
   class Dsl
     attr_reader :fields, :exact_matches, :filters, :model_class, :highlight_config, :rank_bys, :index_if_sql
 
-    Field = Data.define(:name, :weight, :source, :reindex_on, :async, :async_source, :as, :version)
+    Field = Data.define(:name, :weight, :source, :reindex_on, :async, :async_source, :as, :version) do
+      def fts_column_name
+        as || name
+      end
+    end
     ExactMatch = Data.define(:name, :source, :sql, :version, :normalize)
     Filter = Data.define(:name, :required)
     RankBy = Data.define(:column, :direction)

data/lib/full_search/index.rb

@@ -285,6 +285,38 @@ module FullSearch
         end
       end
 
+      # Builds the human-readable status line for a model, used by the
+      # `full_search:status` task. Reports missing FTS tables and counts rows
+      # whose source fields are empty, using the FTS column names (respecting
+      # `as:` aliases) rather than the DSL field names.
+      def status(model)
+        return "MISSING TABLE" if missing_table?(model)
+
+        stored = stored_config_hash(model)
+        current = model.full_search_dsl.config_hash
+        status = (stored == current) ? "ok" : "stale"
+
+        source_fields = model.full_search_dsl.fields.select(&:source).map(&:fts_column_name)
+
+        drift_info = if source_fields.any?
+          conn = connection
+          qc = ->(name) { conn.quote_column_name(name) }
+          qt = ->(name) { conn.quote_table_name(name) }
+          empty_count = conn.execute(<<~SQL).first["c"]
+            SELECT COUNT(*) AS c
+            FROM #{qt.call(fts_table_name(model))}
+            WHERE #{source_fields.map { |c| "#{qc.call(c)} = ''" }.join(" OR ")}
+          SQL
+          " | empty source fields: #{empty_count}"
+        else
+          ""
+        end
+
+        trigger_info = missing_triggers?(model) ? " | MISSING TRIGGERS" : ""
+
+        "#{status}#{drift_info}#{trigger_info}"
+      end
+
       private
 
       BUSY_RETRIES = 3
@@ -316,7 +348,7 @@ module FullSearch
       end
 
       def column_name(col)
-        (col.respond_to?(:as) && col.as) ? col.as : col.name
+        col.respond_to?(:fts_column_name) ? col.fts_column_name : col.name
       end
 
       def qc(name)

data/lib/full_search/version.rb

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

data/lib/tasks/full_search.rake

@@ -86,28 +86,7 @@ namespace :full_search do
   task status: :environment do
     Rails.application.eager_load!
     FullSearch.sorted_models.each do |model|
-      stored = FullSearch::Index.stored_config_hash(model)
-      current = model.full_search_dsl.config_hash
-      status = (stored == current) ? "ok" : "stale"
-      source_fields = model.full_search_dsl.fields.select(&:source).map(&:name)
-
-      drift_info = if source_fields.any?
-        conn = ActiveRecord::Base.connection
-        qc = ->(name) { conn.quote_column_name(name) }
-        qt = ->(name) { conn.quote_table_name(name) }
-        empty_count = ActiveRecord::Base.connection.execute(<<~SQL).first["c"]
-          SELECT COUNT(*) AS c
-          FROM #{qt.call(FullSearch::Index.fts_table_name(model))}
-          WHERE #{source_fields.map { |c| "#{qc.call(c)} = ''" }.join(" OR ")}
-        SQL
-        " | empty source fields: #{empty_count}"
-      else
-        ""
-      end
-
-      trigger_info = FullSearch::Index.missing_triggers?(model) ? " | MISSING TRIGGERS" : ""
-
-      puts "#{model.table_name}: #{status}#{drift_info}#{trigger_info}"
+      puts "#{model.table_name}: #{FullSearch::Index.status(model)}"
     end
   end
 

metadata

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