declare_schema 1.2.3.pre.ga.4 → 1.2.3.pre.ga.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 506475213508a2b48038ccb1e8d2b4398b03879d88a7760803ffbc9273463033
-  data.tar.gz: 6fac90c4db4626a52d98c71ad98c6f8615e8f041473874575f9b3ba2e2123589
+  metadata.gz: '0681126cdd17705ec35f41ab9e4dc608fbc961b50614124ace54e17c49675eca'
+  data.tar.gz: efa69b2eb51fa5e2a9ec5b22ed04ecdf91679abecfb674646ea7e461974a097e
 SHA512:
-  metadata.gz: 9d9eda18aaa034a6b78239e76e2416b1a0f26a4094268b9a9fb1b4f807108a557d7163d7e623568cb3a6bf1bc4d5dee1d84068d7b391e5cc399b81de095aad6e
-  data.tar.gz: 36c6b8f67da4ece257360b4bded0dc79b08e9e31a3f9a3ba0745016ebd481ad76c13e7f8fb549e1d923c9e557056ceff10b60858bb0fa0743f61131af31f0a08
+  metadata.gz: 69d913a279f29f6368ceb224791213d9bc711e27c8a4a598f7feeb720bf753c5b6e5d65e7537655979b9bc6da5ee663c69f8c9dc2a8e2156b5b1e1c7608cc03b
+  data.tar.gz: 5f4b21eb05fc804a883f5bef692bf3473e25b8a61e066cf094e363b46be27fede8fc520efebc04a49ccd4e3c56fa7bddfcb5713204c828dba146904423781535

data/Gemfile.lock

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

data/lib/declare_schema/model/foreign_key_definition.rb

@@ -12,7 +12,7 @@ module DeclareSchema
 
       def initialize(model, foreign_key, **options)
         @model = model
-        @foreign_key = foreign_key.to_s.presence
+        @foreign_key = foreign_key.to_s.presence or raise ArgumentError "Foreign key cannot be empty: #{foreign_key.inspect}"
         @options = options
 
         @child_table_name = model.table_name # unless a table rename, which would happen when a class is renamed??

data/lib/declare_schema/version.rb

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

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

@@ -469,23 +469,16 @@ module Generators
         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|
+          indexes_to_drop.each_with_object([[], []]) do |index_to_drop, (renamed_indexes_to_drop, renamed_indexes_to_add)|
             renamed_columns = index_to_drop.columns.map do |column|
               to_rename.fetch(column, column)
-            end
-
-            indexes_to_add.each { |index_to_add|
-              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
-            }
-          }
+            end.sort
 
-          [renamed_indexes_to_drop, renamed_indexes_to_add]
+            if (index_to_add = indexes_to_add.find { |index_to_add| renamed_columns == index_to_add.columns.sort })
+              renamed_indexes_to_drop << index_to_drop
+              renamed_indexes_to_add << index_to_add
+            end
+          end
         end
 
         def change_foreign_key_constraints(model, old_table_name, to_rename)
@@ -515,23 +508,17 @@ module Generators
         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 = []
-
-          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.foreign_key.nil? &&
-                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
-            }
-          }
-
-          [renamed_fks_to_drop, renamed_fks_to_add]
+          fks_to_drop.each_with_object([[], []]) do |fk_to_drop, (renamed_fks_to_drop, renamed_fks_to_add)|
+            if (fk_to_add = fks_to_add.find do |fk_to_add|
+              fk_to_add.foreign_key.nil? and raise "Foreign key is not allowed to be nil for #{fk_to_add.inspect}"
+              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 == to_rename[fk_to_drop.foreign_key]
+            end)
+              renamed_fks_to_drop << fk_to_drop
+              renamed_fks_to_add << fk_to_add
+            end
+          end
         end
 
         def fk_field_options(model, field_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 1.2.3.pre.ga.4
+  version: 1.2.3.pre.ga.6
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke