activerecord-full_text_search 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c5deadfa80337621d1082bbd878ba261d2892c5021371d7f3b1d8a1ddf2f006
-  data.tar.gz: fdd8e1ed4bf501c13cfea20e1b02860c6e1c37e525a6052dfd766bb16bffc4fa
+  metadata.gz: 5bccc63fac75881da6efbc80e1281588f0091d6e227d11fd8335623366f720dd
+  data.tar.gz: 36440ad1275656da894a59ad1afb8f908e4fafb2070232f302161a2994a756b8
 SHA512:
-  metadata.gz: 60141c5d729d71ba3b4e44501ef8299438bef3c290fd034c6f5714f3d1b3a398ecc0be7c9ace074d24528019d86bddec2275c3103f4db7594a312866c8e5f7b9
-  data.tar.gz: 46e6d7c0d0e67a77ee514e7da5a229109cd62b6d32fdd00a7472fb86f7fc9e67b88181fe79e194cf2e756613f5343f2916de23866aa25b29b8b525ffaac65921
+  metadata.gz: 6d75a6e9c06fd2e609ebf27b4a041fff217b1f3207cbabab342da4011a06c7293bc84888483b063c9618b86fd6eb86af6ad2e91f760807a15a10450246657758
+  data.tar.gz: 7ab9fbaef688c03932c72661e60f74e9b4593bf5388f0b5a8727386a4408e16fcaf750f1603b609a67dce2f8b54314bad81f13b634de020e2cd6fe504ba5afec

data/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.3.0] - 2026-06-02
+
+- Add Rails 8.0 & 8.1 as known versions
+- Sort functions and triggers
+
 ## [0.2.0] - 2024-12-03
 
 - Add basic support for TRIGGERS

data/lib/active_record/full_text_search/7.2/postgresql_adapter.rb

@@ -15,15 +15,44 @@ module ActiveRecord
       def functions
         # List of functions in the current schema with their argument types, return type, language,  immutability, and body.
         # List only functions that don't depend on extensions.
+        # Functions are ordered by dependency depth (via pg_depend) so that dependencies come first.
         res = exec_query(<<-SQL.strip_heredoc, "SCHEMA")
+          WITH RECURSIVE
+            func_deps AS (
+              SELECT p.oid AS func_oid, dep_p.oid AS dep_func_oid
+              FROM pg_catalog.pg_proc p
+              JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace
+              JOIN pg_catalog.pg_depend fd ON fd.objid = p.oid AND fd.deptype = 'n'
+              JOIN pg_catalog.pg_proc dep_p ON dep_p.oid = fd.refobjid
+              JOIN pg_catalog.pg_namespace dep_n ON dep_n.oid = dep_p.pronamespace
+              WHERE n.nspname = ANY (current_schemas(false))
+                AND dep_n.nspname = ANY (current_schemas(false))
+                AND p.oid != dep_p.oid
+            ),
+            levels(oid, level) AS (
+              SELECT p.oid, 0
+              FROM pg_catalog.pg_proc p
+              JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace
+              WHERE n.nspname = ANY (current_schemas(false))
+                AND p.oid NOT IN (SELECT func_oid FROM func_deps)
+              UNION ALL
+              SELECT fd.func_oid, l.level + 1
+              FROM func_deps fd
+              JOIN levels l ON l.oid = fd.dep_func_oid
+            ),
+            max_levels AS (
+              SELECT oid, MAX(level) AS level FROM levels GROUP BY oid
+            )
           SELECT proname, pg_catalog.pg_get_function_arguments(p.oid) AS argtypes, pg_catalog.pg_get_function_result(p.oid) AS rettype, lanname, provolatile, prosrc
           FROM pg_catalog.pg_proc p
-          JOIN pg_catalog.pg_namespace n ON n.oid = pronamespace
-          JOIN pg_catalog.pg_language l ON l.oid = prolang
+          JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace
+          JOIN pg_catalog.pg_language l ON l.oid = p.prolang
           LEFT JOIN pg_catalog.pg_depend d ON d.objid = p.oid AND d.deptype = 'e'
           LEFT JOIN pg_catalog.pg_extension e ON e.oid = d.refobjid
+          JOIN max_levels ml ON ml.oid = p.oid
           WHERE n.nspname = ANY (current_schemas(false))
