online_migrations 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296a1517b032cbd6d5fa3948f60f1a4f20c4142c8f4c7676c43998f9e941925d
-  data.tar.gz: f61a7c6728a6ea1e834be61187b61e3ddf004f4314003752ec3ccf9a5b79afd9
+  metadata.gz: 330d5ed7f11aae3b85e7fb5aab5a1ea66d809da704cf193420b6d4206f72d82b
+  data.tar.gz: 36d47a6f2a1cae3de33331a4ec9e6b21fc7b3b8b09a7d5e9c34d1be6c92e5d35
 SHA512:
-  metadata.gz: fd04da6b57f9862726ee45e6ed13b1032632099a089e26e691717b2e93009269b7f8a8cf3c828501ef97a86d3d13731d4cadb77d0b48f0cf25fea172502780c1
-  data.tar.gz: '089a7f40afc28b9671669764ee98c760e4ee8649aab67a4d814b22ca8f5c52cf76afc8a5c9f95244d8be7b879d2b714fa38f07fff3c741bcc91e450077c96801'
+  metadata.gz: e07937136867b4b6bc2d0dfb2e5ccb8471faf6ce0339a247bc0c63d591cc163e084da731e86fc01ba839c7744a51e9c63e99ce632452e471f9eed98a95b9dd02
+  data.tar.gz: f1a33636d5fbd01f25a0cee32af0d74e377c804eaef0feee2c778c5318a93bbe8942dc03e8ea2bad0a610d0046a8d4e42b505d0991c7d215cc9842a24d5e5065

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master (unreleased)
 
+## 0.14.1 (2024-02-21)
+
+- Fix `MigrationRunner` to consider `run_background_migrations_inline` proc
+
 ## 0.14.0 (2024-02-01)
 
 - Add ability to configure whether background migrations should be run inline

data/README.md

