safe-pg-migrations 0.0.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e766b867ff3d15f71bdaaa161e595e51bd1b83b9
-  data.tar.gz: b81ced0f60a21fe8e811962a614fc913ad97349a
+SHA256:
+  metadata.gz: fbda5becc48b8f9c7e0f45820f5f9ef908ba1f1fe56c306f03d3f76fb0197741
+  data.tar.gz: 4e88da86831d71cb440e1409ad52f3591aabcbd26de248507daffbec0e17698d
 SHA512:
-  metadata.gz: cd45ef3561909949c81b0b9927ed8e3f2b58ab101fd5436f8cb11afb72696e0668bb1bc773c8d66693f07c17456ce9b75f046f20866d1780165f96fd1e17f4a5
-  data.tar.gz: f0fca599eccc2ebb909c168ff9509e6f04ef6b16853aa4ae881a1274775b271f37881fe13c12edc4b03d4c7630d69010e3ef6f2401e861326c9380b8db588ef6
+  metadata.gz: e7dfbc18db1959f66a104e37d1f880934b369338b96435efc2db851fe80c092e9cf1e19a092274726dcb35da2fb05035d71a63e404dc89366de6c3483ce2131f
+  data.tar.gz: a176ae5e044b31ef271359aa9342698e1744e00c3fe99eb8f10c65fa77127671bf5265f4a4e65117df2f22bbc01bbc201ea22ecd2e0faca36e0822cc2f85e2b9

data/README.md

@@ -1,10 +1,10 @@
-# safe-pg-migrations [![Build Status](https://travis-ci.org/doctolib/safe-pg-migrations.svg?branch=master)](https://travis-ci.org/doctolib/safe-pg-migrations)
+# safe-pg-migrations
 
 ActiveRecord migrations for Postgres made safe.
 
 ## Requirements
 
-- Ruby 2.3+
+- Ruby 2.5+
 - Rails 5.2+
 - PostgreSQL 9.3+
 
@@ -28,7 +28,7 @@ class AddAdminToUsers < ActiveRecord::Migration[5.2]
 end
 ```
 
-If the `users` table is large, running this migration on a live Postgres database will likely cause downtime. **Safe PG Migrations** hooks into Active Record so that the following gets executed instead:
+If the `users` table is large, running this migration on a live Postgres 9 database will likely cause downtime. **Safe PG Migrations** hooks into Active Record so that the following gets executed instead:
 
 ```rb
 class AddAdminToUsers < ActiveRecord::Migration[5.2]
@@ -67,21 +67,23 @@ Active Record means developers don't have to be proficient in SQL to interact wi
 
 ## Feature set
 
-### Lock timeout
+<details><summary>Lock timeout</summary>
 
-Most DDL operations (e.g. adding a column, removing a column or adding a default value to a column) take an `ACCESS EXCLUSIVE` lock on the table they are altering. While these operations wait to acquire their lock, other statements are blocked. Before running a migration, **Safe PG Migrations** sets a short lock timeout so that statements are not blocked for too long.
+Most DDL operations (e.g. adding a column, removing a column or adding a default value to a column) take an `ACCESS EXCLUSIVE` lock on the table they are altering. While these operations wait to acquire their lock, other statements are blocked. Before running a migration, **Safe PG Migrations** sets a short lock timeout (default to 5 seconds) so that statements are not blocked for too long.
 
 See [PostgreSQL Alter Table and Long Transactions](http://www.joshuakehn.com/2017/9/9/postgresql-alter-table-and-long-transactions.html) and [Migrations and Long Transactions](https://www.fin.com/post/2018/1/migrations-and-long-transactions) for detailed explanations of the matter.
+</details>
 
-### Statement timeout
+<details><summary>Statement timeout</summary>
 
-Adding a foreign key or a not-null constraint can take a lot of time on a large table. The problem is that those operations take `ACCESS EXCLUSIVE` locks. We clearly don't want them to hold these locks for too long. Thus, **Safe PG Migrations** runs them with a short statement timeout.
+Adding a foreign key or a not-null constraint can take a lot of time on a large table. The problem is that those operations take `ACCESS EXCLUSIVE` locks. We clearly don't want them to hold these locks for too long. Thus, **Safe PG Migrations** runs them with a short statement timeout (default to 5 seconds).
 
 See [Zero-downtime Postgres migrations - the hard parts](https://gocardless.com/blog/zero-downtime-postgres-migrations-the-hard-parts/) for a detailed explanation on the subject.
+</details>
 
-### Prevent wrapping migrations in transaction
+<details><summary>Prevent wrapping migrations in transaction</summary>
 
-When **Safe PG Migrations** is enabled (which is the case by default if `Rails.env.production?` is true), migrations are not wrapped in a transaction. This is for several reasons:
+When **Safe PG Migrations** is used, migrations are not wrapped in a transaction. This is for several reasons:
 
 - We want to release locks as soon as possible.
 - In order to be able to retry statements that have failed because of a lock timeout, we have to be outside a transaction.
@@ -89,8 +91,22 @@ When **Safe PG Migrations** is enabled (which is the case by default if `Rails.e
 
 Note that if a migration fails, it won't be rollbacked. This can result in migrations being partially applied. In that case, they need to be manually reverted.
 
-### Safe `add_column`
+</details>
 
+<details>
+<summary>Safe <code>add_column</code></summary>
+
+**Safe PG Migrations** gracefully handle the upgrade to PG11 by **not** backfilling default value for existing rows, as the [database engine is now natively handling it](https://www.postgresql.org/docs/11/ddl-alter.html#DDL-ALTER-ADDING-A-COLUMN).
+
+Beware though, when adding a volatile default value: 
+```ruby
+add_column :users, :created_at, default: 'clock_timestamp()'
+```
+PG will still needs to update every row of the table, and will most likely statement timeout for big table. In this case, your best bet is to add the column without default, set the default, and backfill existing rows.
+
+<blockquote>
+
+**Note: Pre-postgre 11**
 Adding a column with a default value and a not-null constraint is [dangerous](https://wework.github.io/data/2015/11/05/add-columns-with-default-values-to-large-tables-in-rails-postgres/).
 
 **Safe PG Migrations** makes it safe by:
@@ -102,23 +118,108 @@ Adding a column with a default value and a not-null constraint is [dangerous](ht
 
 Note: the addition of the not null constraint may timeout. In that case, you may want to add the not-null constraint as initially not valid and validate it in a separate statement. See [Adding a not-null constraint on Postgres with minimal locking](https://medium.com/doctolib-engineering/adding-a-not-null-constraint-on-pg-faster-with-minimal-locking-38b2c00c4d1c).
 
-### Concurrent indexes
+</blockquote>    
+
+</details>
+
+<details><summary id="safe_add_remove_index">Safe <code>add_index</code> and <code>remove_index</code></summary>
 
 Creating an index requires a `SHARE` lock on the target table which blocks all write on the table while the index is created (which can take some time on a large table). This is usually not practical in a live environment. Thus, **Safe PG Migrations** ensures indexes are created concurrently.
 
-### Retry after lock timeout
+As `CREATE INDEX CONCURRENTLY` and `DROP INDEX CONCURRENTLY` are non-blocking operations (ie: read/write operations on the table are still possible), **Safe PG Migrations** sets a lock timeout to 30 seconds for those 2 specific statements.
+
+If you still get lock timeout while adding / removing indexes, it might be for one of those reasons:
+
+- Long-running queries are active on the table. To create / remove an index, PG needs to wait for the queries that are actually running to finish before starting the index creation / removal. The blocking activity logger might help you to pinpoint the culprit queries.
+- A vacuum / autovacuum is running on the table, holding a ShareUpdateExclusiveLock, you are most likely out of luck for the current migration, but you may try to [optimize your autovacuums settings](https://www.percona.com/blog/2018/08/10/tuning-autovacuum-in-postgresql-and-autovacuum-internals/).
 
-When a statement fails with a lock timeout, **Safe PG Migrations** retries them (5 times max).
+</details>
 
-### Blocking activity logging
+<details><summary id="safe_add_foreign_key">safe <code>add_foreign_key</code> (and <code>add_reference</code>)</summary>
+
+Adding a foreign key requires a `SHARE ROW EXCLUSIVE` lock, which **prevent writing in the tables** while the migration is running.
+
+Adding the constraint itself is rather fast, the major part of the time is spent on validating this constraint. Thus safe-pg-migrations ensures that adding a foreign key holds blocking locks for the least amount of time by splitting the foreign key creation in two steps: 
+
+1. adding the constraint *without validation*, will not validate existing rows;
+2. validating the constraint, will validate existing rows in the table, without blocking read or write on the table
+
+</details>
+
+<details><summary>Retry after lock timeout</summary>
+
+When a statement fails with a lock timeout, **Safe PG Migrations** retries it (5 times max) [list of retryable statments](https://github.com/doctolib/safe-pg-migrations/blob/66933256252b6bbf12e404b829a361dbba30e684/lib/safe-pg-migrations/plugins/statement_retrier.rb#L5)
+</details>
+
+<details><summary>Blocking activity logging</summary>
 
 If a statement fails with a lock timeout, **Safe PG Migrations** will try to tell you what was the blocking statement.
+</details>
+
+<details><summary>Verbose SQL logging</summary>
+
+For any operation, **Safe PG Migrations** can output the performed SQL queries. This feature is enabled by default in a production Rails environment. If you want to explicit enable it, for example in your development environment you can use:
+```bash
+export SAFE_PG_MIGRATIONS_VERBOSE=1
+```
+
+Instead of the traditional output:
+```ruby
+add_index :users, :age
+
+== 20191215132355 SampleIndex: migrating ======================================
+-- add_index(:users, :age)
+   -> add_index("users", :age, {:algorithm=>:concurrently})
+   -> 0.0175s
+== 20191215132355 SampleIndex: migrated (0.0200s) =============================
+```
+**Safe PG Migrations** will output the following logs:
+```ruby
+add_index :users, :age
+
+== 20191215132355 SampleIndex: migrating ======================================
+   (0.3ms)  SHOW lock_timeout
+   (0.3ms)  SET lock_timeout TO '5s'
+-- add_index(:users, :age)
+   -> add_index("users", :age, {:algorithm=>:concurrently})
+   (0.3ms)  SHOW statement_timeout
+   (0.3ms)  SET statement_timeout TO 0
+   (0.3ms)  SHOW lock_timeout
+   (0.3ms)  SET lock_timeout TO '30s'
+   (3.5ms)  CREATE INDEX CONCURRENTLY "index_users_on_age" ON "users"  ("age")
+   (0.3ms)  SET lock_timeout TO '5s'
+   (0.2ms)  SET statement_timeout TO '1min'
+   -> 0.0093s
+   (0.2ms)  SET lock_timeout TO '0'
+== 20191215132355 SampleIndex: migrated (0.0114s) =============================
+```
+So you can actually check that the `CREATE INDEX` statement will be performed concurrently, without any statement timeout and with a lock timeout of 30 seconds.
+
+*Nb: The `SHOW` statements are used by **Safe PG Migrations** to query settings for their original values in order to restore them after the work is done*
+
+</details>
+
+## Configuration
+
+**Safe PG Migrations** can be customized, here is an example of a Rails initializer (the values are the default ones):
+
+```ruby
+SafePgMigrations.config.safe_timeout = 5.seconds # Lock and statement timeout used for all DDL operations except from CREATE / DROP INDEX
+
+SafePgMigrations.config.blocking_activity_logger_margin = 1.second # Delay to output blocking queries before timeout. Must be shorter than safe_timeout
+
+SafePgMigrations.config.batch_size = 1000 # Size of the batches used for backfilling when adding a column with a default value pre-PG11
+
+SafePgMigrations.config.retry_delay = 1.minute # Delay between retries for retryable statements
+
+SafePgMigrations.config.max_tries = 5 # Number of retries before abortion of the migration
+```
 
 ## Runnings tests
 
 ```bash
 bundle
-psql -h localhost -c 'CREATE DATABASE safe_pg_migrations_test'
+psql -h localhost -U postgres -c 'CREATE DATABASE safe_pg_migrations_test'
 rake test
 ```
 
@@ -126,6 +227,7 @@ rake test
 
 - [Matthieu Prat](https://github.com/matthieuprat)
 - [Romain Choquet](https://github.com/rchoquet)
+- [Paul-Etienne Coisne](https://github.com/coisnepe)
 
 ## License
 
@@ -141,11 +243,12 @@ Alternatives:
 
 Interesting reads:
 
-- https://www.citusdata.com/blog/2018/02/22/seven-tips-for-dealing-with-postgres-locks/
-- https://www.fin.com/post/2018/1/migrations-and-long-transactions
-- http://www.joshuakehn.com/2017/9/9/postgresql-alter-table-and-long-transactions.html
-- https://medium.com/doctolib-engineering/adding-a-not-null-constraint-on-pg-faster-with-minimal-locking-38b2c00c4d1c
-- https://wework.github.io/data/2015/11/05/add-columns-with-default-values-to-large-tables-in-rails-postgres/
-- https://pedro.herokuapp.com/past/2011/7/13/rails_migrations_with_no_downtime/
-- https://www.braintreepayments.com/blog/safe-operations-for-high-volume-postgresql/
-- https://blog.codeship.com/rails-migrations-zero-downtime/
+- [When Postgres blocks: 7 tips for dealing with locks](https://www.citusdata.com/blog/2018/02/22/seven-tips-for-dealing-with-postgres-locks/)
+- [Migrations and Long Transactions in Postgres
+](https://www.fin.com/post/2018/1/migrations-and-long-transactions)
+- [PostgreSQL Alter Table and Long Transactions](http://www.joshuakehn.com/2017/9/9/postgresql-alter-table-and-long-transactions.html)
+- [Adding a NOT NULL CONSTRAINT on PG Faster with Minimal Locking](https://medium.com/doctolib-engineering/adding-a-not-null-constraint-on-pg-faster-with-minimal-locking-38b2c00c4d1c)
+- [Adding columns with default values to really large tables in Postgres + Rails](https://wework.github.io/data/2015/11/05/add-columns-with-default-values-to-large-tables-in-rails-postgres/)
+- [Rails migrations with no downtime](https://pedro.herokuapp.com/past/2011/7/13/rails_migrations_with_no_downtime/)
+- [Safe Operations For High Volume PostgreSQL](https://www.braintreepayments.com/blog/safe-operations-for-high-volume-postgresql/)
+- [Rails Migrations with Zero Downtime](https://blog.codeship.com/rails-migrations-zero-downtime/)

data/lib/safe-pg-migrations/base.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 require 'safe-pg-migrations/configuration'
+require 'safe-pg-migrations/plugins/verbose_sql_logger'
 require 'safe-pg-migrations/plugins/blocking_activity_logger'
 require 'safe-pg-migrations/plugins/statement_insurer'
 require 'safe-pg-migrations/plugins/statement_retrier'
 require 'safe-pg-migrations/plugins/idem_potent_statements'
+require 'safe-pg-migrations/plugins/useless_statements_logger'
 
 module SafePgMigrations
   # Order matters: the bottom-most plugin will have precedence
@@ -13,20 +15,28 @@ module SafePgMigrations
     IdemPotentStatements,
     StatementRetrier,
     StatementInsurer,
+    UselessStatementsLogger,
   ].freeze
 
   class << self
-    attr_reader :current_migration
-    attr_accessor :enabled
+    attr_reader :current_migration, :pg_version_num
 
     def setup_and_teardown(migration, connection)
+      @pg_version_num = get_pg_version_num(connection)
       @alternate_connection = nil
       @current_migration = migration
+      stdout_sql_logger = VerboseSqlLogger.new.setup if verbose?
       PLUGINS.each { |plugin| connection.extend(plugin) }
-      connection.with_setting(:lock_timeout, SafePgMigrations.config.safe_timeout) { yield }
+
+      connection.with_setting(:lock_timeout, SafePgMigrations.config.pg_safe_timeout) { yield }
     ensure
       close_alternate_connection
       @current_migration = nil
+      stdout_sql_logger&.teardown
+    end
+
+    def get_pg_version_num(connection)
+      connection.query_value('SHOW server_version_num').to_i
     end
 
     def alternate_connection
@@ -50,9 +60,8 @@ module SafePgMigrations
       say "#{method}(#{args.map(&:inspect) * ', '})", true
     end
 
-    def enabled?
-      return ENV['SAFE_PG_MIGRATIONS'] == '1' if ENV['SAFE_PG_MIGRATIONS']
-      return enabled unless enabled.nil?
+    def verbose?
+      return ENV['SAFE_PG_MIGRATIONS_VERBOSE'] == '1' if ENV['SAFE_PG_MIGRATIONS_VERBOSE']
       return Rails.env.production? if defined?(Rails)
 
       false
@@ -71,7 +80,8 @@ module SafePgMigrations
     end
 
     def disable_ddl_transaction
-      SafePgMigrations.enabled? || super
+      UselessStatementsLogger.warn_useless '`disable_ddl_transaction`' if super
+      true
     end
 
     SAFE_METHODS = %i[execute add_column add_index add_reference add_belongs_to change_column_null].freeze

data/lib/safe-pg-migrations/configuration.rb

@@ -5,17 +5,26 @@ require 'active_support/core_ext/numeric/time'
 module SafePgMigrations
   class Configuration
     attr_accessor :safe_timeout
-    attr_accessor :blocking_activity_logger_delay # Must be close to but smaller than safe_timeout.
+    attr_accessor :blocking_activity_logger_margin
     attr_accessor :batch_size
     attr_accessor :retry_delay
     attr_accessor :max_tries
 
     def initialize
-      self.safe_timeout = '5s'
-      self.blocking_activity_logger_delay = 4.seconds
+      self.safe_timeout = 5.seconds
+      self.blocking_activity_logger_margin = 1.second
       self.batch_size = 1000
-      self.retry_delay = 2.minutes
+      self.retry_delay = 1.minute
       self.max_tries = 5
     end
+
+    def pg_safe_timeout
+      pg_duration(safe_timeout)
+    end
+
+    def pg_duration(duration)
+      value, unit = duration.integer? ? [duration, 's'] : [(duration * 1000).to_i, 'ms']
+      "#{value}#{unit}"
+    end
   end
 end

data/lib/safe-pg-migrations/plugins/blocking_activity_logger.rb

@@ -3,7 +3,7 @@
 module SafePgMigrations
   module BlockingActivityLogger
     SELECT_BLOCKING_QUERIES_SQL = <<~SQL.squish
-      SELECT blocking_activity.query
+      SELECT blocking_activity.query, blocked_activity.xact_start as start
       FROM pg_catalog.pg_locks           blocked_locks
       JOIN pg_catalog.pg_stat_activity   blocked_activity
         ON blocked_activity.pid = blocked_locks.pid
@@ -25,8 +25,7 @@ module SafePgMigrations
     SQL
 
     %i[
-      add_column remove_column add_foreign_key remove_foreign_key change_column_default
-      change_column_null create_table add_index remove_index
+      add_column remove_column add_foreign_key remove_foreign_key change_column_default change_column_null create_table
     ].each do |method|
       define_method method do |*args, &block|
         log_blocking_queries { super(*args, &block) }
@@ -36,10 +35,13 @@ module SafePgMigrations
     private
 
     def log_blocking_queries
+      delay_before_logging =
+        SafePgMigrations.config.safe_timeout - SafePgMigrations.config.blocking_activity_logger_margin
+
       blocking_queries_retriever_thread =
         Thread.new do
-          sleep SafePgMigrations.config.blocking_activity_logger_delay
-          SafePgMigrations.alternate_connection.query_values(SELECT_BLOCKING_QUERIES_SQL % raw_connection.backend_pid)
+          sleep delay_before_logging
+          SafePgMigrations.alternate_connection.query(SELECT_BLOCKING_QUERIES_SQL % raw_connection.backend_pid)
         end
 
       yield
@@ -64,11 +66,21 @@ module SafePgMigrations
           "Statement was being blocked by the following #{'query'.pluralize(queries.size)}:", true
         )
         SafePgMigrations.say '', true
-        queries.each { |query| SafePgMigrations.say "  #{query}", true }
+        queries.each { |query, start_time| SafePgMigrations.say "#{format_start_time start_time}:  #{query}", true }
+        SafePgMigrations.say(
+          'Beware, some of those queries might run in a transaction. In this case the locking query might be '\
+          'located elsewhere in the transaction',
+          true
+        )
         SafePgMigrations.say '', true
       end
 
       raise
     end
+
+    def format_start_time(start_time, reference_time = Time.now)
+      duration = (reference_time - start_time).round
+      "transaction started #{duration} #{'second'.pluralize(duration)} ago"
+    end
   end
 end

data/lib/safe-pg-migrations/plugins/idem_potent_statements.rb

@@ -12,6 +12,52 @@ module SafePgMigrations
       super
     end
 
+    def add_column(table_name, column_name, type, options = {})
+      return super unless column_exists?(table_name, column_name)
+
+      SafePgMigrations.say("/!\\ Column '#{column_name}' already exists in '#{table_name}'. Skipping statement.", true)
+    end
+
+    def remove_column(table_name, column_name, type = nil, options = {})
+      return super if column_exists?(table_name, column_name)
+
+      SafePgMigrations.say("/!\\ Column '#{column_name}' not found on table '#{table_name}'. Skipping statement.", true)
+    end
+
+    def remove_index(table_name, options = {})
+      index_name = options.key?(:name) ? options[:name].to_s : index_name(table_name, options)
+
+      return super if index_name_exists?(table_name, index_name)
+
+      SafePgMigrations.say("/!\\ Index '#{index_name}' not found on table '#{table_name}'. Skipping statement.", true)
+    end
+
+    def add_foreign_key(from_table, to_table, **options)
+      options_or_to_table = options.slice(:name, :column).presence || to_table
+      return super unless foreign_key_exists?(from_table, options_or_to_table)
+
+      SafePgMigrations.say(
+        "/!\\ Foreign key '#{from_table}' -> '#{to_table}' already exists. Skipping statement.",
+        true
+      )
+    end
+
+    def create_table(table_name, comment: nil, **options)
+      return super if options[:force] || !table_exists?(table_name)
+
+      SafePgMigrations.say "/!\\ Table '#{table_name}' already exists.", true
+
+      td = create_table_definition(table_name, **options)
+
+      yield td if block_given?
+
+      SafePgMigrations.say(td.indexes.empty? ? '-- Skipping statement' : '-- Creating indexes', true)
+
+      td.indexes.each do |column_name, index_options|
+        add_index(table_name, column_name, index_options)
+      end
+    end
+
     private
 
     def index_valid?(index_name)

data/lib/safe-pg-migrations/plugins/statement_insurer.rb

@@ -2,23 +2,27 @@
 
 module SafePgMigrations
   module StatementInsurer
-    %i[change_column_null add_foreign_key create_table].each do |method|
+    PG_11_VERSION_NUM = 110_000
+
+    %i[change_column_null change_column].each do |method|
       define_method method do |*args, &block|
-        with_setting(:statement_timeout, SafePgMigrations.config.safe_timeout) { super(*args, &block) }
+        with_setting(:statement_timeout, SafePgMigrations.config.pg_safe_timeout) { super(*args, &block) }
       end
     end
 
-    def add_column(table_name, column_name, type, **options)
-      default = options.delete(:default)
+    def add_column(table_name, column_name, type, **options) # rubocop:disable Metrics/CyclomaticComplexity
+      need_default_value_backfill = SafePgMigrations.pg_version_num < PG_11_VERSION_NUM
+
+      default = options.delete(:default) if need_default_value_backfill
       null = options.delete(:null)
 
       if !default.nil? || null == false
-        SafePgMigrations.say_method_call(:add_column, table_name, column_name, type, **options)
+        SafePgMigrations.say_method_call(:add_column, table_name, column_name, type, options)
       end
 
       super
 
-      unless default.nil?
+      if need_default_value_backfill && !default.nil?
         SafePgMigrations.say_method_call(:change_column_default, table_name, column_name, default)
         change_column_default(table_name, column_name, default)
 
@@ -32,21 +36,46 @@ module SafePgMigrations
       end
     end
 
+    def add_foreign_key(from_table, to_table, **options)
+      validate_present = options.key? :validate
+      options[:validate] = false unless validate_present
+
+      with_setting(:statement_timeout, SafePgMigrations.config.pg_safe_timeout) { super }
+
+      options_or_to_table = options.slice(:name, :column).presence || to_table
+      without_statement_timeout { validate_foreign_key from_table, options_or_to_table } unless validate_present
+    end
+
+    def create_table(*)
+      with_setting(:statement_timeout, SafePgMigrations.config.pg_safe_timeout) do
+        super do |td|
+          yield td if block_given?
+          td.indexes.map! do |key, index_options|
+            index_options[:algorithm] ||= :default
+            [key, index_options]
+          end
+        end
+      end
+    end
+
     def add_index(table_name, column_name, **options)
-      if SafePgMigrations.enabled?
+      if options[:algorithm] == :default
+        options.delete :algorithm
+      else
         options[:algorithm] = :concurrently
-        SafePgMigrations.say_method_call(:add_index, table_name, column_name, **options)
       end
-      without_statement_timeout { super }
+
+      SafePgMigrations.say_method_call(:add_index, table_name, column_name, options)
+
+      without_timeout { super }
     end
 
     def remove_index(table_name, options = {})
       options = { column: options } unless options.is_a?(Hash)
-      if SafePgMigrations.enabled?
-        options[:algorithm] = :concurrently
-        SafePgMigrations.say_method_call(:remove_index, table_name, **options)
-      end
-      without_statement_timeout { super }
+      options[:algorithm] = :concurrently
+      SafePgMigrations.say_method_call(:remove_index, table_name, options)
+
+      without_timeout { super }
     end
 
     def backfill_column_default(table_name, column_name)
@@ -86,5 +115,13 @@ module SafePgMigrations
     def without_statement_timeout
       with_setting(:statement_timeout, 0) { yield }
     end
+
+    def without_lock_timeout
+      with_setting(:lock_timeout, 0) { yield }
+    end
+
+    def without_timeout
+      without_statement_timeout { without_lock_timeout { yield } }
+    end
   end
 end

data/lib/safe-pg-migrations/plugins/statement_retrier.rb

@@ -3,8 +3,7 @@
 module SafePgMigrations
   module StatementRetrier
     RETRIABLE_SCHEMA_STATEMENTS = %i[
-      add_column remove_column add_foreign_key remove_foreign_key change_column_default
-      change_column_null add_index
+      add_column add_foreign_key remove_foreign_key change_column_default change_column_null remove_column
     ].freeze
 
     RETRIABLE_SCHEMA_STATEMENTS.each do |method|

data/lib/safe-pg-migrations/plugins/useless_statements_logger.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module SafePgMigrations
+  module UselessStatementsLogger
+    def self.warn_useless(action, link = nil, *args)
+      SafePgMigrations.say "/!\\ No need to explicitly use #{action}, safe-pg-migrations does it for you", *args
+      SafePgMigrations.say "\t see #{link} for more details", *args if link
+    end
+
+    def add_index(*, **options)
+      warn_for_index(**options)
+      super
+    end
+
+    def remove_index(table_name, options = {})
+      warn_for_index(options) if options.is_a? Hash
+      super
+    end
+
+    def add_foreign_key(*, **options)
+      if options[:validate] == false
+        UselessStatementsLogger.warn_useless '`validate: :false`', 'https://github.com/doctolib/safe-pg-migrations#safe_add_foreign_key'
+      end
+      super
+    end
+
+    def warn_for_index(**options)
+      return unless options[:algorithm] == :concurrently
+
+      UselessStatementsLogger.warn_useless '`algorithm: :concurrently`', 'https://github.com/doctolib/safe-pg-migrations#safe_add_remove_index'
+    end
+  end
+end

data/lib/safe-pg-migrations/plugins/verbose_sql_logger.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module SafePgMigrations
+  class VerboseSqlLogger
+    def setup
+      @activerecord_logger_was = ActiveRecord::Base.logger
+      @verbose_query_logs_was = ActiveRecord::Base.verbose_query_logs
+      @colorize_logging_was = ActiveRecord::LogSubscriber.colorize_logging
+
+      disable_marginalia if defined?(Marginalia)
+
+      stdout_logger = Logger.new($stdout, formatter: ->(_severity, _time, _progname, query) { "#{query}\n" })
+      ActiveRecord::Base.logger = stdout_logger
+      ActiveRecord::LogSubscriber.colorize_logging = colorize_logging?
+      # Do not output caller method, we know it is coming from the migration
+      ActiveRecord::Base.verbose_query_logs = false
+      self
+    end
+
+    def teardown
+      ActiveRecord::Base.verbose_query_logs = @verbose_query_logs_was
+      ActiveRecord::LogSubscriber.colorize_logging = @colorize_logging_was
+      ActiveRecord::Base.logger = @activerecord_logger_was
+      enable_marginalia if defined?(Marginalia)
+    end
+
+    private
+
+    def colorize_logging?
+      defined?(Rails) && Rails.env.development?
+    end
+
+    # Marginalia annotations will most likely pollute the output
+    def disable_marginalia
+      @marginalia_components_were = Marginalia::Comment.components
+      Marginalia::Comment.components = []
+    end
+
+    def enable_marginalia
+      Marginalia::Comment.components = @marginalia_components_were
+    end
+  end
+end

data/lib/safe-pg-migrations/railtie.rb

@@ -4,7 +4,7 @@ require 'safe-pg-migrations/base'
 
 module SafePgMigrations
   class Railtie < Rails::Railtie
-    initializer 'sage_pg_migrations.insert_into_active_record' do
+    initializer 'safe_pg_migrations.insert_into_active_record' do
       ActiveSupport.on_load :active_record do
         ActiveRecord::Migration.prepend(SafePgMigrations::Migration)
       end

data/lib/safe-pg-migrations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SafePgMigrations
-  VERSION = '0.0.2'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safe-pg-migrations
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Matthieu Prat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -166,6 +166,8 @@ files:
 - lib/safe-pg-migrations/plugins/idem_potent_statements.rb
 - lib/safe-pg-migrations/plugins/statement_insurer.rb
 - lib/safe-pg-migrations/plugins/statement_retrier.rb
+- lib/safe-pg-migrations/plugins/useless_statements_logger.rb
+- lib/safe-pg-migrations/plugins/verbose_sql_logger.rb
 - lib/safe-pg-migrations/railtie.rb
 - lib/safe-pg-migrations/version.rb
 homepage: https://github.com/doctolib/safe-pg-migrations
@@ -180,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -188,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Make your PG migrations safe.