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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f14fb32023a58be4d0def6f553b67e7a59ecfa92e5319c66770f3c65ecbf22
-  data.tar.gz: efee701ec70d435ed75b12e136c971d88f5bdf317739a5d7d196a1a6106ee363
+  metadata.gz: eb07f8bac571af6678ddf42ba37b0bafb8fabc1513ef7b7d7a93f6e54d4ec331
+  data.tar.gz: 800578f8114c7938e58c83ea2fa07500182446b6fe1ff07bd1f994b9f9d44d7f
 SHA512:
-  metadata.gz: 7260d9268841719e1c0f0345907492f4fef64769e201d6f5a1ef7a3d8dc7a38d7d2add7654996f1e9436db5db62d5faafd4c493ec884f357e97a1b82863fa9b7
-  data.tar.gz: 99c83d3d9415b0a54483ec5ba726cf5c93cc2559a682d977a6784c24af91fdad9552601c63b0ec660ba55f6c446e1e90e37c78a494d9d5ed86edf6754fa0d08c
+  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

@@ -7,5 +7,5 @@ gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
 gem 'lhm'
 gem 'logger'
 gem 'mutex_m', require: false
-gem 'rubocop', '~> 1.60.2', require: false
+gem 'rubocop', '~> 1.74.0', require: false
 gem 'rubocop-performance', '~> 1.20.2', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    departure-next (6.7.1.pre.pre)
+    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)
@@ -48,7 +48,7 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.6)
-    builder (3.3.0)
+    builder (3.2.4)
     byebug (11.1.3)
     climate_control (0.0.4)
       activesupport (>= 3.0)
@@ -58,64 +58,61 @@ GEM
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
-    date (3.4.1)
     diff-lcs (1.5.1)
     docile (1.1.5)
     drb (2.2.0)
       ruby2_keywords
-    erubi (1.13.1)
+    erubi (1.12.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.0)
-    irb (1.15.1)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
+    io-console (0.7.2)
+    irb (1.11.2)
+      rdoc
       reline (>= 0.4.2)
-    json (2.7.1)
-    language_server-protocol (3.17.0.3)
+    json (2.10.2)
+    language_server-protocol (3.17.0.4)
     lhm (2.2.0)
+    lint_roller (1.1.0)
     logger (1.6.6)
-    loofah (2.24.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     method_source (1.0.0)
     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.24.0)
-    parser (3.3.0.5)
+    parallel (1.26.3)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    psych (5.2.3)
-      date
+    psych (5.1.2)
       stringio
-    racc (1.7.3)
-    rack (3.1.11)
-    rack-session (2.1.0)
-      base64 (>= 0.1.0)
+    racc (1.8.1)
+    rack (3.0.9)
+    rack-session (2.0.0)
       rack (>= 3.0.0)
-    rack-test (2.2.0)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (2.2.1)
+    rackup (2.1.0)
       rack (>= 3)
+      webrick (~> 1.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
+    rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+      nokogiri (~> 1.14)
     railties (7.1.3)
       actionpack (= 7.1.3)
       activesupport (= 7.1.3)
@@ -126,12 +123,11 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.1.0)
-    rdoc (6.12.0)
+    rdoc (6.6.2)
       psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.6.0)
+    regexp_parser (2.10.0)
+    reline (0.4.2)
       io-console (~> 0.5)
-    rexml (3.2.6)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -148,19 +144,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.0)
-    rubocop (1.60.2)
+    rubocop (1.74.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.39.0)
+      parser (>= 3.3.1.0)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
@@ -171,13 +167,16 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    stringio (3.1.5)
+    stringio (3.1.0)
     thor (1.3.0)
-    timeout (0.4.3)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    zeitwerk (2.6.18)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    webrick (1.8.1)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-21
@@ -191,7 +190,7 @@ DEPENDENCIES
   base64
   climate_control (~> 0.0.3)
   codeclimate-test-reporter (~> 1.0.3)
-  departure-next!
+  departure!
   lhm
   logger
   mutex_m
@@ -199,7 +198,7 @@ DEPENDENCIES
   rake (>= 10.0)
   rspec (~> 3.4, >= 3.4.0)
   rspec-its (~> 1.2)
-  rubocop (~> 1.60.2)
+  rubocop (~> 1.74.0)
   rubocop-performance (~> 1.20.2)
 
 BUNDLED WITH

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/{departure-next.gemspec → 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.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.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)
@@ -114,7 +114,8 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.7.2)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -143,7 +144,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.25.1)
+    parallel (1.26.3)
     parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
@@ -195,13 +196,11 @@ 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.9.2)
+    regexp_parser (2.10.0)
     reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.3.0)
-      strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -218,18 +217,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.60.2)
+    rubocop (1.74.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.39.0)
       parser (>= 3.3.1.0)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
@@ -241,12 +240,13 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     stringio (3.1.1)
-    strscan (3.1.0)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
@@ -267,7 +267,7 @@ DEPENDENCIES
   rake (>= 10.0)
   rspec (~> 3.4, >= 3.4.0)
   rspec-its (~> 1.2)
-  rubocop (~> 1.60.2)
+  rubocop (~> 1.74.0)
   rubocop-performance (~> 1.20.2)
 
 BUNDLED WITH

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.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.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)
@@ -114,6 +114,7 @@ GEM
       reline (>= 0.4.2)
     json (2.10.1)
     language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
     logger (1.6.6)
     loofah (2.24.0)
       crass (~> 1.0.2)
@@ -201,7 +202,6 @@ GEM
     regexp_parser (2.10.0)
     reline (0.6.0)
       io-console (~> 0.5)
-    rexml (3.4.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -218,17 +218,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.60.2)
+    rubocop (1.74.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.38.1)
       parser (>= 3.3.1.0)
     rubocop-performance (1.20.2)
@@ -246,7 +246,9 @@ GEM
     timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     useragent (0.16.11)
     websocket-driver (0.7.7)
       base64
@@ -267,7 +269,7 @@ DEPENDENCIES
   rake (>= 10.0)
   rspec (~> 3.4, >= 3.4.0)
   rspec-its (~> 1.2)
-  rubocop (~> 1.60.2)
+  rubocop (~> 1.74.0)
   rubocop-performance (~> 1.20.2)
 
 BUNDLED WITH

data/lib/active_record/connection_adapters/percona_adapter.rb

@@ -5,7 +5,6 @@ require 'active_record/connection_adapters/patch_connection_handling'
 require 'active_support/core_ext/string/filters'
 require 'departure'
 require 'forwardable'
-require_relative './patch_connection_handling'
 
 module ActiveRecord
   module ConnectionAdapters

data/lib/active_record/connection_adapters/rails_7_2_departure_adapter.rb

@@ -110,11 +110,9 @@ module ActiveRecord
         true
       end
 
-      # rubocop:disable Metrics/ParameterLists
-      def new_column(field, default, type_metadata, null, table_name, default_function, collation, comment)
-        Column.new(field, default, type_metadata, null, table_name, default_function, collation, comment)
+      def new_column(...)
+        Column.new(...)
       end
-      # rubocop:enable Metrics/ParameterLists
 
       # Adds a new index to the table
       #
@@ -186,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'.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.pre
+  version: 6.7.1.pre.2
 platform: ruby
 authors:
 - Ilya Zayats
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-14 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -200,7 +200,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- 20250312235906_add_deleted_reason_to_newsfeed_activities.rb
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -217,7 +216,7 @@ files:
 - bin/setup
 - config.yml.erb
 - configuration.rb
-- departure-next.gemspec
+- departure.gemspec
 - docker-compose.yml
 - gemfiles/rails_6_1.gemfile
 - gemfiles/rails_6_1.gemfile.lock
@@ -247,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
@@ -256,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: {}
@@ -271,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

data/20250312235906_add_deleted_reason_to_newsfeed_activities.rb

@@ -1,5 +0,0 @@
-class AddDeletedReasonToNewsfeedActivities < ActiveRecord::Migration[7.1]
-  def change
-    add_column :newsfeed_activities, :some_deleted_reason, :string
-  end
-end