@@ -206,7 +206,7 @@ end
    end
    ```
 
-4. Remove column ignoring from `User` model
+4. Remove column ignoring from step 1
 5. Deploy
 
 ### Adding a column with a default value

data/lib/online_migrations/background_migrations/migration.rb

@@ -30,7 +30,12 @@ module OnlineMigrations
 
       alias_attribute :name, :migration_name
 
-      enum status: STATUSES.index_with(&:to_s)
+      # Avoid deprecation warnings.
+      if Utils.ar_version >= 7
+        enum :status, STATUSES.index_with(&:to_s)
+      else
+        enum status: STATUSES.index_with(&:to_s)
+      end
 
       belongs_to :parent, class_name: name, optional: true
       has_many :children, class_name: name, foreign_key: :parent_id, dependent: :delete_all

data/lib/online_migrations/background_migrations/migration_helpers.rb

@@ -307,7 +307,7 @@ module OnlineMigrations
       #     perform_action_on_relation_in_background("User", { invite_token: nil }, :generate_invite_token)
       #
       # @note This method is better suited for large tables (10/100s of millions of records).
-      #     For smaller tables it is probably better and easier to directly delete associated records.
+      #     For smaller tables it is probably better and easier to directly perform the action on associated records.
       #
       def perform_action_on_relation_in_background(model_name, conditions, action, updates: nil, **options)
         model_name = model_name.name if model_name.is_a?(Class)

data/lib/online_migrations/background_migrations/migration_job.rb

@@ -37,7 +37,12 @@ module OnlineMigrations
       scope :except_succeeded, -> { where.not(status: :succeeded) }
       scope :attempts_exceeded, -> { where("attempts >= max_attempts") }
 
-      enum status: STATUSES.index_with(&:to_s)
+      # Avoid deprecation warnings.
+      if Utils.ar_version >= 7
+        enum :status, STATUSES.index_with(&:to_s)
+      else
+        enum status: STATUSES.index_with(&:to_s)
+      end
 
       delegate :migration_class, :migration_object, :migration_relation, :batch_column_name,
         :arguments, :batch_pause, to: :migration

data/lib/online_migrations/background_migrations/migration_runner.rb

@@ -51,7 +51,11 @@ module OnlineMigrations
       # @note This method should not be used in production environments
       #
       def run_all_migration_jobs
-        raise "This method is not intended for use in production environments" if !Utils.developer_env?
+        run_inline = OnlineMigrations.config.run_background_migrations_inline
+        if run_inline && !run_inline.call
+          raise "This method is not intended for use in production environments"
+        end
+
         return if migration.completed?
 
         mark_as_running

data/lib/online_migrations/command_checker.rb

@@ -100,7 +100,7 @@ module OnlineMigrations
       end
 
       def set_statement_timeout
-        if !@statement_timeout_set
+        if !defined?(@statement_timeout_set)
           if (statement_timeout = OnlineMigrations.config.statement_timeout)
             # TODO: inline this method call after deprecated `disable_statement_timeout` method removal.
             connection.__set_statement_timeout(statement_timeout)

data/lib/online_migrations/database_tasks.rb

@@ -5,7 +5,7 @@ module OnlineMigrations
   module DatabaseTasks
     def migrate(*)
       super
-    rescue => e # rubocop:disable Style/RescueStandardError
+    rescue => e
       if e.cause.is_a?(OnlineMigrations::Error)
         # strip cause
         def e.cause

data/lib/online_migrations/error_messages.rb

@@ -295,7 +295,7 @@ end
 Active Record caches database columns at runtime, so if you drop a column, it can cause exceptions until your app reboots.
 A safer approach is to:
 
-1. Ignore the column(s):
+1. Ignore the column:
 
   class <%= model %> < ApplicationRecord
     self.ignored_columns = <%= columns %>
@@ -310,7 +310,7 @@ A safer approach is to:
     end
   end
 
-4. Remove columns ignoring
+4. Remove column ignoring from step 1
 5. Deploy
 <% end %>",
 

data/lib/online_migrations/schema_cache.rb

@@ -78,7 +78,7 @@ module OnlineMigrations
   end
 
   # @private
-  module SchemaCache7
+  module SchemaCache71
     # Active Record >= 7.1 changed signature of the methods,
     # see https://github.com/rails/rails/pull/48716.
     def primary_keys(connection, table_name)
@@ -154,4 +154,82 @@ module OnlineMigrations
         columns << new_column.freeze
       end
   end
+
+  # @private
+  module SchemaCache72
+    # Active Record >= 7.2 changed signature of the methods,
+    # see https://github.com/rails/rails/pull/48716.
+    def primary_keys(pool, table_name)
+      if (renamed_table = renamed_table?(pool, table_name))
+        super(pool, renamed_table)
+      elsif renamed_column?(pool, table_name)
+        super(pool, column_rename_table(table_name))
+      else
+        super
+      end
+    end
+
+    def columns(pool, table_name)
+      if (renamed_table = renamed_table?(pool, table_name))
+        super(pool, renamed_table)
+      elsif renamed_column?(pool, table_name)
+        columns = super(pool, column_rename_table(table_name))
+        OnlineMigrations.config.column_renames[table_name].each do |old_column_name, new_column_name|
+          duplicate_column(old_column_name, new_column_name, columns)
+        end
+        columns
+      else
+        super.reject { |column| column.name.end_with?("_for_type_change") }
+      end
+    end
+
+    def indexes(pool, table_name)
+      if (renamed_table = renamed_table?(pool, table_name))
+        super(pool, renamed_table)
+      elsif renamed_column?(pool, table_name)
+        super(pool, column_rename_table(table_name))
+      else
+        super
+      end
+    end
+
+    def clear_data_source_cache!(pool, name)
+      if (renamed_table = renamed_table?(pool, name))
+        super(pool, renamed_table)
+      end
+
+      if renamed_column?(pool, name)
+        super(pool, column_rename_table(name))
+      end
+
+      super
+    end
+
+    private
+      def renamed_table?(pool, table_name)
+        table_renames = OnlineMigrations.config.table_renames
+        if table_renames.key?(table_name)
+          views = pool.with_connection(&:views)
+          table_renames[table_name] if views.include?(table_name)
+        end
+      end
+
+      def renamed_column?(pool, table_name)
+        column_renames = OnlineMigrations.config.column_renames
+        column_renames.key?(table_name) && pool.with_connection(&:views).include?(table_name)
+      end
+
+      def column_rename_table(table_name)
+        "#{table_name}_column_rename"
+      end
+
+      def duplicate_column(old_column_name, new_column_name, columns)
+        old_column = columns.find { |column| column.name == old_column_name }
+        new_column = old_column.dup
+        # Active Record defines only reader for :name
+        new_column.instance_variable_set(:@name, new_column_name)
+        # Correspond to the Active Record freezing of each column
+        columns << new_column.freeze
+      end
+  end
 end

data/lib/online_migrations/version.rb

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

data/lib/online_migrations.rb

@@ -7,6 +7,7 @@ require "online_migrations/utils"
 require "online_migrations/change_column_type_helpers"
 require "online_migrations/background_migrations/migration_helpers"
 require "online_migrations/schema_statements"
+require "online_migrations/schema_cache"
 require "online_migrations/migration"
 require "online_migrations/migrator"
 require "online_migrations/schema_dumper"
@@ -29,11 +30,6 @@ module OnlineMigrations
   autoload :CommandChecker
   autoload :BackgroundMigration
 
-  autoload_at "online_migrations/schema_cache" do
-    autoload :SchemaCache
-    autoload :SchemaCache7
-  end
-
   autoload_at "online_migrations/lock_retrier" do
     autoload :LockRetrier
     autoload :ConstantLockRetrier
@@ -102,8 +98,10 @@ module OnlineMigrations
       ActiveRecord::Tasks::DatabaseTasks.singleton_class.prepend(OnlineMigrations::DatabaseTasks)
       ActiveRecord::Migration::CommandRecorder.include(OnlineMigrations::CommandRecorder)
 
-      if OnlineMigrations::Utils.ar_version >= 7.1
-        ActiveRecord::ConnectionAdapters::SchemaCache.prepend(OnlineMigrations::SchemaCache7)
+      if OnlineMigrations::Utils.ar_version >= 7.2
+        ActiveRecord::ConnectionAdapters::SchemaCache.prepend(OnlineMigrations::SchemaCache72)
+      elsif OnlineMigrations::Utils.ar_version >= 7.1
+        ActiveRecord::ConnectionAdapters::SchemaCache.prepend(OnlineMigrations::SchemaCache71)
       else
         ActiveRecord::ConnectionAdapters::SchemaCache.prepend(OnlineMigrations::SchemaCache)
       end

metadata

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