departure-next 6.7.1.pre.1 → 6.7.1.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c1d7cf38846a2dc5a98b2eba8f5e237339d260d2236016fad992269ce6663af
-  data.tar.gz: a5dc7e4de150b5899364f1705b7ea6fb2e1ebf4beda29d0431b1362220947085
+  metadata.gz: eb07f8bac571af6678ddf42ba37b0bafb8fabc1513ef7b7d7a93f6e54d4ec331
+  data.tar.gz: 800578f8114c7938e58c83ea2fa07500182446b6fe1ff07bd1f994b9f9d44d7f
 SHA512:
-  metadata.gz: fa7e89146d41e63afccb7b8e4ee2e0f310c3d6b6261393ca71b8f0ba289e61c8465a4b672460bfe0766927511b009629ea3b7cde4550e2ea9540d6c7a2cd4ed8
-  data.tar.gz: 5453515385df640e578a0a78a56b28ed8f7d7e3be9abbc0c295f3a5a93b0f38c24c871e88b43369fc17e357d6961b67abe733f20140ec90073927ad4bede61a0
+  metadata.gz: 6d4f66a78dd3af2f9087f4d0b29708eb31c61f5165ae61bb2bba11dcca1f282483dafbb9de4cd05498ce5576f3c9e2c3b1ec3b1426f863ea137be8fc03d098d3
+  data.tar.gz: 84dc1c70cd57f48906f4b405f6a65295eb74af00921d05f0b88292a16742408a52dae68e62634731f8f45e04a73e89654bbbbad60fc716b030a1320f7aa5533a

data/.rubocop.yml

@@ -6,7 +6,7 @@ require:
   - rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.1.x
 
 Metrics/AbcSize:
   Enabled: false

data/CHANGELOG.md

@@ -11,8 +11,10 @@ Please follow the format in [Keep a Changelog](http://keepachangelog.com/)
 - Create a `bin/rails` command that loads the database from the dummy application
 - Create a RailsAdapter that will handle creating connections inside of different versions of rails
 - Implement a Rails72DeparatureAdapater that handles the differences between Rails 7.2 and other rails versions
+- Implement a ActiveRecordMigratorWithAdvisoryLock for ActiveRecord versions 7.1 and 7.2 to prevent ConcurrentMigrationErrors
+- Implement a configuration option `disable_rails_advisory_lock_patch` to disable the ActiveRecordMigratorWithAdvisoryLock patch in our gem
 
-## [6.7.0] - 2024-02-20
+## [6.7.1.pre.2] - 2024-02-20
 
 - Flex mysql2 dependency to < 0.6 and bump version to 0.5.6
 - Drop support for older than the latest EOL Ruby (2.7) and Rails (6.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    departure-next (6.7.1.pre.1)
+    departure (6.7.1.pre.2)
       activerecord (>= 6.0.0, < 7.3.0, != 7.0.0)
       mysql2 (>= 0.4.0, < 0.6.0)
       railties (>= 6.0.0, < 7.3.0, != 7.0.0)
@@ -81,6 +81,8 @@ GEM
     minitest (5.22.2)
     mutex_m (0.2.0)
     mysql2 (0.5.6)
+    nokogiri (1.18.3-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.26.3)
@@ -188,7 +190,7 @@ DEPENDENCIES
   base64
   climate_control (~> 0.0.3)
   codeclimate-test-reporter (~> 1.0.3)
-  departure-next!
+  departure!
   lhm
   logger
   mutex_m

data/README.md

@@ -147,6 +147,14 @@ end
 It's strongly recommended to name it after this gems name, such as
 `config/initializers/departure.rb`
 
+### Configuration Options
+
+All configuration options are configurable from the `Departure.configure` block example below
+
+|Option|Default|What it Controls|
+|---|---|---|
+|disable_rails_advisory_lock_patch|false|When truthy, disables a patch in at least rails 7.1 and 7.2 where rails throws ConcurrentMigrationErrors due to the inability to release the advisory lock in migrations|
+
 ### Disable on per-migration basis
 
 Departure gem is enabled by default.

data/config.yml.erb

@@ -1,5 +1,5 @@
 username: <%= ENV['PERCONA_DB_USER'] || 'root' %>
-password: <%= ENV['PERCONA_DB_PASSWORD'] || '' %> 
+password: <%= ENV['PERCONA_DB_PASSWORD'] || 'password' %>
 database: <%= ENV['PERCONA_DB_NAME'] || 'departure_test' %> 
 hostname: <%= ENV['PERCONA_DB_HOST'] || 'localhost' %>
 socket: <%= ENV['PERCONA_DB_SOCKET'] || '' %>

data/departure.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q(pt-online-schema-change runner for ActiveRecord migrations)
   spec.description   = %q(Execute your ActiveRecord migrations with Percona's pt-online-schema-change. Formerly known as Percona Migrator.)
-  spec.homepage      = 'https://github.com/departurerb/departure'
+  spec.homepage      = 'https://github.com/austio/departure'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/gemfiles/rails_6_1.gemfile

@@ -1,10 +1,14 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
-gem 'rails', '6.1.7.6'
-gem 'rubocop', '~> 1.60.2', require: false
-gem 'rubocop-performance', '~> 1.20.2', require: false
+gem "base64"
+gem "codeclimate-test-reporter", "~> 1.0.3", group: :test, require: nil
+gem "lhm"
+gem "logger"
+gem "mutex_m", require: false
+gem "rubocop", "~> 1.74.0", require: false
+gem "rubocop-performance", "~> 1.20.2", require: false
+gem "rails", "6.1.7.6"
 
-gemspec path: '../'
+gemspec path: "../"

data/gemfiles/rails_6_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    departure (6.7.0)
+    departure (6.7.1.pre.2)
       activerecord (>= 6.0.0, < 7.3.0, != 7.0.0)
       mysql2 (>= 0.4.0, < 0.6.0)
       railties (>= 6.0.0, < 7.3.0, != 7.0.0)

data/gemfiles/rails_7_0.gemfile

@@ -1,10 +1,14 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
-gem 'rails', '7.0.8'
-gem 'rubocop', '~> 1.60.2', require: false
-gem 'rubocop-performance', '~> 1.20.2', require: false
+gem "base64"
+gem "codeclimate-test-reporter", "~> 1.0.3", group: :test, require: nil
+gem "lhm"
+gem "logger"
+gem "mutex_m", require: false
+gem "rubocop", "~> 1.74.0", require: false
+gem "rubocop-performance", "~> 1.20.2", require: false
+gem "rails", "7.0.8"
 
-gemspec path: '../'
+gemspec path: "../"

data/gemfiles/rails_7_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    departure (6.7.0)
+    departure (6.7.1.pre.2)
       activerecord (>= 6.0.0, < 7.3.0, != 7.0.0)
       mysql2 (>= 0.4.0, < 0.6.0)
       railties (>= 6.0.0, < 7.3.0, != 7.0.0)

data/gemfiles/rails_7_1.gemfile

@@ -1,10 +1,14 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
-gem 'rails', '7.1.3'
-gem 'rubocop', '~> 1.74.0', require: false
-gem 'rubocop-performance', '~> 1.20.2', require: false
+gem "base64"
+gem "codeclimate-test-reporter", "~> 1.0.3", group: :test, require: nil
+gem "lhm"
+gem "logger"
+gem "mutex_m", require: false
+gem "rubocop", "~> 1.74.0", require: false
+gem "rubocop-performance", "~> 1.20.2", require: false
+gem "rails", "7.1.3"
 
-gemspec path: '../'
+gemspec path: "../"

data/gemfiles/rails_7_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    departure (6.7.0)
+    departure (6.7.1.pre.2)
       activerecord (>= 6.0.0, < 7.3.0, != 7.0.0)
       mysql2 (>= 0.4.0, < 0.6.0)
       railties (>= 6.0.0, < 7.3.0, != 7.0.0)
@@ -196,7 +196,7 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.7.0)
+    rdoc (6.7.1.pre.2)
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     reline (0.5.9)

data/gemfiles/rails_7_2.gemfile

@@ -1,10 +1,14 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
-gem 'rails', '7.2.2.1'
-gem 'rubocop', '~> 1.74.0', require: false
-gem 'rubocop-performance', '~> 1.20.2', require: false
+gem "base64"
+gem "codeclimate-test-reporter", "~> 1.0.3", group: :test, require: nil
+gem "lhm"
+gem "logger"
+gem "mutex_m", require: false
+gem "rubocop", "~> 1.74.0", require: false
+gem "rubocop-performance", "~> 1.20.2", require: false
+gem "rails", "7.2.2.1"
 
-gemspec path: '../'
+gemspec path: "../"

data/gemfiles/rails_7_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    departure (6.7.0)
+    departure (6.7.1.pre.2)
       activerecord (>= 6.0.0, < 7.3.0, != 7.0.0)
       mysql2 (>= 0.4.0, < 0.6.0)
       railties (>= 6.0.0, < 7.3.0, != 7.0.0)

data/lib/active_record/connection_adapters/rails_7_2_departure_adapter.rb

@@ -184,7 +184,6 @@ module ActiveRecord
           with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
             sync_timezone_changes(conn)
             result = conn.query(sql)
-            # conn.abandon_results!
             verified! if allow_retry
             handle_warnings(sql)
             if result.is_a? Process::Status

data/lib/departure/command.rb

@@ -42,7 +42,7 @@ module Departure
     # execution status
     def run_in_process
       Open3.popen3(full_command) do |_stdin, stdout, _stderr, waith_thr|
-        begin
+        begin # rubocop:disable Style/RedundantBegin
           loop do
             IO.select([stdout])
             data = stdout.read_nonblock(8192)

data/lib/departure/configuration.rb

@@ -1,6 +1,7 @@
 module Departure
   class Configuration
-    attr_accessor :tmp_path, :global_percona_args, :enabled_by_default, :redirect_stderr
+    attr_accessor :tmp_path, :global_percona_args, :enabled_by_default, :redirect_stderr,
+                  :disable_rails_advisory_lock_patch
 
     def initialize
       @tmp_path = '.'.freeze

data/lib/departure/rails_adapter.rb

@@ -31,6 +31,12 @@ module Departure
             ActiveRecord::Migration.class_eval do
               include Departure::Migration
             end
+
+            if ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR == 1
+              require 'departure/rails_patches/active_record_migrator_with_advisory_lock_patch'
+
+              ActiveRecord::Migrator.prepend Departure::RailsPatches::ActiveRecordMigratorWithAdvisoryLockPatch
+            end
           end
         end
 
@@ -72,11 +78,14 @@ module Departure
       class << self
         def register_integrations
           require 'active_record/connection_adapters/rails_7_2_departure_adapter'
+          require 'departure/rails_patches/active_record_migrator_with_advisory_lock_patch'
 
           ActiveSupport.on_load(:active_record) do
             ActiveRecord::Migration.class_eval do
               include Departure::Migration
             end
+
+            ActiveRecord::Migrator.prepend Departure::RailsPatches::ActiveRecordMigratorWithAdvisoryLockPatch
           end
 
           ActiveRecord::ConnectionAdapters.register 'percona',

data/lib/departure/rails_patches/active_record_migrator_with_advisory_lock_patch.rb

@@ -0,0 +1,25 @@
+module Departure
+  module RailsPatches
+    module ActiveRecordMigratorWithAdvisoryLockPatch
+      RELEASE_LOCK_FAILED_MESSAGE = 'Failed to release advisory lock from ActiveRecordMigratorWithAdvisoryLockPatch'
+                                      .freeze
+
+      def with_advisory_lock
+        return super if Departure.configuration.disable_rails_advisory_lock_patch
+
+        lock_id = generate_migrator_advisory_lock_id
+        @__original_connection = connection
+
+        got_lock = @__original_connection.get_advisory_lock(lock_id)
+        raise ConcurrentMigrationError unless got_lock
+
+        load_migrated # reload schema_migrations to be sure it wasn't changed by another process before we got the lock
+        yield
+      ensure
+        if got_lock && !@__original_connection.release_advisory_lock(lock_id)
+          raise ConcurrentMigrationError, RELEASE_LOCK_FAILED_MESSAGE
+        end
+      end
+    end
+  end
+end

data/lib/departure/version.rb

@@ -1,3 +1,3 @@
 module Departure
-  VERSION = '6.7.1.pre.1'.freeze
+  VERSION = '6.7.1.pre.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: departure-next
 version: !ruby/object:Gem::Version
-  version: 6.7.1.pre.1
+  version: 6.7.1.pre.2
 platform: ruby
 authors:
 - Ilya Zayats
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -246,6 +246,7 @@ files:
 - lib/departure/null_logger.rb
 - lib/departure/option.rb
 - lib/departure/rails_adapter.rb
+- lib/departure/rails_patches/active_record_migrator_with_advisory_lock_patch.rb
 - lib/departure/railtie.rb
 - lib/departure/runner.rb
 - lib/departure/user_options.rb
@@ -255,7 +256,7 @@ files:
 - lib/lhm/column_with_sql.rb
 - lib/lhm/column_with_type.rb
 - test_database.rb
-homepage: https://github.com/departurerb/departure
+homepage: https://github.com/austio/departure
 licenses:
 - MIT
 metadata: {}
@@ -270,11 +271,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: pt-online-schema-change runner for ActiveRecord migrations