que-schema 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 539498be1f604e4c6c861625da853bc839f9180568e3711a80bba9d7eb307a74
-  data.tar.gz: e5af896433efb7f6f91eb5cafc09012286307b67b56b5ab186452a12437d05ef
+  metadata.gz: 71e681ea559a1c058ea2910f9dd669ac22500079b19f8cad80cc8ea9c9108de7
+  data.tar.gz: 88c4a69dd7d108cfd0350b8c139c1ba3eca6b441bc51350be533e081339dda72
 SHA512:
-  metadata.gz: 14ee67ec7ef19298088ea7ca10a3282dbf466f226acab5852308ae56c18f63e0ea32c035cc5333840e38729e2b2bed5459043198f1ba1f3742829118048f470b
-  data.tar.gz: adbc82bcb5fa30c7a10419920c1a98ee4cb045a603710c91a9384b6c7cb88a23c52784d11476c77a80c6a7361bb4fe2de5cfdcd5aa6debb2d00d207aca299b14
+  metadata.gz: 69245623ab1e91c6038acb67db62f17c6501143b1bc5e81889a9800f4d2e582794a058f8dfcabcc942483fbaf799f2eaf207c7f7a5e2a6a8ce2f7948fa6a6564
+  data.tar.gz: c1ee2e54d132b2696436e338f69106ae4d95849cc9f86350e132c7e3706a526f978093332ba57a2aae7901eed5894747a297998af22b4df4d8bd180ee76539bd

data/CHANGELOG.md

@@ -2,14 +2,14 @@
 
 
 
-## [0.1.4] - 2026-04-01
+## [0.1.6] - 2026-06-15
 
 ### Fixed
 
-- Foreign keys between Que-managed tables appearing in schema.rb (860ae38)
+- Schema dump no longer leaves stray blank lines where Que tables are suppressed (d99d5a7)
 
-## [0.1.3] - 2026-04-01
+## [0.1.5] - 2026-04-22
 
-### Added
+### Fixed
 
-- Automatic que-scheduler schema management when que-scheduler gem is present (2bf5b3b)
+- reenqueue_scheduler_if_missing no longer fires during db:schema:load (853d664)

data/Gemfile.lock

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

data/lib/que_schema/schema_dumper.rb

@@ -18,6 +18,17 @@ module QueSchema
       super
     end
 
+    # Exclude Que-managed tables from the dump. #table also guards against
+    # emitting their body, but ActiveRecord::SchemaDumper#tables emits an
+    # inter-table separator blank line for every entry in its list — so a
+    # table merely blanked by #table still leaves a stray blank line behind.
+    # Filtering here, before the list is built, keeps the output clean.
+    def ignored?(table_name)
+      return true if postgresql? && que_table?(table_name)
+
+      super
+    end
+
     # Suppress Que-managed tables — Que.migrate! recreates them during
     # schema load via que_define_schema.
     def table(table_name, stream)

data/lib/que_schema/schema_statements.rb

@@ -21,7 +21,6 @@ module QueSchema
       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.4"
+  VERSION = "0.1.6"
 end

data/spec/integration_spec.rb

@@ -74,4 +74,27 @@ RSpec.describe "QueSchema integration (round-trip)" do
     count = conn.execute("SELECT count(*) AS cnt FROM que_jobs")
     expect((count.first["cnt"] || count.first[:cnt]).to_i).to eq(1)
   end
+
+  it "does not leave stray blank lines where suppressed Que tables sort" do
+    c = conn
+    schema_context = Object.new.extend(QueSchema::SchemaStatements)
+    schema_context.define_singleton_method(:connection) { c }
+    schema_context.que_define_schema(version: 7)
+
+    # App tables bracketing the que_* tables alphabetically, so any separator
+    # left behind by a suppressed Que table lands between real tables.
+    conn.create_table(:apples, force: true) { |t| t.string :name }
+    conn.create_table(:zebras, force: true) { |t| t.string :name }
+
+    stream = StringIO.new
+    ActiveRecord::SchemaDumper.dump(pool, stream)
+    schema_rb = stream.string
+
+    # Rails separates tables with exactly one blank line. A suppressed table
+    # must not leave its inter-table separator behind as consecutive blanks.
+    expect(schema_rb).not_to match(/\n[ \t]*\n[ \t]*\n/)
+  ensure
+    conn.drop_table(:apples, if_exists: true)
+    conn.drop_table(:zebras, if_exists: true)
+  end
 end

data/spec/schema_dumper_spec.rb

@@ -26,7 +26,11 @@ RSpec.describe QueSchema::SchemaDumper do
         stream.puts "  end"
       end
 
-      private :tables, :table
+      def ignored?(table_name)
+        false
+      end
+
+      private :tables, :table, :ignored?
     end
   end
 
@@ -146,6 +150,31 @@ RSpec.describe QueSchema::SchemaDumper do
     end
   end
 
+  describe "#ignored?" do
+    context "when PostgreSQL" do
+      before { stub_postgresql! }
+
+      it "ignores Que-managed tables so they leave no separator behind" do
+        expect(dumper.send(:ignored?, "que_jobs")).to be true
+      end
+
+      it "delegates non-que tables to super" do
+        expect(dumper.send(:ignored?, "users")).to be false
+      end
+    end
+
+    context "when not PostgreSQL" do
+      before do
+        allow(connection).to receive(:adapter_name).and_return("SQLite")
+        allow(connection).to receive(:respond_to?).with(:adapter_name).and_return(true)
+      end
+
+      it "does not ignore que_* tables" do
+        expect(dumper.send(:ignored?, "que_jobs")).to be false
+      end
+    end
+  end
+
   describe "#foreign_keys" do
     context "when PostgreSQL" do
       before { stub_postgresql! }
@@ -191,9 +220,9 @@ RSpec.describe QueSchema::SchemaDumper do
   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') }
+    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!
@@ -212,8 +241,8 @@ RSpec.describe QueSchema::SchemaDumper do
   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') }
+    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!

data/spec/schema_statements_spec.rb

@@ -90,10 +90,10 @@ RSpec.describe QueSchema::SchemaStatements do
         expect(Que::Scheduler::Migrations.migrate_called_with).to eq(8)
       end
 
-      it "calls reenqueue_scheduler_if_missing" do
+      it "does not call reenqueue_scheduler_if_missing during schema load" do
         instance.que_define_schema(version: 7)
 
-        expect(Que::Scheduler::Migrations.reenqueue_called).to be true
+        expect(Que::Scheduler::Migrations.reenqueue_called).to be_nil
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: que-schema
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 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.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Enables schema.rb compatibility for the que job queue gem
 test_files: []