declare_schema 1.2.3.pre.ga.5 → 1.2.3.pre.ga.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aacc7a857e82fc857a7694a7c32afe7b9bee2a8949dd455f6506eac066658353
-  data.tar.gz: 513a4171b54d053b3e9cc58111256010040634e287cf2d7f1a33b278cad92548
+  metadata.gz: 308421d49ba0007340aad10be1ca95b4798d1c3a98c3e7bb52e41d81f903530e
+  data.tar.gz: 7e1c75911502f841c935308a8b1f8a8997702839eb348f07b45eee05cc3440b3
 SHA512:
-  metadata.gz: b5075ebac4ebd80def763e46df74d506e3c2df43d4c0601e35fe335be7c3db8faf5b280fd4417dc54ff2f6608162de5ba69082af4353df6f3d7b0ff449b20486
-  data.tar.gz: 48534ddd177e9061390b26db9142842968cf28f2637f1cc7d091e28205ace5d55c0ddb0669c7b31b370d4d27d18e83ecc09d0c4b8451f79c4230ef0667c89d4f
+  metadata.gz: 2e4d907b428190cdb3cfa5b99c27e9a751a110144092e9498888b79a5050596bb849afb73feb38d6f4bba73617f4a3d00e0c8d4cde9634c124472f93a5003022
+  data.tar.gz: 1774ac3658dccd0f32f280b04358cfa80707053d8d595b3527f467e97c8b91f66651de3737fea969abd01c2454bc028aca12ae98380e7a1d76d0ef4dc0a37eb5

data/Gemfile.lock

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

data/lib/declare_schema/version.rb

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

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

@@ -446,7 +446,7 @@ module Generators
           if !ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
             change_primary_key =
               if (existing_primary_key || defined_primary_key) &&
-                existing_primary_key_columns != defined_primary_key&.columns
+                 existing_primary_key_columns != defined_primary_key&.columns
                 ::DeclareSchema::SchemaChange::PrimaryKeyChange.new(new_table_name, existing_primary_key_columns, defined_primary_key&.columns)
               end
           end
@@ -469,7 +469,7 @@ module Generators
         end
 
         def index_changes_due_to_column_renames(indexes_to_drop, indexes_to_add, to_rename)
-          indexes_to_drop.each_with_object([], []) do |index_to_drop, (renamed_indexes_to_drop, renamed_indexes_to_add)|
+          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.sort
@@ -508,16 +508,17 @@ module Generators
         end
 
         def foreign_key_changes_due_to_column_renames(fks_to_drop, fks_to_add, to_rename)
-          fks_to_drop.each_with_object([], []) do |fk_to_drop, (renamed_fks_to_drop, renamed_fks_to_add)|
-            if (fks_to_add = fks_to_add.find do |fk_to_add|
+          fks_to_drop.each_with_object([[], []]) do |fk_to_drop, (renamed_fks_to_drop, renamed_fks_to_add)|
+            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}"
-              if fk_to_add.child_table_name == fk_to_drop.child_table_name &&
+              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
-            end)
+            end
+
+            if fk_to_add
               renamed_fks_to_drop << fk_to_drop
-              renamed_fks_to_add << fks_to_add
+              renamed_fks_to_add << fk_to_add
             end
           end
         end

data/spec/lib/declare_schema/model/foreign_key_definition_spec.rb

@@ -49,11 +49,10 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
         end
 
         context 'when all options passed' do
-          let(:foreign_key) { nil }
           let(:options) { { parent_table: :networks, foreign_key: :the_network_id, constraint_name: :constraint_1, dependent: :delete } }
 
           it 'normalizes symbols to strings' do
-            expect(subject.foreign_key).to be_nil
+            expect(subject.foreign_key).to eq('network_id')
             expect(subject.foreign_key_name).to eq('the_network_id')
             expect(subject.parent_table_name).to eq('networks')
             expect(subject.constraint_name).to eq('constraint_1')

metadata

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