declare_schema 1.2.3.pre.ga.2 → 1.2.3.pre.ga.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b2501407fb1875c42fda5d9c77ab78ca1f966c780e0888716e6e71769ea53b1
-  data.tar.gz: 535e054f1ad938d271334fdc6054108778dde1f72e59335d778f11ab73d08c14
+  metadata.gz: 506475213508a2b48038ccb1e8d2b4398b03879d88a7760803ffbc9273463033
+  data.tar.gz: 6fac90c4db4626a52d98c71ad98c6f8615e8f041473874575f9b3ba2e2123589
 SHA512:
-  metadata.gz: 6f5c2dea9bd05f536f05f058ce193a4003384f754649d5b922bbce6532bfe25f60e8c987e2b1136b603899cc0cb9217f0dcc8b59e6bbf974f9dc57aa600abf36
-  data.tar.gz: 17fe43628304597208f5063fc907ae3bd85586732a26985c0d709004d4411af1ff89dfab79b41334073c7860231b0c560ae5d6eff605a72335748335696da5d8
+  metadata.gz: 9d9eda18aaa034a6b78239e76e2416b1a0f26a4094268b9a9fb1b4f807108a557d7163d7e623568cb3a6bf1bc4d5dee1d84068d7b391e5cc399b81de095aad6e
+  data.tar.gz: 36c6b8f67da4ece257360b4bded0dc79b08e9e31a3f9a3ba0745016ebd481ad76c13e7f8fb549e1d923c9e557056ceff10b60858bb0fa0743f61131af31f0a08

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.3] - Unreleased
+### Changed
+- Fixed a bug where renaming a foreign key resulted in an incorrect migration
+
 ## [1.2.2] - 2023-01-27
 ### Changed
 - Documented `belongs_to` and `has_and_belongs_to_many` behavior

data/Gemfile.lock

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

data/lib/declare_schema/model/habtm_model_shim.rb

@@ -57,7 +57,7 @@ module DeclareSchema
 
       def index_definitions_with_primary_key
         [
-          IndexDefinition.new(self, foreign_keys, unique: true, name: index_name), # creates a primary composite key on both foriegn keys
+          IndexDefinition.new(self, foreign_keys, unique: true, name: index_name), # creates a primary composite key on both foreign keys
           IndexDefinition.new(self, foreign_keys.last) # not unique by itself; combines with primary key to be unique
         ]
       end

data/lib/declare_schema/version.rb

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

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

@@ -454,32 +454,38 @@ module Generators
           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 = index_changes_due_to_column_renames(indexes_to_drop, indexes_to_add, to_rename)
+
+          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 = (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
+
+          # the order is important here - adding a :unique, for instance needs to remove then add
+          [Array(change_primary_key) + drop_indexes + add_indexes]
+        end
+
+        def index_changes_due_to_column_renames(indexes_to_drop, indexes_to_add, to_rename)
           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]
+              to_rename.fetch(column, column)
             end
 
             indexes_to_add.each { |index_to_add|
-              if renamed_columns == index_to_add.columns
+              if Set.new(renamed_columns) == Set.new(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 = (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
-
-          # the order is important here - adding a :unique, for instance needs to remove then add
-          [Array(change_primary_key) + drop_indexes + add_indexes]
+          [renamed_indexes_to_drop, renamed_indexes_to_add]
         end
 
         def change_foreign_key_constraints(model, old_table_name, to_rename)
@@ -492,6 +498,23 @@ module Generators
           fks_to_drop = existing_fks - model_fks
           fks_to_add = model_fks - existing_fks
 
+          renamed_fks_to_drop, renamed_fks_to_add = foreign_key_changes_due_to_column_renames(fks_to_drop, fks_to_add, to_rename)
+
+          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 = (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)
+          end
+
+          [drop_fks + add_fks]
+        end
+
+        def foreign_key_changes_due_to_column_renames(fks_to_drop, fks_to_add, to_rename)
           renamed_fks_to_drop = []
           renamed_fks_to_add = []
 
@@ -499,6 +522,7 @@ module Generators
             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.foreign_key.nil? &&
                 fk_to_add.foreign_key == to_rename[fk_to_drop.foreign_key]
 
                 renamed_fks_to_drop.append(fk_to_drop)
@@ -507,18 +531,7 @@ module Generators
             }
           }
 
-          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 = (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)
-          end
-
-          [drop_fks + add_fks]
+          [renamed_fks_to_drop, renamed_fks_to_add]
         end
 
         def fk_field_options(model, field_name)

metadata

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