declare_schema 1.2.2 → 1.2.3.pre.ga.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d831ee175d229d9c618cffa6b89fa375eb15bf2e9121feb732d474e46048051
-  data.tar.gz: 1ea6d18318ad4f02591e68491b526b062e4d3b0e628b5ac7512987ed0f5772d1
+  metadata.gz: c9557ec596238900fa3a3149ab9c38dfc420af5e0410f8f2fbaa3fb41a009104
+  data.tar.gz: 292bc6f481dff79424a50e6a405ab8ff7f64f205a46f1aef83748139ba3ed8a1
 SHA512:
-  metadata.gz: 2bb053f279aab8ab554d7258abdd9781c2b8981e4086a03a527c6541dcb2dbff27fd2770370d907ff463f54417d11228b8040e0e738ee822f9588ff292c46b25
-  data.tar.gz: 5504007956e98a03c051c7b28272fe92a09165d59e29dc395900cbeb726c90bb06f243d313f08f27e74d4efe0c65a53ca92a9761f4fe020a00ad2e3794de27a2
+  metadata.gz: d9ab8ca57e5782d3658dea77d8623a41d3b5d4fa89782822deca899b0ee39c98b68cf2e07317ad6bcd7f75b027a3491f64dadbb259f6f7c3b64511de7bb65938
+  data.tar.gz: 1f3b7a0ce7ad48027f9a59c47f2125dcd25f5f1d6ae2ea92ca3ccee4e48a1bf1f06ebfb628ab0c05d67bdea3630fb4a65c0dca5fcf4999dfa49ceddacb2d8aaf

data/Gemfile.lock

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

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "1.2.2"
+  VERSION = "1.2.3.pre.ga.1"
 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 == fk_to_drop.child_table_name &&
+                fk_to_add.parent_table_name == fk_to_drop.parent_table_name &&
+                fk_to_add.constraint_name == fk_to_drop.constraint_name &&
+                fk_to_add.foreign_key == to_rename[fk_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
+  version: 1.2.3.pre.ga.1
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails