strong_migrations 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2afb67b7b25f7608d3d77d266703a23b5585fcfe006d8442a3da42547979f8d
-  data.tar.gz: 502347f1d82a120f93694bdffb3cc9d434573bb2e6c14f75f61c5dc1b43c723d
+  metadata.gz: f64d60856479de1a9071b64be2186256e619c30a6caea46d2f8094fb1d3ded4b
+  data.tar.gz: 586c15c10b53ba6273685d3d4bbeaa84f0c23fc973643abac1a2687d3ad2e986
 SHA512:
-  metadata.gz: bb821b724c1d55150415e117c1509f407edadcb209312ee869b230563b59e55e64072371631b9a75f59e84bbc7af0bdde05e5e5e872ad0dc738917d28ea5c49f
-  data.tar.gz: eb503dd38ecc6ad8877e4a2c506b6503f5a00ac661f8adbc4962d6802009c278091d4a7236dff4c83d64885405d468a9275fd4601e869d3dffac709c3c39cc13
+  metadata.gz: d5aac390d0d1f965819311ec4ad0cc18b66eb310768f5ed95635670ca646f8804cf0fb672c94f4f1b59f6d812b027cc2d666607bf9b55d5a5f58f37726056d8c
+  data.tar.gz: f0ec6e96d589aa99df461bbcc29201142a25a74a951edbbdf72c49e8a1d81a58623ccb6f049d2630a5cbd517f9edf9119511087d51da90f95c9794a13f5c1fb1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.8 (2020-05-13)
+
+- `change_column_null` on a column with a `NOT NULL` constraint is safe in Postgres 12+
+
 ## 0.6.7 (2020-05-13)
 
 - Improved comments in initializer

data/README.md

@@ -497,11 +497,17 @@ class ValidateSomeColumnNotNull < ActiveRecord::Migration[6.0]
     safety_assured do
       execute 'ALTER TABLE "users" VALIDATE CONSTRAINT "users_some_column_null"'
     end
+
+    # in Postgres 12+, you can safely turn this into a traditional column constraint
+    change_column_null :users, :some_column, false
+    safety_assured do
+      execute 'ALTER TABLE "users" DROP CONSTRAINT "users_some_column_null"'
+    end
   end
 end
 ```
 
-Note: This is not 100% the same as `NOT NULL` column constraint. Here’s a [good explanation](https://medium.com/doctolib/adding-a-not-null-constraint-on-pg-faster-with-minimal-locking-38b2c00c4d1c).
+Note: This is not 100% the same as `NOT NULL` column constraint before Postgres 12. Here’s a [good explanation](https://medium.com/doctolib/adding-a-not-null-constraint-on-pg-faster-with-minimal-locking-38b2c00c4d1c).
 
 ### Keeping non-unique indexes to three columns or less
 

data/lib/strong_migrations/checker.rb

@@ -196,12 +196,26 @@ Then add the foreign key in separate migrations."
           table, column, null, default = args
           if !null
             if postgresql?
-              # match https://github.com/nullobject/rein
-              constraint_name = "#{table}_#{column}_null"
+              safe = false
+              if postgresql_version >= Gem::Version.new("12")
+                # TODO likely need to quote the column in some situations
+                safe = constraints(table).any? { |c| c["def"] == "CHECK ((#{column} IS NOT NULL))" }
+              end
+
+              unless safe
+                # match https://github.com/nullobject/rein
+                constraint_name = "#{table}_#{column}_null"
+
+                validate_constraint_code = String.new(constraint_str("ALTER TABLE %s VALIDATE CONSTRAINT %s", [table, constraint_name]))
+                if postgresql_version >= Gem::Version.new("12")
+                  validate_constraint_code << "\n    #{command_str(:change_column_null, [table, column, null])}"
+                  validate_constraint_code << "\n    #{constraint_str("ALTER TABLE %s DROP CONSTRAINT %s", [table, constraint_name])}"
+                end
 
-              raise_error :change_column_null_postgresql,
-                add_constraint_code: constraint_str("ALTER TABLE %s ADD CONSTRAINT %s CHECK (%s IS NOT NULL) NOT VALID", [table, constraint_name, column]),
-                validate_constraint_code: constraint_str("ALTER TABLE %s VALIDATE CONSTRAINT %s", [table, constraint_name])
+                raise_error :change_column_null_postgresql,
+                  add_constraint_code: constraint_str("ALTER TABLE %s ADD CONSTRAINT %s CHECK (%s IS NOT NULL) NOT VALID", [table, constraint_name, column]),
+                  validate_constraint_code: validate_constraint_code
+              end
             elsif mysql? || mariadb?
               raise_error :change_column_null_mysql
             elsif !default.nil?
@@ -255,7 +269,6 @@ Then add the foreign key in separate migrations."
       result
     end
 
-    # TODO allow string timeouts in 0.7.0
     def set_timeouts
       if !@timeouts_set
         if StrongMigrations.statement_timeout
@@ -379,7 +392,7 @@ Then add the foreign key in separate migrations."
 
     # units: https://www.postgresql.org/docs/current/config-setting.html
     def timeout_to_sec(timeout)
-      suffixes = {
+      units = {
         "us" => 0.001,
         "ms" => 1,
         "s" => 1000,
@@ -388,7 +401,7 @@ Then add the foreign key in separate migrations."
         "d" => 1000 * 60 * 60 * 24
       }
       timeout_ms = timeout.to_i
-      suffixes.each do |k, v|
+      units.each do |k, v|
         if timeout.end_with?(k)
           timeout_ms *= v
           break
@@ -405,6 +418,16 @@ Then add the foreign key in separate migrations."
       end
     end
 
+    def constraints(table_name)
+      query = <<-SQL
+        SELECT conname AS name, pg_get_constraintdef(oid) AS def FROM pg_constraint
+        WHERE contype = 'c'
+          AND convalidated
+          AND conrelid = #{connection.quote(connection.quote_table_name(table_name))}::regclass
+      SQL
+      connection.select_all(query.squish).to_a
+    end
+
     def raise_error(message_key, header: nil, append: nil, **vars)
       return unless StrongMigrations.check_enabled?(message_key, version: version)
 

data/lib/strong_migrations/version.rb

@@ -1,3 +1,3 @@
 module StrongMigrations
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strong_migrations
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Andrew Kane
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord