online_migrations 0.20.0 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d945b90fafc0b4f1c47139e5e4ffc35440e92abcbb84b07f19664f04c3beb5ac
-  data.tar.gz: 6e0f18f9f36f05cdc8d41b884df73facd22e935baa314622e4710fbf7412df7f
+  metadata.gz: 99da2eb272335cb229fa18c23cc0fc93b79748fae109b3cde140a5e6fad633d8
+  data.tar.gz: 0c9aafb1960a77604aa1e6025f223176ade5a3276392fc62db64af231e265ac7
 SHA512:
-  metadata.gz: 799963762ca1ad74807132428ac30aa04b2c36734227c273fa74fd2cc7d0f59a2e483dd94616f83040885b0b6b217d3ae8334fbb28ba39968447572e178d69bf
-  data.tar.gz: e1fc78f999f6d98037a1435564875b7c35a522af7ef993fdf0a791376a9528e069322f5a67c96cc769d7ed1a6c16ccdccd24f238f441da9f692fb8c14dca2826
+  metadata.gz: '09e4ccdc1f431dd3ab4fd45df8674d77f53cdc4be5d07804b988718628cc832981fa966b194da3ca95fb615a835d83a4993a9a208ae97abec1f10d3669599af9'
+  data.tar.gz: 895d01e0913c053fcf1bdda4fbef545049fd3810a90c2610060483727d6143366e42c4b4def0274c593294afd980bb3102473d459a22fcdce2e06638065c1464

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## master (unreleased)
 
+## 0.20.2 (2024-11-11)
+
+- Fix running background migrations over relations with duplicate records
+
+## 0.20.1 (2024-11-05)
+
+- Fix background data migrations to work with `includes`/`eager_load` on relation
+- Fix problem with running migrations for `activerecord` 8.0.0.rc2
+
 ## 0.20.0 (2024-10-21)
 
 - Enhance columns removal check to check indexes `where` and `include` options

data/lib/online_migrations/batch_iterator.rb

@@ -19,7 +19,8 @@ module OnlineMigrations
       end
 
       relation = apply_limits(self.relation, column, start, finish, order)
-      base_relation = relation.reselect(column).reorder(column => order)
+      unscopes = Utils.ar_version < 7.1 ? [:includes] : [:includes, :preload, :eager_load]
+      base_relation = relation.unscope(*unscopes).reselect(column).reorder(column => order)
 
       start_id = start || begin
         start_row = base_relation.uncached { base_relation.first }
@@ -74,9 +75,10 @@ module OnlineMigrations
         # Retaining the results in the query cache would undermine the point of batching.
         batch_relation.uncached { yield batch_relation, start_id, last_id }
 
-        break if stop_row.nil?
+        break if last_id == finish
 
         start_id = stop_id
+        stop_id = nil
       end
     end
 

data/lib/online_migrations/change_column_type_helpers.rb

@@ -126,15 +126,15 @@ module OnlineMigrations
               # To avoid this, we instead set it to `NOT NULL DEFAULT 0` and we'll
               # copy the correct values when backfilling.
               add_column(table_name, tmp_column_name, new_type,
-                **old_col_options.merge(column_options).merge(default: old_col.default || 0, null: false))
+                **old_col_options, **column_options, default: old_col.default || 0, null: false)
             else
               if !old_col.default.nil?
                 old_col_options = old_col_options.merge(default: old_col.default, null: old_col.null)
               end
-              add_column(table_name, tmp_column_name, new_type, **old_col_options.merge(column_options))
+              add_column(table_name, tmp_column_name, new_type, **old_col_options, **column_options)
             end
           else
-            add_column(table_name, tmp_column_name, new_type, **old_col_options.merge(column_options))
+            add_column(table_name, tmp_column_name, new_type, **old_col_options, **column_options)
             change_column_default(table_name, tmp_column_name, old_col.default) if !old_col.default.nil?
           end
         end
@@ -434,7 +434,7 @@ module OnlineMigrations
             options[:opclass] = opclasses
           end
 
-          add_index(table_name, new_columns, **options.merge(algorithm: :concurrently))
+          add_index(table_name, new_columns, **options, algorithm: :concurrently)
         end
       end
 

data/lib/online_migrations/command_checker.rb

@@ -553,7 +553,7 @@ module OnlineMigrations
         if !new_or_small_table?(table_name)
           if options[:algorithm] != :concurrently
             raise_error :add_index,
-              command: command_str(:add_index, table_name, column_name, **options.merge(algorithm: :concurrently))
+              command: command_str(:add_index, table_name, column_name, **options, algorithm: :concurrently)
           end
 
           if options[:algorithm] == :concurrently && index_corruption?
