que-schema 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4438db2533fe5a222835a08cb3ba75791ee157b1b87753fcd304dc1c70bf4749
-  data.tar.gz: 2c4136d7b17cf7905b87b8496b609e0d79b6e510c0f3c32ea19076e8f1961aa1
+  metadata.gz: b71ca08a2b1ad3fc910bf8fd6ae9a0b5fa86458ee8dccbd1b52f303423df1540
+  data.tar.gz: 940685472b0247d15d013e345d234775230c0a45e55f685386040eea618b2d50
 SHA512:
-  metadata.gz: 6f42bf02fd3c6de18f3110ebc8315b053d78ee693861d3debd750ad6a6e2387536f4168c63fb6c509a517d36b5ae506bf6e0c746b94f96db8d598bfe34e63efd
-  data.tar.gz: 39e649e71e5d217345bb29e078c020d8c3f63da926dd587ee1ede1f310a6f93435bd889854efa69504837741abd4c716b46fa850570bd28a0e32fa9d015dff99
+  metadata.gz: 1a98ce1e87b13f293474f8d294854edee91f85c66e1a5cc172039ba59f3b174c02f9f95e18cfe0a650014081018cec8ba576b2e62e22632a2e8a91c7f0e586b2
+  data.tar.gz: d4780708ca8767222b797aef3f047158889e5cbce54d3e3264d16bd4544baef819d3733e2534bca69739ce2339f1fe9e6e0cab87c5815a1e0c0626ce220500dd

data/CHANGELOG.md

@@ -2,14 +2,22 @@
 
 
 
-## [0.1.1] - 2026-03-09
+## [0.1.2] - 2026-03-09
+
+### Added
+
+- Suppress Que-managed functions and triggers in schema dump (629c074)
 
 ### Fixed
 
-- Schema dumper suppressing que_scheduler_* tables (1669e0d)
+- Duplicate trigger errors during db:schema:load (629c074)
 
-## [0.1.0] - 2026-03-09
+### Changed
 
-### Added
+- SchemaDumper prepend timing for correct ancestor order (629c074)
 
-- Schema dump/load support for Que via ActiveRecord integration (0aa34d1)
+## [0.1.1] - 2026-03-09
+
+### Fixed
+
+- Schema dumper suppressing que_scheduler_* tables (1669e0d)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    que-schema (0.1.1)
+    que-schema (0.1.2)
       activerecord (>= 6.0)
       que
       railties (>= 6.0)

data/lib/que_schema/railtie.rb

@@ -7,8 +7,14 @@ module QueSchema
         ActiveRecord::Migration.include(QueSchema::SchemaStatements)
         ActiveRecord::Migration.include(QueSchema::MigrationHelpers)
         ActiveRecord::Schema.include(QueSchema::SchemaStatements)
-        ActiveRecord::SchemaDumper.prepend(QueSchema::SchemaDumper)
       end
     end
+
+    # Prepend SchemaDumper after initialization so it sits
+    # above Fx/Scenic in the ancestor chain and can filter
+    # out Que-managed functions and triggers.
+    config.after_initialize do
+      ActiveRecord::SchemaDumper.prepend(QueSchema::SchemaDumper)
+    end
   end
 end

data/lib/que_schema/schema_dumper.rb

@@ -7,13 +7,15 @@ module QueSchema
     private
 
     def tables(stream)
-      super
-
+      # Emit que_define_schema before tables so Que objects
+      # exist when later functions/triggers reference them.
       if postgresql? && (version = que_schema_version) && version > 0
         stream.puts "  # Que internal schema — emitted by que-schema gem"
         stream.puts "  que_define_schema(version: #{version})"
         stream.puts
       end
+
+      super
     end
 
     # Suppress Que-managed tables — Que.migrate! recreates them during
@@ -41,12 +43,51 @@ module QueSchema
       @connection.respond_to?(:adapter_name) && @connection.adapter_name.match?(/postgresql/i)
     end
 
-    # Only tables created by Que.migrate! — other que_* tables
-    # (e.g. que_scheduler_*) belong to separate gems.
-    QUE_MANAGED_TABLES = %w[que_jobs que_lockers que_values].freeze
+    # Only objects created by Que.migrate! — other que_*
+    # objects (e.g. que_scheduler_*) belong to separate gems.
+    QUE_MANAGED_TABLES = %w[
+      que_jobs que_lockers que_values
+    ].freeze
+
+    QUE_MANAGED_FUNCTIONS = %w[
+      que_validate_tags que_determine_job_state
+      que_job_notify que_state_notify
+    ].freeze
+
+    QUE_MANAGED_TRIGGERS = %w[
+      que_job_notify que_state_notify
+    ].freeze
 
     def que_table?(table_name)
       QUE_MANAGED_TABLES.include?(table_name)
     end
