declare_schema 1.2.2.pre.0 → 1.2.3.pre.ga.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 845f78b84a0a36a5d218c35351b1445d669b512b96745ee7bf7ab6a2a0a97277
-  data.tar.gz: d983c4fb5d5e3bb123854a8dada61c02970de010331770f77ab3630c084c8a04
+  metadata.gz: 64db3ac9b4bea4625bbd2bdc40f9aea3296157c535d3bc773aab680fa33d3e9d
+  data.tar.gz: a5681f63baa97b4cc4409bf9784a0b2c45d58ac8fe251214771ebb269eb649ee
 SHA512:
-  metadata.gz: 4bcf9de4ccb29f0679ebe15f3892858e628bda5ed4eb30b7d7860d687a2233df7b24d7a913772b8b4d312ab378bcdc4b2fa1675b17f9d69e20d166d1eb0f0dba
-  data.tar.gz: 8e21e6bc2a9d5dd6f3ab40b971cf6f31de66901049f28b17f927d40ae247ecd6c7af60bfe300f9f27b15af0e58df205a3de7e9f97a5dc4a94c8c5bf7b5602a8c
+  metadata.gz: 8e4dd03780302f015725770a734a58d369f9655c7717e64497dbb24ce4602cd379bc7b8db15d89780adb55ec342e485110e8e34fdf0ef522e4925a927433891b
+  data.tar.gz: 61f05f815b21f47fa358950c25b38411dcde90b59b73fbca1a373291e0552dcc1d3c516e1c894c84c5bae5cbe66b2ca80a976ce537c1c42e8b4a2d8d06b3cf56

data/CHANGELOG.md

@@ -4,7 +4,7 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.2.2] - Unreleased
+## [1.2.2] - 2023-01-27
 ### Changed
 - Documented `belongs_to` and `has_and_belongs_to_many` behavior
 - Documented configurable ignored tables behavior

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (1.2.2.pre.0)
+    declare_schema (1.2.3.pre.ga.0)
       rails (>= 5.0)
 
 GEM

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "1.2.2.pre.0"
+  VERSION = "1.2.3.pre.ga.0"
 end

data/lib/generators/declare_schema/migration/migrator.rb

@@ -407,7 +407,7 @@ module Generators
           fk_changes = if ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
                          []
                        else
-                         change_foreign_key_constraints(model, current_table_name)
+                         change_foreign_key_constraints(model, current_table_name, to_rename)
                        end
           table_options_changes = if ActiveRecord::Base.connection.class.name.match?(/mysql/i)
                                     change_table_options(model, current_table_name)
@@ -451,11 +451,30 @@ module Generators
               end
           end
 
-          drop_indexes = (existing_indexes_without_primary_key - model_indexes_without_primary_key).map do |i|
+          indexes_to_drop = existing_indexes_without_primary_key - model_indexes_without_primary_key
+          indexes_to_add = model_indexes_without_primary_key - existing_indexes_without_primary_key
+
+          renamed_indexes_to_drop = []
+          renamed_indexes_to_add = []
+
+          indexes_to_drop.each { |index_to_drop|
+            renamed_columns = index_to_drop.columns.map do |column|
+              to_rename[column]
+            end
+
+            indexes_to_add.each { |index_to_add|
+              if renamed_columns == index_to_add.columns
+                renamed_indexes_to_drop.append(index_to_drop)
+                renamed_indexes_to_add.append(index_to_add)
+              end
+            }
+          }
+
+          drop_indexes = (indexes_to_drop - renamed_indexes_to_drop).map do |i|
             ::DeclareSchema::SchemaChange::IndexRemove.new(new_table_name, i.columns, unique: i.unique, where: i.where, name: i.name)
           end
 
-          add_indexes = (model_indexes_without_primary_key - existing_indexes_without_primary_key).map do |i|
+          add_indexes = (indexes_to_add - renamed_indexes_to_add).map do |i|
             ::DeclareSchema::SchemaChange::IndexAdd.new(new_table_name, i.columns, unique: i.unique, where: i.where, name: i.name)
           end
 
@@ -463,19 +482,38 @@ module Generators
           [Array(change_primary_key) + drop_indexes + add_indexes]
         end
 
-        def change_foreign_key_constraints(model, old_table_name)
+        def change_foreign_key_constraints(model, old_table_name, to_rename)
           ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/) and raise ArgumentError, 'SQLite does not support foreign keys'
           ::DeclareSchema.default_generate_foreign_keys or return []
 
           existing_fks = ::DeclareSchema::Model::ForeignKeyDefinition.for_model(model, old_table_name)
           model_fks = model.constraint_specs
 
-          drop_fks = (existing_fks - model_fks).map do |fk|
+          fks_to_drop = existing_fks - model_fks
+          fks_to_add = model_fks - existing_fks
+
+          renamed_fks_to_drop = []
+          renamed_fks_to_add = []
+
+          fks_to_drop.each { |fk_to_drop|
+            fks_to_add.each { |fk_to_add|
+              if fk_to_add.child_table_name == fks_to_drop.child_table_name &&
+                fk_to_add.parent_table_name == fks_to_drop.parent_table_name &&
+                fk_to_add.constraint_name == fks_to_drop.constraint_name &&
+                fk_to_add.foreign_key == to_rename[fks_to_drop.foreign_key]
+
+                renamed_fks_to_drop.append(fk_to_drop)
+                renamed_fks_to_add.append(fk_to_add)
+              end
+            }
+          }
+
+          drop_fks = (fks_to_drop - renamed_fks_to_drop).map do |fk|
             ::DeclareSchema::SchemaChange::ForeignKeyRemove.new(fk.child_table_name, fk.parent_table_name,
                                                                 column_name: fk.foreign_key_name, name: fk.constraint_name)
           end
 
-          add_fks = (model_fks - existing_fks).map do |fk|
+          add_fks = (fks_to_add - renamed_fks_to_add).map do |fk|
             # next if fk.parent.constantize.abstract_class || fk.parent == fk.model.class_name
             ::DeclareSchema::SchemaChange::ForeignKeyAdd.new(fk.child_table_name, fk.parent_table_name,
                                                              column_name: fk.foreign_key_name, name: fk.constraint_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 1.2.2.pre.0
+  version: 1.2.3.pre.ga.0
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails