pgbus 0.16.7 → 0.17.0

data/lib/pgbus/pgmq_schema.rb

@@ -14,6 +14,7 @@ module Pgbus
     class VersionNotFoundError < Pgbus::Error; end
 
     SCHEMA_DIR = File.expand_path("pgmq_schema", __dir__).freeze
+    FIXUPS_DIR = File.join(SCHEMA_DIR, "fixups").freeze
 
     class << self
       # Returns the latest vendored PGMQ version string.
@@ -23,9 +24,37 @@ module Pgbus
 
       # Returns sorted list of all vendored PGMQ versions.
       def available_versions
-        Dir.glob(File.join(SCHEMA_DIR, "pgmq_v*.sql"))
-           .map { |f| File.basename(f).match(/pgmq_v(.+)\.sql/)[1] }
-           .sort_by { |v| Gem::Version.new(v) }
+        versions_in(SCHEMA_DIR)
+      end
+
+      # Versions that ship a table fixup, in version order.
+      #
+      # An upgrade drops every pgmq function and composite type and re-runs the
+      # target version's schema, which recreates both — but never touches an
+      # existing table. An upstream hop that ALTERs one (1.13.0 moves
+      # partitioned queues' msg_id from GENERATED ALWAYS to BY DEFAULT) needs
+      # its own step, and that is what these files are.
+      def fixup_versions
+        versions_in(FIXUPS_DIR)
+      end
+
+      # Concatenated fixups for every version in (after, upto], in version
+      # order. Returns "" when the hop crosses none.
+      #
+      # @param after [String, nil] the installed version; nil (no recorded
+      #   version) applies every fixup up to the target, which is safe because
+      #   each one is idempotent.
+      # @param upto [String] the version being upgraded to
+      def fixups_sql(after:, upto: latest_version)
+        ceiling = Gem::Version.new(upto)
+        floor = after && Gem::Version.new(after)
+
+        applicable = fixup_versions.select do |version|
+          candidate = Gem::Version.new(version)
+          candidate <= ceiling && (floor.nil? || candidate > floor)
+        end
+
+        applicable.map { |version| File.read(File.join(FIXUPS_DIR, "pgmq_v#{version}.sql")) }.join("\n")
       end
 
       # Returns the filesystem path to the vendored SQL file for a given version.
@@ -177,6 +206,15 @@ module Pgbus
 
       private
 
+      # Vendored versions discovered in a directory, in version order. Schema
+      # files and fixups share this so the two can never drift into different
+      # discovery rules.
+      def versions_in(dir)
+        Dir.glob(File.join(dir, "pgmq_v*.sql"))
+           .map { |f| File.basename(f).match(/pgmq_v(.+)\.sql/)[1] }
+           .sort_by { |v| Gem::Version.new(v) }
+      end
+
       # Strips extension-specific blocks (pg_extension_config_dump, pg_depend checks)
       # that only work when pgmq is installed as an extension.
       def strip_extension_only_blocks(sql)

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.16.7"
+  VERSION = "0.17.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.16.7
+  version: 0.17.0
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -343,9 +343,11 @@ files:
 - lib/pgbus/outbox.rb
 - lib/pgbus/outbox/poller.rb
 - lib/pgbus/pgmq_schema.rb
+- lib/pgbus/pgmq_schema/fixups/pgmq_v1.13.0.sql
 - lib/pgbus/pgmq_schema/pgmq_v1.11.0.sql
 - lib/pgbus/pgmq_schema/pgmq_v1.11.1.sql
 - lib/pgbus/pgmq_schema/pgmq_v1.12.0.sql
+- lib/pgbus/pgmq_schema/pgmq_v1.13.0.sql
 - lib/pgbus/process/consumer.rb
 - lib/pgbus/process/consumer_priority.rb
 - lib/pgbus/process/dispatcher.rb