-            AND e.extname IS NULL;
+            AND e.extname IS NULL
+          ORDER BY ml.level, proname;
         SQL
 
         res.rows.each_with_object({}) do |(name, args, ret, lang, vol, src), memo|
@@ -49,7 +78,7 @@ module ActiveRecord
             -- || (CASE WHEN (tgtype::int::bit(7) & b'0100000')::int = 0 THEN '' ELSE ' truncate' END)
             AS tg_ops,
             CASE WHEN (tgtype::int::bit(7) & b'0000001')::int = 0 THEN 'statement' ELSE 'row' END as tg_foreach,
-            pg_get_expr(tgqual, tgrelid) AS tg_condition,
+            pg_get_triggerdef(t.oid, true) AS tg_definition,
             tgdeferrable,
             tginitdeferred
           FROM pg_catalog.pg_trigger t
@@ -60,11 +89,13 @@ module ActiveRecord
           LEFT JOIN pg_catalog.pg_extension e ON e.oid = d.refobjid
           WHERE n.nspname = ANY (current_schemas(false))
             AND tgisinternal = FALSE
-            AND e.extname IS NULL;
+            AND e.extname IS NULL
+          ORDER BY c.relname, tgname;
         SQL
 
-        res.rows.each_with_object({}) do |(name, table, function, timing, ops, for_each, condition, deferrable, initially_deferred), memo|
+        res.rows.each_with_object({}) do |(name, table, function, timing, ops, for_each, definition, deferrable, initially_deferred), memo|
           attributes = {table: table, function: function, for_each: for_each.to_sym}
+          condition = extract_trigger_condition(definition)
           attributes[:when] = condition if condition.present?
           attributes[timing.to_sym] = ops.strip.split(/\s+/).map(&:to_sym)
           attributes[:deferrable] = initially_deferred ? :initially_deferred : true if deferrable
@@ -150,6 +181,12 @@ module ActiveRecord
 
       private
 
+      def extract_trigger_condition(definition)
+        return unless definition
+
+        definition[/\bWHEN\s*\((.*)\)\s+EXECUTE\s+FUNCTION\b/m, 1]
+      end
+
       def options_to_hash(text)
         text.split(/\s*,\s*/).map { |s| s.strip.split(/\s+=\s+/) }.to_h.transform_values { |v| v[1..-2] }.transform_keys(&:to_sym)
       end

data/lib/active_record/full_text_search/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module FullTextSearch
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/active_record/full_text_search.rb

@@ -3,7 +3,15 @@ require "active_support/lazy_load_hooks"
 
 module ActiveRecord
   module FullTextSearch
-    KNOWN_VERSIONS = %w[7.2].map { |v| Gem::Version.new(v) }.freeze
+    KNOWN_VERSIONS = %w[7.2 8.0 8.1].map { |v| Gem::Version.new(v) }.freeze
+
+    # Maps a supported version to the directory containing its implementation.
+    # Versions that share an implementation point to the same directory.
+    VERSION_DIRECTORIES = {
+      Gem::Version.new("7.2") => "7.2",
+      Gem::Version.new("8.0") => "7.2",
+      Gem::Version.new("8.1") => "7.2",
+    }.freeze
 
     class << self
       attr_reader :enabled_version
@@ -39,7 +47,8 @@ module ActiveRecord
         require "active_record/full_text_search/command_recorder"
         require "active_record/full_text_search/schema_statements"
 
-        Dir[File.join(__dir__, "full_text_search", enabled_version.to_s, "*.rb")].each { |file| require file }
+        directory = VERSION_DIRECTORIES.fetch(enabled_version, enabled_version.to_s)
+        Dir[File.join(__dir__, "full_text_search", directory, "*.rb")].each { |file| require file }
         monkeypatches.keys.each { |patch| monkeypatches.delete(patch).call }
       end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-full_text_search
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Codeur SAS
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -85,7 +84,6 @@ metadata:
   changelog_uri: https://github.com/codeur/activerecord-full_text_search/blob/master/CHANGELOG.md
   pgp_keys_uri: https://keybase.io/codeur/pgp_keys.asc
   signatures_uri: https://keybase.pub/codeur/gems/
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,8 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Integrate PostgreSQL's FTS configs with Rails
 test_files: []