strong_migrations 0.7.9 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2fb3fbcc5caf98759ebe2ef05a4ef011eca91924e479647d36e2b261baf2c8e
-  data.tar.gz: '0118bd4e05814f2d531a659a724237080763843bd6cb3ff0b880447348004585'
+  metadata.gz: 1f885cc0a8b0fb30e3bc4d000e82584fdf3850943563b4b426d3cfc39d70015c
+  data.tar.gz: d0dd29ea45ccc3b7c571e8bf03fa98c401d5489d1f5459488a0eff411cf6880e
 SHA512:
-  metadata.gz: 7a04ea74876b44c645c9cba04c2f7b4932fcc0637eedd78b544dadf40272c84fb0461420e66c49c991c214f5d36b53acbface0347af25cb65c1e9c1251375886
-  data.tar.gz: 8e97437c5eae3b3aa6508e08c21aa8caf648a03989e621d37c165d1a2412a3cc67784d0923d47e7f814475bb000c6e68e93bf5ce6ef5dbd83f03fc399bb85b4c
+  metadata.gz: c03a023d4c593d2868e524ca0f3e7ebd93e07e087e02f0d7090210b00fdb1fdc50d2abb74ab7df4131bddc6052fc5b9c10ce902ede8c708927476e40ad49d07f
+  data.tar.gz: 479e34db0101a15e1db1a593f01773da5665baa5cda3403ad32ea58dca00a0d0faee0ef813cf1975b7e9f99f1591e7f4f2be5c456c96fd6ae4633b48b6a0b3b4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.8.0 (2022-02-09)
+
+- Fixed error with versioned schema with Active Record 7.0.2+
+- Dropped support for Ruby < 2.6 and Active Record < 5.2
+
 ## 0.7.9 (2021-12-15)
 
 - Fixed error with multiple databases with Active Record 7

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Bob Remeika and David Waller, 2015-2021 Andrew Kane
+Copyright (c) 2013 Bob Remeika and David Waller, 2015-2022 Andrew Kane
 
 MIT License
 

data/README.md

@@ -15,7 +15,7 @@ Supports for PostgreSQL, MySQL, and MariaDB
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'strong_migrations'
+gem "strong_migrations"
 ```
 
 And run:
@@ -119,6 +119,7 @@ end
   ```
 
 4. Deploy and run migration
+5. Remove the line added in step 1
 
 ### Adding a column with a default value
 
@@ -540,9 +541,7 @@ end
 
 #### Good
 
-Add the foreign key without validating existing rows, then validate them in a separate migration.
-
-For Rails 5.2+, use:
+Add the foreign key without validating existing rows:
 
 ```ruby
 class AddForeignKeyOnUsers < ActiveRecord::Migration[7.0]
@@ -552,7 +551,7 @@ class AddForeignKeyOnUsers < ActiveRecord::Migration[7.0]
 end
 ```
 
-Then:
+Then validate them in a separate migration.
 
 ```ruby
 class ValidateForeignKeyOnUsers < ActiveRecord::Migration[7.0]
@@ -562,30 +561,6 @@ class ValidateForeignKeyOnUsers < ActiveRecord::Migration[7.0]
 end
 ```
 
-For Rails < 5.2, use:
-
-```ruby
-class AddForeignKeyOnUsers < ActiveRecord::Migration[5.1]
-  def change
-    safety_assured do
-      execute 'ALTER TABLE "users" ADD CONSTRAINT "fk_rails_c1e9b98e31" FOREIGN KEY ("order_id") REFERENCES "orders" ("id") NOT VALID'
-    end
-  end
-end
-```
-
-Then:
-
-```ruby
-class ValidateForeignKeyOnUsers < ActiveRecord::Migration[5.1]
-  def change
-    safety_assured do
-      execute 'ALTER TABLE "users" VALIDATE CONSTRAINT "fk_rails_c1e9b98e31"'
-    end
-  end
-end
-```
-
 ### Adding a json column
 
 #### Bad

data/lib/strong_migrations/checker.rb

@@ -86,8 +86,7 @@ module StrongMigrations
           options ||= {}
           default = options[:default]
 
-          if !default.nil? && !((postgresql? && postgresql_version >= Gem::Version.new("11")) || (mysql? && mysql_version >= Gem::Version.new("8.0.12")) || (mariadb? && mariadb_version >= Gem::Version.new("10.3.2")))
-
+          if !default.nil? && !add_column_default_safe?
             if options[:null] == false
               options = options.except(:null)
               append = "
@@ -230,8 +229,10 @@ Then add the foreign key in separate migrations."
                 validate_code = constraint_str("ALTER TABLE %s VALIDATE CONSTRAINT %s", [table, constraint_name])
                 remove_code = constraint_str("ALTER TABLE %s DROP CONSTRAINT %s", [table, constraint_name])
 
+                constraint_methods = ar_version >= 6.1
+
                 validate_constraint_code =
-                  if ar_version >= 6.1
+                  if constraint_methods
                     String.new(command_str(:validate_check_constraint, [table, {name: constraint_name}]))
                   else
                     String.new(safety_assured_str(validate_code))
@@ -242,7 +243,7 @@ Then add the foreign key in separate migrations."
 
                   validate_constraint_code << "\n    #{command_str(:change_column_null, change_args)}"
 
-                  if ar_version >= 6.1
+                  if constraint_methods
                     validate_constraint_code << "\n    #{command_str(:remove_check_constraint, [table, {name: constraint_name}])}"
                   else
                     validate_constraint_code << "\n    #{safety_assured_str(remove_code)}"
@@ -252,7 +253,7 @@ Then add the foreign key in separate migrations."
                 return safe_change_column_null(add_code, validate_code, change_args, remove_code) if StrongMigrations.safe_by_default
 
                 add_constraint_code =
-                  if ar_version >= 6.1
+                  if constraint_methods
                     # only quote when needed
                     expr_column = column.to_s =~ /\A[a-z0-9_]+\z/ ? column : connection.quote_column_name(column)
                     command_str(:add_check_constraint, [table, "#{expr_column} IS NOT NULL", {name: constraint_name, validate: false}])
@@ -275,32 +276,14 @@ Then add the foreign key in separate migrations."
           from_table, to_table, options = args
           options ||= {}
 
-          # always validated before 5.2
-          validate = options.fetch(:validate, true) || ar_version < 5.2
+          validate = options.fetch(:validate, true)
 
           if postgresql? && validate
-            if ar_version < 5.2
-              # fk name logic from rails
-              primary_key = options[:primary_key] || "id"
-              column = options[:column] || "#{to_table.to_s.singularize}_id"
-              hashed_identifier = Digest::SHA256.hexdigest("#{from_table}_#{column}_fk").first(10)
-              fk_name = options[:name] || "fk_rails_#{hashed_identifier}"
-
-              add_code = constraint_str("ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s) NOT VALID", [from_table, fk_name, column, to_table, primary_key])
-              validate_code = constraint_str("ALTER TABLE %s VALIDATE CONSTRAINT %s", [from_table, fk_name])
-
-              return safe_add_foreign_key_code(from_table, to_table, add_code, validate_code) if StrongMigrations.safe_by_default
-
-              raise_error :add_foreign_key,
-                add_foreign_key_code: safety_assured_str(add_code),
-                validate_foreign_key_code: safety_assured_str(validate_code)
-            else
-              return safe_add_foreign_key(from_table, to_table, options) if StrongMigrations.safe_by_default
+            return safe_add_foreign_key(from_table, to_table, options) if StrongMigrations.safe_by_default
 
-              raise_error :add_foreign_key,
-                add_foreign_key_code: command_str("add_foreign_key", [from_table, to_table, options.merge(validate: false)]),
-                validate_foreign_key_code: command_str("validate_foreign_key", [from_table, to_table])
-            end
+            raise_error :add_foreign_key,
+              add_foreign_key_code: command_str("add_foreign_key", [from_table, to_table, options.merge(validate: false)]),
+              validate_foreign_key_code: command_str("validate_foreign_key", [from_table, to_table])
           end
         when :validate_foreign_key
           if postgresql? && writes_blocked?
@@ -598,5 +581,17 @@ Then add the foreign key in separate migrations."
     def new_table?(table)
       @new_tables.include?(table.to_s)
     end
+
+    def add_column_default_safe?
+      if postgresql?
+        postgresql_version >= Gem::Version.new("11")
+      elsif mysql?
+        mysql_version >= Gem::Version.new("8.0.12")
+      elsif mariadb?
+        mariadb_version >= Gem::Version.new("10.3.2")
+      else
+        false
+      end
+    end
   end
 end

data/lib/strong_migrations/migration.rb

@@ -9,6 +9,9 @@ module StrongMigrations
     def method_missing(method, *args)
       return super if is_a?(ActiveRecord::Schema)
 
+      # Active Record 7.0.2+ versioned schema
+      return super if defined?(ActiveRecord::Schema::Definition) && is_a?(ActiveRecord::Schema::Definition)
+
       strong_migrations_checker.perform(method, *args) do
         super
       end

data/lib/strong_migrations/safe_methods.rb

@@ -56,21 +56,6 @@ module StrongMigrations
       end
     end
 
-    def safe_add_foreign_key_code(from_table, to_table, add_code, validate_code)
-      @migration.reversible do |dir|
-        dir.up do
-          @migration.safety_assured do
-            @migration.execute(add_code)
-            disable_transaction
-            @migration.execute(validate_code)
-          end
-        end
-        dir.down do
-          @migration.remove_foreign_key(from_table, to_table)
-        end
-      end
-    end
-
     def safe_add_check_constraint(table, expression, add_options, validate_options)
       @migration.reversible do |dir|
         dir.up do

data/lib/strong_migrations/version.rb

@@ -1,3 +1,3 @@
 module StrongMigrations
-  VERSION = "0.7.9"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strong_migrations
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrew Kane
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
 description:
 email:
 - andrew@ankane.org
@@ -61,14 +61,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Catch unsafe migrations in development