online_migrations 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bac7f903ca89cda8d82ee421cae4c1f351a973c88c565f4cecd92ec98b7533c
-  data.tar.gz: e2e2fe22a1d1c70cb753a16fde3ce67890a73f17a058b72fa9383a460837926d
+  metadata.gz: 4706d65d4ed40219b3680266294f9382d1db51ac168768b77f55e1a73a2d3de3
+  data.tar.gz: b828d4c3d8cc9ef1268eeaa00f86bc3fda41546963334cb356916b1ad481b3bc
 SHA512:
-  metadata.gz: bd297d34d39f7fc1e488f962cb7f11eb0973b29a6b6b3e8330b11db6904430318f85ce60af2fda57adf751294310103c153be5a8511e2fd037477edc17f16dca
-  data.tar.gz: 7fafd129661fd5d63e372a7cb54e55d2715a16a3b4acc6a2d57d5bae69b5f5648723276c244a2ba6918b2330454845901cf34ea393c13e132bb9481ceb7d26a9
+  metadata.gz: f70ab747e025f34a546da3d97aad6d7a175006fca9c48a3ae402b1683715b1eeb5128213bec52612c9178e457a638f9eb7d370445cf43b7c164f6d9bb548026f
+  data.tar.gz: e001963c1fc82ec925a4b1c917689171e35dc3c4f0fba61f8a29ec0e2f5b2fedefa6733828d81176b489a345113e054f5f174c007152fc407d55e3184853cc77

data/.gitignore

@@ -8,3 +8,4 @@
 /tmp/
 
 gemfiles/**.lock
+/debug.log

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  NewCops: disable
+  NewCops: enable
   SuggestExtensions: false
 
 Style/StringLiterals:
@@ -68,6 +68,10 @@ Style/WhileUntilModifier:
 Style/HashAsLastArrayItem:
   Enabled: false
 
+# only for ruby 2.6+
+Style/MapToHash:
+  Enabled: false
+
 # we can not use new syntax for older rubies
 Lint/ErbNewArguments:
   Enabled: false
@@ -109,5 +113,8 @@ Naming/AccessorMethodName:
 Gemspec/RequiredRubyVersion:
   Enabled: false
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 Metrics:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## master (unreleased)
 
+## 0.3.0 (2022-02-10)
+
+- Support ActiveRecord 7.0+ versioned schemas
+
+- Check for addition of single table inheritance column
+
+    See [Adding a single table inheritance column](https://github.com/fatkodima/online_migrations#adding-a-single-table-inheritance-column) for details
+
+- Add a way to log every SQL query to stdout
+
+    See [Verbose SQL logs](https://github.com/fatkodima/online_migrations#verbose-sql-logs) for details
+
+- Ignore new tables when checking for removing table with multiple fkeys
+- Fix backfilling column in add_column_with_default when default is an expression
+
 ## 0.2.0 (2022-01-31)
 
 - Check removing a table with multiple foreign keys

data/Gemfile.lock

@@ -1,31 +1,31 @@
 PATH
   remote: .
   specs:
-    online_migrations (0.2.0)
+    online_migrations (0.3.0)
       activerecord (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.1)
-      actionview (= 7.0.1)
-      activesupport (= 7.0.1)
+    actionpack (7.0.2)
+      actionview (= 7.0.2)
+      activesupport (= 7.0.2)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.1)
-      activesupport (= 7.0.1)
+    actionview (7.0.2)
+      activesupport (= 7.0.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.1)
-      activesupport (= 7.0.1)
-    activerecord (7.0.1)
-      activemodel (= 7.0.1)
-      activesupport (= 7.0.1)
-    activesupport (7.0.1)
+    activemodel (7.0.2)
+      activesupport (= 7.0.2)
+    activerecord (7.0.2)
+      activemodel (= 7.0.2)
+      activesupport (= 7.0.2)
+    activesupport (7.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -35,7 +35,7 @@ GEM
     concurrent-ruby (1.1.9)
     crass (1.0.6)
     erubi (1.10.0)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     loofah (2.13.0)
       crass (~> 1.0.2)
@@ -43,13 +43,13 @@ GEM
     method_source (1.0.0)
     mini_portile2 (2.7.1)
     minitest (5.15.0)
-    nokogiri (1.13.0)
+    nokogiri (1.13.1)
       mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.3.1)
     racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -59,20 +59,20 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (7.0.1)
-      actionpack (= 7.0.1)
-      activesupport (= 7.0.1)
+    railties (7.0.2)
+      actionpack (= 7.0.2)
+      activesupport (= 7.0.2)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (12.3.3)
     regexp_parser (2.2.0)
     rexml (3.2.5)
-    rubocop (1.24.1)
+    rubocop (1.25.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
@@ -89,7 +89,7 @@ GEM
     webrick (1.7.0)
     yard (0.9.27)
       webrick (~> 1.7.0)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

data/README.md

@@ -138,6 +138,7 @@ Potentially dangerous operations:
 - [adding multiple foreign keys](#adding-multiple-foreign-keys)
 - [removing a table with multiple foreign keys](#removing-a-table-with-multiple-foreign-keys)
 - [mismatched reference column types](#mismatched-reference-column-types)
+- [adding a single table inheritance column](#adding-a-single-table-inheritance-column)
 
 You can also add [custom checks](#custom-checks) or [disable specific checks](#disable-checks).
 
@@ -160,12 +161,12 @@ end
 1. Ignore the column:
 
   ```ruby
-  # For Active Record 5+
+  # For ActiveRecord 5+
   class User < ApplicationRecord
     self.ignored_columns = ["name"]
   end
 
-  # For Active Record < 5
+  # For ActiveRecord < 5
   class User < ActiveRecord::Base
     def self.columns
       super.reject { |c| c.name == "name" }
@@ -978,6 +979,46 @@ class AddUserIdToProjects < ActiveRecord::Migration[7.0]
 end
 ```
 
+### Adding a single table inheritance column
+
+:x: **Bad**
+
+Adding a single table inheritance column might cause errors in old instances of your application.
+
+```ruby
+class AddTypeToUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :users, :string, :type, default: "Member"
+  end
+end
+```
+
+After the migration was ran and the column was added, but before the code is fully deployed to all instances, an old instance may be restarted (due to an error etc). And when it will fetch 'User' records from the database, 'User' will look for a 'Member' subclass (from the 'type' column) and fail to locate it unless it is already defined.
+
+:white_check_mark: **Good**
+
+A safer approach is to:
+
+1. ignore the column:
+
+  ```ruby
+  # For ActiveRecord 5+
+  class User < ApplicationRecord
+    self.ignored_columns = ["type"]
+  end
+
+  # For ActiveRecord < 5
+  class User < ActiveRecord::Base
+    def self.columns
+      super.reject { |c| c.name == "type" }
+    end
+  end
+  ```
+
+2. deploy
+3. remove the column ignoring from step 1 and apply initial code changes
+4. deploy
+
 ## Assuring Safety
 
 To mark a step in the migration as safe, despite using a method that might otherwise be dangerous, wrap it in a `safety_assured` block.
@@ -1139,6 +1180,68 @@ To mark tables as small:
 config.small_tables = [:settings, :prices]
 ```
 
+### Verbose SQL logs
+
+For any operation, **Online Migrations** can output the performed SQL queries.
+
+This is useful to demystify `online_migrations` inner workings, and to better investigate migration failure in production. This is also useful in development to get a better grasp of what is going on for high-level statements like `add_column_with_default`.
+
+Consider migration, running on PostgreSQL < 11:
+
+```ruby
+class AddAdminToUsers < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    add_column_with_default :users, :admin, :boolean, default: false
+  end
+end
+```
+
+Instead of the traditional output:
+
+```
+== 20220106214827 AddAdminToUsers: migrating ==================================
+-- add_column_with_default(:users, :admin, :boolean, {:default=>false})
+   -> 0.1423s
+== 20220106214827 AddAdminToUsers: migrated (0.1462s) =========================
+```
+
+**Online Migrations** will output the following logs:
+
+```
+== 20220106214827 AddAdminToUsers: migrating ==================================
+   (0.3ms)  SHOW lock_timeout
+   (0.2ms)  SET lock_timeout TO '50ms'
+-- add_column_with_default(:users, :admin, :boolean, {:default=>false})
+  TRANSACTION (0.1ms)  BEGIN
+   (37.7ms)  ALTER TABLE "users" ADD "admin" boolean DEFAULT NULL
+   (0.5ms)  ALTER TABLE "users" ALTER COLUMN "admin" SET DEFAULT FALSE
+  TRANSACTION (0.3ms)  COMMIT
+   Load (0.3ms)  SELECT "users"."id" FROM "users" WHERE ("users"."admin" != FALSE OR "users"."admin" IS NULL) ORDER BY "users"."id" ASC LIMIT $1  [["LIMIT", 1]]
+   Load (0.5ms)  SELECT "users"."id" FROM "users" WHERE ("users"."admin" != FALSE OR "users"."admin" IS NULL) AND "users"."id" >= 1 ORDER BY "users"."id" ASC LIMIT $1 OFFSET $2  [["LIMIT", 1], ["OFFSET", 1000]]
+  #<Class:0x00007f8ae3703f08> Update All (9.6ms)  UPDATE "users" SET "admin" = $1 WHERE ("users"."admin" != FALSE OR "users"."admin" IS NULL) AND "users"."id" >= 1 AND "users"."id" < 1001  [["admin", false]]
+   Load (0.8ms)  SELECT "users"."id" FROM "users" WHERE ("users"."admin" != FALSE OR "users"."admin" IS NULL) AND "users"."id" >= 1001 ORDER BY "users"."id" ASC LIMIT $1 OFFSET $2  [["LIMIT", 1], ["OFFSET", 1000]]
+  #<Class:0x00007f8ae3703f08> Update All (1.5ms)  UPDATE "users" SET "admin" = $1 WHERE ("users"."admin" != FALSE OR "users"."admin" IS NULL) AND "users"."id" >= 1001  [["admin", false]]
+   -> 0.1814s
+   (0.4ms)  SET lock_timeout TO '5s'
+== 20220106214827 AddAdminToUsers: migrated (0.1840s) =========================
+```
+
+So you can actually check which steps are performed.
+
+**Note**: The `SHOW` statements are used by **Online Migrations** to query settings for their original values in order to restore them after the work is done.
+
+To enable verbose sql logs:
+
+```ruby
+# config/initializers/online_migrations.rb
+
+config.verbose_sql_logs = true
+```
+
+This feature is enabled by default in a production Rails environment. You can override this setting via `ONLINE_MIGRATIONS_VERBOSE_SQL_LOGS` environment variable.
+
 ## Background Migrations
 
 Read [BACKGROUND_MIGRATIONS.md](BACKGROUND_MIGRATIONS.md) on how to perform data migrations on large tables.

data/lib/generators/online_migrations/templates/initializer.rb.tt

@@ -32,6 +32,15 @@ OnlineMigrations.configure do |config|
   # For the list of available checks look at `lib/error_messages` folder.
   # config.enable_check(:remove_index)
 
+  # Configure whether to log every SQL query happening in a migration.
+  #
+  # This is useful to demystify online_migrations inner workings, and to better investigate
+  # migration failure in production. This is also useful in development to get
+  # a better grasp of what is going on for high-level statements like add_column_with_default.
+  #
+  # Note: It can be overriden by `ONLINE_MIGRATIONS_VERBOSE_SQL_LOGS` environment variable.
+  config.verbose_sql_logs = defined?(Rails) && Rails.env.production?
+
   # Lock retries.
   # Configure your custom lock retrier (see LockRetrier).
   # To disable lock retries, set `lock_retrier` to `nil`.

data/lib/online_migrations/background_migrations/background_migration_class_validator.rb

@@ -27,7 +27,7 @@ module OnlineMigrations
           record.errors.add(
             :migration_name,
             "#{migration_name}#relation cannot use ORDER BY or LIMIT due to the way how iteration with a cursor is designed. " \
-              "You can use other ways to limit the number of rows, e.g. a WHERE condition on the primary key column."
+            "You can use other ways to limit the number of rows, e.g. a WHERE condition on the primary key column."
           )
         end
       end

data/lib/online_migrations/background_migrations/copy_column.rb

@@ -26,7 +26,7 @@ module OnlineMigrations
 
       def relation
         relation = model
-          .where(Hash[copy_to.map { |to_column| [to_column, nil] }])
+          .where(copy_to.map { |to_column| [to_column, nil] }.to_h)
 
         Utils.ar_where_not_multiple_conditions(
           relation,

data/lib/online_migrations/change_column_type_helpers.rb

@@ -101,7 +101,7 @@ module OnlineMigrations
 
       if (extra_keys = (options.keys - conversions.keys)).any?
         raise ArgumentError, "Options has unknown keys: #{extra_keys.map(&:inspect).join(', ')}. "\
-          "Can contain only column names: #{conversions.keys.map(&:inspect).join(', ')}."
+                             "Can contain only column names: #{conversions.keys.map(&:inspect).join(', ')}."
       end
 
       transaction do
@@ -401,7 +401,7 @@ module OnlineMigrations
           # This is necessary as we can't properly rename indexes such as "taggings_idx".
           unless index.name.include?(from_column)
             raise "The index #{index.name} can not be copied as it does not "\
-              "mention the old column. You have to rename this index manually first."
+                  "mention the old column. You have to rename this index manually first."
           end
 
           name = index.name.gsub(from_column, to_column)

data/lib/online_migrations/command_checker.rb

@@ -19,11 +19,11 @@ module OnlineMigrations
     end
 
     def safety_assured
-      @prev_value = @safe
+      prev_value = @safe
       @safe = true
       yield
     ensure
-      @safe = @prev_value
+      @safe = prev_value
     end
 
     def check(command, *args, &block)
@@ -132,7 +132,7 @@ module OnlineMigrations
         referenced_tables = foreign_keys.map(&:to_table).uniq
         referenced_tables.delete(table_name.to_s) # ignore self references
 
-        if referenced_tables.size > 1
+        if referenced_tables.count { |t| !new_table?(t) } > 1
           raise_error :drop_table_multiple_foreign_keys
         end
       end
@@ -155,9 +155,10 @@ module OnlineMigrations
       end
 
       def add_column(table_name, column_name, type, **options)
+        default = options[:default]
         volatile_default = false
-        if !new_or_small_table?(table_name) && !options[:default].nil? &&
-           (postgresql_version < Gem::Version.new("11") || (volatile_default = Utils.volatile_default?(connection, type, options[:default])))
+        if !new_or_small_table?(table_name) && !default.nil? &&
+           (postgresql_version < Gem::Version.new("11") || (volatile_default = Utils.volatile_default?(connection, type, default)))
 
           raise_error :add_column_with_default,
             code: command_str(:add_column_with_default, table_name, column_name, type, options),
@@ -170,6 +171,20 @@ module OnlineMigrations
             code: command_str(:add_column, table_name, column_name, :jsonb, options)
         end
 
+        check_inheritance_column(table_name, column_name, default)
+
+        type = :bigint if type == :integer && options[:limit] == 8
+        check_mismatched_foreign_key_type(table_name, column_name, type)
+      end
+
+      def add_column_with_default(table_name, column_name, type, **options)
+        if type == :json
+          raise_error :add_column_json,
+            code: command_str(:add_column_with_default, table_name, column_name, :jsonb, options)
+        end
+
+        check_inheritance_column(table_name, column_name, options[:default])
+
         type = :bigint if type == :integer && options[:limit] == 8
         check_mismatched_foreign_key_type(table_name, column_name, type)
       end
@@ -572,8 +587,12 @@ module OnlineMigrations
             arg_list << last_arg.map do |k, v|
               case v
               when Hash
-                # pretty index: { algorithm: :concurrently }
-                "#{k}: { #{v.map { |k2, v2| "#{k2}: #{v2.inspect}" }.join(', ')} }"
+                if v.empty?
+                  "#{k}: {}"
+                else
+                  # pretty index: { algorithm: :concurrently }
+                  "#{k}: { #{v.map { |k2, v2| "#{k2}: #{v2.inspect}" }.join(', ')} }"
+                end
               when Array, Numeric, String, Symbol, TrueClass, FalseClass
                 "#{k}: #{v.inspect}"
               else
@@ -618,6 +637,14 @@ module OnlineMigrations
         connection.select_all(constraints_query).to_a
       end
 
+      def check_inheritance_column(table_name, column_name, default)
+        if column_name.to_s == ActiveRecord::Base.inheritance_column && !default.nil?
+          raise_error :add_inheritance_column,
+            table_name: table_name, column_name: column_name,
+            model: table_name.to_s.classify, subclass: default
+        end
+      end
+
       def check_mismatched_foreign_key_type(table_name, column_name, type, **options)
         column_name = column_name.to_s
         ref_name = column_name.sub(/_id\z/, "")

data/lib/online_migrations/config.rb

@@ -144,6 +144,19 @@ module OnlineMigrations
     #
     attr_reader :enabled_checks
 
+    # Whether to log every SQL query happening in a migration
+    #
+    # This is useful to demystify online_migrations inner workings, and to better investigate
+    # migration failure in production. This is also useful in development to get
+    # a better grasp of what is going on for high-level statements like add_column_with_default.
+    #
+    # This feature is enabled by default in a production Rails environment.
+    # @return [Boolean]
+    #
+    # @note: It can be overriden by `ONLINE_MIGRATIONS_VERBOSE_SQL_LOGS` environment variable.
+    #
+    attr_accessor :verbose_sql_logs
+
     # Configuration object to configure background migrations
     #
     # @return [BackgroundMigrationsConfig]
@@ -172,6 +185,7 @@ module OnlineMigrations
       @small_tables = []
       @check_down = false
       @enabled_checks = @error_messages.keys.map { |k| [k, {}] }.to_h
+      @verbose_sql_logs = defined?(Rails) && Rails.env.production?
     end
 
     def lock_retrier=(value)

data/lib/online_migrations/error_messages.rb

@@ -84,6 +84,31 @@ class <%= migration_name %> < <%= migration_parent %>
   end
 end",
 
+      add_inheritance_column:
+"'<%= column_name %>' column is used for single table inheritance. Adding it might cause errors in old instances of your application.
+
+After the migration was ran and the column was added, but before the code is fully deployed to all instances,
+an old instance may be restarted (due to an error etc). And when it will fetch '<%= model %>' records from the database,
+'<%= model %>' will look for a '<%= subclass %>' subclass (from the '<%= column_name %>' column) and fail to locate it unless it is already defined.
+
+A safer approach is to:
+
+1. ignore the column:
+
+  class <%= model %> < <%= model_parent %>
+<% if ar_version >= 5 %>
+    self.ignored_columns = [\"<%= column_name %>\"]
+<% else %>
+    def self.columns
+      super.reject { |c| c.name == \"<%= column_name %>\" }
+    end
+<% end %>
+  end
+
+2. deploy
+3. remove the column ignoring from step 1 and apply initial code changes
+4. deploy",
+
       rename_column:
 "Renaming a column that's in use will cause errors in your application.
 migration_helpers provides a safer approach to do this:

data/lib/online_migrations/lock_retrier.rb

@@ -225,7 +225,7 @@ module OnlineMigrations
     # @see https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/
     #
     def delay(attempt)
-      (rand * [@max_delay, @base_delay * 2**(attempt - 1)].min).ceil
+      (rand * [@max_delay, @base_delay * (2**(attempt - 1))].min).ceil
     end
   end
 

data/lib/online_migrations/migration.rb

@@ -4,24 +4,27 @@ module OnlineMigrations
   module Migration
     # @private
     def migrate(direction)
+      VerboseSqlLogs.enable if verbose_sql_logs?
+
       OnlineMigrations.current_migration = self
       command_checker.direction = direction
+
       super
+    ensure
+      VerboseSqlLogs.disable if verbose_sql_logs?
     end
 
     # @private
     def method_missing(method, *args, &block)
-      if is_a?(ActiveRecord::Schema)
+      if ar_schema?
         super
       elsif command_checker.check(method, *args, &block)
-        if !in_transaction?
-          if method == :with_lock_retries
-            connection.with_lock_retries(*args, &block)
-          else
-            connection.with_lock_retries { super }
-          end
-        else
+        if in_transaction?
           super
+        elsif method == :with_lock_retries
+          connection.with_lock_retries(*args, &block)
+        else
+          connection.with_lock_retries { super }
         end
       end
     end
@@ -52,6 +55,19 @@ module OnlineMigrations
     end
 
     private
+      def verbose_sql_logs?
+        if (verbose = ENV["ONLINE_MIGRATIONS_VERBOSE_SQL_LOGS"])
+          Utils.to_bool(verbose)
+        else
+          OnlineMigrations.config.verbose_sql_logs
+        end
+      end
+
+      def ar_schema?
+        is_a?(ActiveRecord::Schema) ||
+          (defined?(ActiveRecord::Schema::Definition) && is_a?(ActiveRecord::Schema::Definition))
+      end
+
       def command_checker
         @command_checker ||= CommandChecker.new(self)
       end

data/lib/online_migrations/schema_statements.rb

@@ -84,6 +84,7 @@ module OnlineMigrations
       model = Utils.define_model(self, table_name)
 
       conditions = columns_and_values.map do |(column_name, value)|
+        value = Arel.sql(value.call.to_s) if value.is_a?(Proc)
         arel_column = model.arel_table[column_name]
         arel_column.not_eq(value).or(arel_column.eq(nil))
       end
@@ -96,20 +97,28 @@ module OnlineMigrations
         updates =
           if Utils.ar_version <= 5.2
             columns_and_values.map do |(column_name, value)|
-              # ActiveRecord <= 5.2 can't quote these - we need to handle these cases manually
-              case value
-              when Arel::Attributes::Attribute
-                "#{quote_column_name(column_name)} = #{quote_column_name(value.name)}"
-              when Arel::Nodes::SqlLiteral
-                "#{quote_column_name(column_name)} = #{value}"
-              when Arel::Nodes::NamedFunction
-                "#{quote_column_name(column_name)} = #{value.name}(#{quote_column_name(value.expressions.first.name)})"
-              else
-                "#{quote_column_name(column_name)} = #{quote(value)}"
-              end
+              rhs =
+                # ActiveRecord <= 5.2 can't quote these - we need to handle these cases manually
+                case value
+                when Arel::Attributes::Attribute
+                  quote_column_name(value.name)
+                when Arel::Nodes::SqlLiteral
+                  value
+                when Arel::Nodes::NamedFunction
+                  "#{value.name}(#{quote_column_name(value.expressions.first.name)})"
+                when Proc
+                  value.call
+                else
+                  quote(value)
+                end
+
+              "#{quote_column_name(column_name)} = #{rhs}"
             end.join(", ")
           else
-            columns_and_values.to_h
+            columns_and_values.map do |(column, value)|
+              value = Arel.sql(value.call.to_s) if value.is_a?(Proc)
+              [column, value]
+            end.to_h
           end
 
         relation.update_all(updates)
@@ -383,8 +392,7 @@ module OnlineMigrations
     #
     def add_column_with_default(table_name, column_name, type, **options)
       default = options.fetch(:default)
-      if default.is_a?(Proc) &&
-         ActiveRecord.version < Gem::Version.new("5.0.0.beta2") # https://github.com/rails/rails/pull/20005
+      if default.is_a?(Proc) && Utils.ar_version < 5.0 # https://github.com/rails/rails/pull/20005
         raise ArgumentError, "Expressions as default are not supported"
       end
 
@@ -397,7 +405,7 @@ module OnlineMigrations
 
         if column_exists?(table_name, column_name)
           Utils.say("Column was not created because it already exists (this may be due to an aborted migration "\
-            "or similar) table_name: #{table_name}, column_name: #{column_name}")
+                    "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))
@@ -648,7 +656,7 @@ module OnlineMigrations
 
         if __index_valid?(index_name, schema: schema)
           Utils.say("Index was not created because it already exists (this may be due to an aborted migration "\
-            "or similar): table_name: #{table_name}, column_name: #{column_name}")
+                    "or similar): table_name: #{table_name}, column_name: #{column_name}")
           return
         else
           Utils.say("Recreating invalid index: table_name: #{table_name}, column_name: #{column_name}")
@@ -692,7 +700,7 @@ module OnlineMigrations
         end
       else
         Utils.say("Index was not removed because it does not exist (this may be due to an aborted migration "\
-          "or similar): table_name: #{table_name}, column_name: #{column_names}")
+                  "or similar): table_name: #{table_name}, column_name: #{column_names}")
       end
     end
 
@@ -703,7 +711,7 @@ module OnlineMigrations
     def add_foreign_key(from_table, to_table, validate: true, **options)
       if foreign_key_exists?(from_table, to_table, **options)
         message = "Foreign key was not created because it already exists " \
-          "(this can be due to an aborted migration or similar): from_table: #{from_table}, to_table: #{to_table}".dup
+                  "(this can be due to an aborted migration or similar): from_table: #{from_table}, to_table: #{to_table}".dup
         message << ", #{options.inspect}" if options.any?
 
         Utils.say(message)
@@ -761,7 +769,7 @@ module OnlineMigrations
 
       if __check_constraint_exists?(table_name, constraint_name)
         Utils.say("Check constraint was not created because it already exists (this may be due to an aborted migration "\
-          "or similar) table_name: #{table_name}, expression: #{expression}, constraint name: #{constraint_name}")
+                  "or similar) table_name: #{table_name}, expression: #{expression}, constraint name: #{constraint_name}")
       else
         query = "ALTER TABLE #{table_name} ADD CONSTRAINT #{constraint_name} CHECK (#{expression})"
         query += " NOT VALID" if !validate

data/lib/online_migrations/verbose_sql_logs.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module OnlineMigrations
+  # @private
+  module VerboseSqlLogs
+    class << self
+      def enable
+        @activerecord_logger_was = ActiveRecord::Base.logger
+        @verbose_query_logs_was = verbose_query_logs
+
+        stdout_logger = ActiveSupport::Logger.new($stdout)
+        stdout_logger.formatter = @activerecord_logger_was.formatter
+        stdout_logger.level = @activerecord_logger_was.level
+        stdout_logger = ActiveSupport::TaggedLogging.new(stdout_logger)
+
+        combined_logger = stdout_logger.extend(ActiveSupport::Logger.broadcast(@activerecord_logger_was))
+
+        ActiveRecord::Base.logger = combined_logger
+        set_verbose_query_logs(false)
+      end
+
+      def disable
+        ActiveRecord::Base.logger = @activerecord_logger_was
+        set_verbose_query_logs(@verbose_query_logs_was)
+      end
+
+      private
+        def verbose_query_logs
+          if Utils.ar_version > 7.0
+            ActiveRecord.verbose_query_logs
+          elsif Utils.ar_version >= 5.2
+            ActiveRecord::Base.verbose_query_logs
+          end
+        end
+
+        def set_verbose_query_logs(value) # rubocop:disable Naming/AccessorMethodName
+          if Utils.ar_version > 7.0
+            ActiveRecord.verbose_query_logs = value
+          elsif Utils.ar_version >= 5.2
+            ActiveRecord::Base.verbose_query_logs = value
+          end
+        end
+    end
+  end
+end

data/lib/online_migrations/version.rb

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

data/lib/online_migrations.rb

@@ -6,6 +6,7 @@ require "online_migrations/utils"
 require "online_migrations/error_messages"
 require "online_migrations/config"
 require "online_migrations/batch_iterator"
+require "online_migrations/verbose_sql_logs"
 require "online_migrations/migration"
 require "online_migrations/migrator"
 require "online_migrations/database_tasks"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: online_migrations
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - fatkodima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -88,6 +88,7 @@ files:
 - lib/online_migrations/schema_cache.rb
 - lib/online_migrations/schema_statements.rb
 - lib/online_migrations/utils.rb
+- lib/online_migrations/verbose_sql_logs.rb
 - lib/online_migrations/version.rb
 - online_migrations.gemspec
 homepage: https://github.com/fatkodima/online_migrations