que-schema 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71ca08a2b1ad3fc910bf8fd6ae9a0b5fa86458ee8dccbd1b52f303423df1540
-  data.tar.gz: 940685472b0247d15d013e345d234775230c0a45e55f685386040eea618b2d50
+  metadata.gz: 539498be1f604e4c6c861625da853bc839f9180568e3711a80bba9d7eb307a74
+  data.tar.gz: e5af896433efb7f6f91eb5cafc09012286307b67b56b5ab186452a12437d05ef
 SHA512:
-  metadata.gz: 1a98ce1e87b13f293474f8d294854edee91f85c66e1a5cc172039ba59f3b174c02f9f95e18cfe0a650014081018cec8ba576b2e62e22632a2e8a91c7f0e586b2
-  data.tar.gz: d4780708ca8767222b797aef3f047158889e5cbce54d3e3264d16bd4544baef819d3733e2534bca69739ce2339f1fe9e6e0cab87c5815a1e0c0626ce220500dd
+  metadata.gz: 14ee67ec7ef19298088ea7ca10a3282dbf466f226acab5852308ae56c18f63e0ea32c035cc5333840e38729e2b2bed5459043198f1ba1f3742829118048f470b
+  data.tar.gz: adbc82bcb5fa30c7a10419920c1a98ee4cb045a603710c91a9384b6c7cb88a23c52784d11476c77a80c6a7361bb4fe2de5cfdcd5aa6debb2d00d207aca299b14

data/CHANGELOG.md

@@ -2,22 +2,14 @@
 
 
 
-## [0.1.2] - 2026-03-09
-
-### Added
-
-- Suppress Que-managed functions and triggers in schema dump (629c074)
+## [0.1.4] - 2026-04-01
 
 ### Fixed
 
-- Duplicate trigger errors during db:schema:load (629c074)
-
-### Changed
+- Foreign keys between Que-managed tables appearing in schema.rb (860ae38)
 
-- SchemaDumper prepend timing for correct ancestor order (629c074)
+## [0.1.3] - 2026-04-01
 
-## [0.1.1] - 2026-03-09
-
-### Fixed
+### Added
 
-- Schema dumper suppressing que_scheduler_* tables (1669e0d)
+- Automatic que-scheduler schema management when que-scheduler gem is present (2bf5b3b)

data/Gemfile.lock

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

data/lib/que_schema/schema_dumper.rb

@@ -44,7 +44,8 @@ module QueSchema
     end
 
     # Only objects created by Que.migrate! — other que_*
-    # objects (e.g. que_scheduler_*) belong to separate gems.
+    # objects (e.g. que_scheduler_*) belong to separate gems
+    # unless que-schema manages them too.
     QUE_MANAGED_TABLES = %w[
       que_jobs que_lockers que_values
     ].freeze
@@ -58,16 +59,50 @@ module QueSchema
       que_job_notify que_state_notify
     ].freeze
 
+    QUE_SCHEDULER_TABLES = %w[
+      que_scheduler_audit que_scheduler_audit_enqueued
+    ].freeze
+
+    QUE_SCHEDULER_FUNCTIONS = %w[
+      que_scheduler_check_job_exists
+      que_scheduler_prevent_job_deletion
+    ].freeze
+
+    QUE_SCHEDULER_TRIGGERS = %w[
+      que_scheduler_prevent_job_deletion_trigger
+    ].freeze
+
+    def que_scheduler?
+      defined?(Que::Scheduler::Migrations)
+    end
+
     def que_table?(table_name)
-      QUE_MANAGED_TABLES.include?(table_name)
+      return true if QUE_MANAGED_TABLES.include?(table_name)
+      return true if que_scheduler? && QUE_SCHEDULER_TABLES.include?(table_name)
+
+      false
     end
 
     def que_function?(name)
-      QUE_MANAGED_FUNCTIONS.include?(name.to_s)
+      return true if QUE_MANAGED_FUNCTIONS.include?(name.to_s)
+      return true if que_scheduler? && QUE_SCHEDULER_FUNCTIONS.include?(name.to_s)
+
+      false
     end
 
     def que_trigger?(name)
-      QUE_MANAGED_TRIGGERS.include?(name.to_s)
+      return true if QUE_MANAGED_TRIGGERS.include?(name.to_s)
+      return true if que_scheduler? && QUE_SCHEDULER_TRIGGERS.include?(name.to_s)
+
+      false
+    end
+
+    # Suppress foreign keys between Que-managed tables —
+    # Que.migrate! / scheduler migrations recreate them.
+    def foreign_keys(table, stream)
+      return if postgresql? && que_table?(table.to_s)
+
+      super
     end
 
     # Override Fx::SchemaDumper methods to filter out

data/lib/que_schema/schema_statements.rb

@@ -14,6 +14,14 @@ module QueSchema
 
       Que.connection_proc = proc { |&block| block.call(connection.raw_connection) }
       Que.migrate!(version: version.to_i)
+      apply_que_scheduler_schema
+    end
+
+    def apply_que_scheduler_schema
+      return unless defined?(Que::Scheduler::Migrations)
+
+      Que::Scheduler::Migrations.migrate!(version: Que::Scheduler::Migrations::MAX_VERSION)
+      Que::Scheduler::Migrations.reenqueue_scheduler_if_missing
     end
 
     private

data/lib/que_schema/version.rb

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

data/spec/schema_dumper_spec.rb

@@ -146,6 +146,26 @@ RSpec.describe QueSchema::SchemaDumper do
     end
   end
 
+  describe "#foreign_keys" do
+    context "when PostgreSQL" do
+      before { stub_postgresql! }
+
+      it "suppresses foreign keys on que_jobs" do
+        stream = StringIO.new
+        dumper.send(:foreign_keys, "que_jobs", stream)
+        expect(stream.string).to be_empty
+      end
+
+      it "passes app tables through to super" do
+        stream = StringIO.new
+        expect { dumper.send(:foreign_keys, "users", stream) }
+          .to raise_error(NoMethodError, /super/)
+        # Raises because the test double has no real superclass —
+        # confirms the method delegates rather than suppressing.
+      end
+    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|
@@ -228,6 +248,112 @@ RSpec.describe QueSchema::SchemaDumper do
     end
   end
 
+  context "when que-scheduler is present" do
+    before do
+      stub_const("Que::Scheduler::Migrations", double("Migrations"))
+    end
+
+    describe "#que_table?" do
+      it "suppresses que_scheduler tables" do
+        expect(dumper.send(:que_table?, "que_scheduler_audit")).to be true
+        expect(dumper.send(:que_table?, "que_scheduler_audit_enqueued")).to be true
+      end
+
+      it "still suppresses core que tables" do
+        expect(dumper.send(:que_table?, "que_jobs")).to be true
+      end
+
+      it "does not suppress non-que tables" do
+        expect(dumper.send(:que_table?, "users")).to be false
+      end
+    end
+
+    describe "#que_function?" do
+      it "suppresses que_scheduler functions" do
+        expect(dumper.send(:que_function?, "que_scheduler_check_job_exists")).to be true
+        expect(dumper.send(:que_function?, "que_scheduler_prevent_job_deletion")).to be true
+      end
+
+      it "still suppresses core que functions" do
+        expect(dumper.send(:que_function?, "que_job_notify")).to be true
+      end
+    end
+
+    describe "#que_trigger?" do
+      it "suppresses que_scheduler triggers" do
+        expect(dumper.send(:que_trigger?, "que_scheduler_prevent_job_deletion_trigger")).to be true
+      end
+
+      it "still suppresses core que triggers" do
+        expect(dumper.send(:que_trigger?, "que_job_notify")).to be true
+      end
+    end
+
+    describe "#table" do
+      before { stub_postgresql! }
+
+      it "suppresses que_scheduler_audit" do
+        stream = StringIO.new
+        dumper.send(:table, "que_scheduler_audit", stream)
+        expect(stream.string).to be_empty
+      end
+    end
+
+    describe "#functions" do
+      before do
+        stub_postgresql!
+        stub_const("Fx", double("Fx", database: double(functions: [
+          double("function", name: "que_scheduler_check_job_exists", to_schema: "  create_function :que_scheduler_check_job_exists"),
+          double("function", name: "my_app_function", to_schema: "  create_function :my_app_function")
+        ])))
+      end
+
+      it "filters out que_scheduler functions" do
+        stream = StringIO.new
+        dumper.send(:functions, stream)
+        output = stream.string
+
+        expect(output).not_to include("que_scheduler_check_job_exists")
+        expect(output).to include("my_app_function")
+      end
+    end
+
+    describe "#triggers" do
+      before do
+        stub_postgresql!
+        stub_const("Fx", double("Fx", database: double(triggers: [
+          double("trigger", name: "que_scheduler_prevent_job_deletion_trigger", to_schema: "  create_trigger :que_scheduler_prevent_job_deletion_trigger"),
+          double("trigger", name: "my_app_trigger", to_schema: "  create_trigger :my_app_trigger")
+        ])))
+      end
+
+      it "filters out que_scheduler triggers" do
+        stream = StringIO.new
+        dumper.send(:triggers, stream)
+        output = stream.string
+
+        expect(output).not_to include("que_scheduler_prevent_job_deletion_trigger")
+        expect(output).to include("my_app_trigger")
+      end
+    end
+
+    describe "#foreign_keys" do
+      before { stub_postgresql! }
+
+      it "suppresses foreign keys on que_scheduler tables" do
+        stream = StringIO.new
+        dumper.send(:foreign_keys, "que_scheduler_audit_enqueued", stream)
+        expect(stream.string).to be_empty
+      end
+
+      it "suppresses foreign keys on core que tables" do
+        stream = StringIO.new
+        dumper.send(:foreign_keys, "que_jobs", stream)
+        expect(stream.string).to be_empty
+      end
+    end
+  end
+
   describe "#que_schema_version (private)" do
     it "returns the version from the table comment" do
       allow(connection).to receive(:table_exists?).with("que_jobs").and_return(true)

data/spec/schema_statements_spec.rb

@@ -64,6 +64,46 @@ RSpec.describe QueSchema::SchemaStatements do
     end
   end
 
+  describe "que-scheduler integration" do
+    context "when Que::Scheduler::Migrations is defined" do
+      before do
+        scheduler_mod = Module.new do
+          class << self
+            attr_accessor :migrate_called_with, :reenqueue_called
+
+            def migrate!(version:)
+              self.migrate_called_with = version
+            end
+
+            def reenqueue_scheduler_if_missing
+              self.reenqueue_called = true
+            end
+          end
+        end
+        scheduler_mod.const_set(:MAX_VERSION, 8)
+        stub_const("Que::Scheduler::Migrations", scheduler_mod)
+      end
+
+      it "calls Que::Scheduler::Migrations.migrate! with MAX_VERSION" do
+        instance.que_define_schema(version: 7)
+
+        expect(Que::Scheduler::Migrations.migrate_called_with).to eq(8)
+      end
+
+      it "calls reenqueue_scheduler_if_missing" do
+        instance.que_define_schema(version: 7)
+
+        expect(Que::Scheduler::Migrations.reenqueue_called).to be true
+      end
+    end
+
+    context "when Que::Scheduler::Migrations is not defined" do
+      it "does not raise an error" do
+        expect { instance.que_define_schema(version: 7) }.not_to raise_error
+      end
+    end
+  end
+
   describe "#postgresql? (private)" do
     it "returns false when no connection method exists" do
       obj = Object.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: que-schema
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Jim Gay
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Enables schema.rb compatibility for the que job queue gem
 test_files: []