+
+    def que_function?(name)
+      QUE_MANAGED_FUNCTIONS.include?(name.to_s)
+    end
+
+    def que_trigger?(name)
+      QUE_MANAGED_TRIGGERS.include?(name.to_s)
+    end
+
+    # Override Fx::SchemaDumper methods to filter out
+    # Que-managed objects when Fx is present.
+    def functions(stream)
+      return super unless postgresql? && defined?(::Fx)
+
+      dumpable = Fx.database.functions
+        .reject { |f| que_function?(f.name) }
+      dumpable.each { |f| stream.puts(f.to_schema) }
+      stream.puts if dumpable.any?
+    end
+
+    def triggers(stream)
+      return super unless postgresql? && defined?(::Fx)
+
+      dumpable = Fx.database.triggers
+        .reject { |t| que_trigger?(t.name) }
+      stream.puts if dumpable.any?
+      dumpable.each { |t| stream.puts(t.to_schema) }
+    end
   end
 end

data/lib/que_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module QueSchema
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/schema_dumper_spec.rb

@@ -45,14 +45,14 @@ RSpec.describe QueSchema::SchemaDumper do
         allow(connection).to receive(:execute).and_return([{"comment" => "7"}])
       end
 
-      it "emits que_define_schema after tables" do
+      it "emits que_define_schema before tables" do
         stream = StringIO.new
         dumper.send(:tables, stream)
         output = stream.string
 
         expect(output).to include("que_define_schema(version: 7)")
         expect(output).to include("# original tables output")
-        expect(output.index("que_define_schema")).to be > output.index("original tables")
+        expect(output.index("que_define_schema")).to be < output.index("original tables")
       end
     end
 
@@ -146,6 +146,70 @@ RSpec.describe QueSchema::SchemaDumper do
     end
   end
 
+  describe "#que_function? (private)" do
+    it "returns true for Que-managed functions" do
+      %w[que_validate_tags que_determine_job_state que_job_notify que_state_notify].each do |name|
+        expect(dumper.send(:que_function?, name)).to be true
+      end
+    end
+
+    it "returns false for functions from other que_* gems" do
+      expect(dumper.send(:que_function?, "que_scheduler_check_job_exists")).to be false
+      expect(dumper.send(:que_function?, "que_scheduler_prevent_job_deletion")).to be false
+    end
+  end
+
+  describe "#que_trigger? (private)" do
+    it "returns true for Que-managed triggers" do
+      expect(dumper.send(:que_trigger?, "que_job_notify")).to be true
+      expect(dumper.send(:que_trigger?, "que_state_notify")).to be true
+    end
+
+    it "returns false for triggers from other que_* gems" do
+      expect(dumper.send(:que_trigger?, "que_scheduler_prevent_job_deletion_trigger")).to be false
+    end
+  end
+
+  describe "#functions (private)" do
+    let(:que_fn) { double("function", name: "que_job_notify", to_schema: '  create_function :que_job_notify') }
+    let(:app_fn) { double("function", name: "my_app_function", to_schema: '  create_function :my_app_function') }
+    let(:scheduler_fn) { double("function", name: "que_scheduler_check_job_exists", to_schema: '  create_function :que_scheduler_check_job_exists') }
+
+    before do
+      stub_postgresql!
+      stub_const("Fx", double("Fx", database: double(functions: [que_fn, app_fn, scheduler_fn])))
+    end
+
+    it "filters out Que-managed functions" do
+      stream = StringIO.new
+      dumper.send(:functions, stream)
+      output = stream.string
+
+      expect(output).not_to include("que_job_notify")
+      expect(output).to include("my_app_function")
+      expect(output).to include("que_scheduler_check_job_exists")
+    end
+  end
+
+  describe "#triggers (private)" do
+    let(:que_trigger) { double("trigger", name: "que_job_notify", to_schema: '  create_trigger :que_job_notify') }
+    let(:app_trigger) { double("trigger", name: "que_scheduler_prevent_job_deletion_trigger", to_schema: '  create_trigger :que_scheduler_prevent_job_deletion_trigger') }
+
+    before do
+      stub_postgresql!
+      stub_const("Fx", double("Fx", database: double(triggers: [que_trigger, app_trigger])))
+    end
+
+    it "filters out Que-managed triggers" do
+      stream = StringIO.new
+      dumper.send(:triggers, stream)
+      output = stream.string
+
+      expect(output).not_to include("que_job_notify")
+      expect(output).to include("que_scheduler_prevent_job_deletion_trigger")
+    end
+  end
+
   describe "#que_table? (private)" do
     it "returns true for Que-managed tables" do
       expect(dumper.send(:que_table?, "que_jobs")).to be true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: que-schema
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jim Gay