@@ -585,7 +585,7 @@ module OnlineMigrations
 
         if options[:algorithm] != :concurrently && !new_or_small_table?(table_name)
           raise_error :remove_index,
-            command: command_str(:remove_index, table_name, **options.merge(algorithm: :concurrently))
+            command: command_str(:remove_index, table_name, **options, algorithm: :concurrently)
         end
 
         index_def = connection.indexes(table_name).find do |index|
@@ -608,7 +608,7 @@ module OnlineMigrations
 
           if validate
             raise_error :add_foreign_key,
-              add_code: command_str(:add_foreign_key, from_table, to_table, **options.merge(validate: false)),
+              add_code: command_str(:add_foreign_key, from_table, to_table, **options, validate: false),
               validate_code: command_str(:validate_foreign_key, from_table, to_table)
           end
         end
@@ -633,7 +633,7 @@ module OnlineMigrations
           name = options[:name] || check_constraint_name(table_name, expression)
 
           raise_error :add_check_constraint,
-            add_code: command_str(:add_check_constraint, table_name, expression, **options.merge(validate: false)),
+            add_code: command_str(:add_check_constraint, table_name, expression, **options, validate: false),
             validate_code: command_str(:validate_check_constraint, table_name, name: name)
         end
       end
@@ -645,7 +645,7 @@ module OnlineMigrations
 
         raise_error :add_unique_constraint,
           add_index_code: command_str(:add_index, table_name, column_name, unique: true, name: index_name, algorithm: :concurrently),
-          add_code: command_str(:add_unique_constraint, table_name, **options.merge(using_index: index_name)),
+          add_code: command_str(:add_unique_constraint, table_name, **options, using_index: index_name),
           remove_code: command_str(:remove_unique_constraint, table_name, column_name)
       end
 
@@ -661,7 +661,7 @@ module OnlineMigrations
       def add_not_null_constraint(table_name, column_name, **options)
         if !new_or_small_table?(table_name) && options[:validate] != false
           raise_error :add_not_null_constraint,
-            add_code: command_str(:add_not_null_constraint, table_name, column_name, **options.merge(validate: false)),
+            add_code: command_str(:add_not_null_constraint, table_name, column_name, **options, validate: false),
             validate_code: command_str(:validate_not_null_constraint, table_name, column_name, **options.except(:validate))
         end
       end
@@ -669,7 +669,7 @@ module OnlineMigrations
       def add_text_limit_constraint(table_name, column_name, limit, **options)
         if !new_or_small_table?(table_name) && options[:validate] != false
           raise_error :add_text_limit_constraint,
-            add_code: command_str(:add_text_limit_constraint, table_name, column_name, limit, **options.merge(validate: false)),
+            add_code: command_str(:add_text_limit_constraint, table_name, column_name, limit, **options, validate: false),
             validate_code: command_str(:validate_text_limit_constraint, table_name, column_name, **options.except(:validate))
         end
       end

data/lib/online_migrations/database_tasks.rb

@@ -3,7 +3,7 @@
 module OnlineMigrations
   # @private
   module DatabaseTasks
-    def migrate(*)
+    def migrate(*, **)
       super
     rescue => e
       if e.cause.is_a?(OnlineMigrations::Error)

data/lib/online_migrations/schema_statements.rb

@@ -451,7 +451,7 @@ module OnlineMigrations
                     "or similar) table_name: #{table_name}, column_name: #{column_name}")
         else
           transaction do
-            add_column(table_name, column_name, type, **options.merge(default: nil, null: true))
+            add_column(table_name, column_name, type, **options, default: nil, null: true)
             change_column_default(table_name, column_name, default)
           end
         end
@@ -672,7 +672,7 @@ module OnlineMigrations
           index[:name] ||= "index_#{table_name}_on_#{ref_name}"
         end
 
-        add_index(table_name, index_columns, **index.merge(algorithm: :concurrently))
+        add_index(table_name, index_columns, **index, algorithm: :concurrently)
       end
 
       foreign_key = options[:foreign_key]
@@ -681,7 +681,7 @@ module OnlineMigrations
         foreign_key = {} if foreign_key == true
 
         foreign_table_name = Utils.foreign_table_name(ref_name, foreign_key)
-        add_foreign_key(table_name, foreign_table_name, **foreign_key.merge(column: column_name, validate: false))
+        add_foreign_key(table_name, foreign_table_name, **foreign_key, column: column_name, validate: false)
 
         if foreign_key[:validate] != false
           validate_foreign_key(table_name, foreign_table_name, **foreign_key)

data/lib/online_migrations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnlineMigrations
-  VERSION = "0.20.0"
+  VERSION = "0.20.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: online_migrations
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.2
 platform: ruby
 authors:
 - fatkodima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord