declare_schema 1.2.3.pre.ga.6 → 1.2.3.pre.ga.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0681126cdd17705ec35f41ab9e4dc608fbc961b50614124ace54e17c49675eca'
-  data.tar.gz: efa69b2eb51fa5e2a9ec5b22ed04ecdf91679abecfb674646ea7e461974a097e
+  metadata.gz: ac52b40b3a13a99d43517d2755123ba3a836140fcf9862d10b35a586eaad9ef7
+  data.tar.gz: d84e7782e16652da230cb9e51ee4c951bba67c692ab58f12056f9e895738d203
 SHA512:
-  metadata.gz: 69d913a279f29f6368ceb224791213d9bc711e27c8a4a598f7feeb720bf753c5b6e5d65e7537655979b9bc6da5ee663c69f8c9dc2a8e2156b5b1e1c7608cc03b
-  data.tar.gz: 5f4b21eb05fc804a883f5bef692bf3473e25b8a61e066cf094e363b46be27fede8fc520efebc04a49ccd4e3c56fa7bddfcb5713204c828dba146904423781535
+  metadata.gz: c03703d46e1ed3c149f51ad479e2baacc88bc174a1b5239419c9f906cf0a638b26f0299ac50845660734151e18ef1b0048479abf491b685dd81ba9d55649edf3
+  data.tar.gz: e20b98d2651485183f4df433eb482715d492175c8fb6407e7030ed08c90ae8c5845d633044a335c91578531f3e5c11df23348b81f95cf9d7871204e20a4f4178

data/Gemfile.lock

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

data/lib/declare_schema/model/habtm_model_shim.rb

@@ -37,10 +37,6 @@ module DeclareSchema
         join_table
       end
 
-      def index_name
-        "index_#{table_name}_on_#{foreign_keys.first}_#{foreign_keys.last}"
-      end
-
       def field_specs
         foreign_keys.each_with_index.each_with_object({}) do |(v, position), result|
           result[v] = ::DeclareSchema::Model::FieldSpec.new(self, v, :bigint, position: position, null: false)
@@ -57,7 +53,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 foreign keys
+          IndexDefinition.new(self, foreign_keys, unique: true, name: "PRIMARY KEY"), # 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.6"
+  VERSION = "1.2.3.pre.ga.8"
 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
@@ -509,12 +509,14 @@ module Generators
 
         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 (fk_to_add = fks_to_add.find do |fk_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}"
               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)
+                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
+
+            if fk_to_add
               renamed_fks_to_drop << fk_to_drop
               renamed_fks_to_add << fk_to_add
             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')

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

@@ -102,12 +102,37 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
         expect(result.size).to eq(2), result.inspect
 
         expect(result.first).to be_a(::DeclareSchema::Model::IndexDefinition)
-        expect(result.first.name).to eq('index_parent_1_parent_2_on_parent_1_id_parent_2_id')
+        expect(result.first.name).to eq('PRIMARY KEY')
         expect(result.first.fields).to eq(['parent_1_id', 'parent_2_id'])
         expect(result.first.unique).to be_truthy
       end
     end
 
+    context 'when table and foreign key names are long' do
+      let(:join_table) { "advertiser_campaigns_tracking_pixels" }
+      let(:foreign_keys) { ['advertiser_campaign', 'tracking_pixel'] }
+      let(:foreign_key_classes) { [Table1, Table2] }
+
+      before do
+        class Table1 < ActiveRecord::Base
+          self.table_name = 'advertiser_campaign'
+        end
+
+        class Table2 < ActiveRecord::Base
+          self.table_name = 'tracking_pixel'
+        end
+      end
+
+      it 'returns two index definitions and does not raise a IndexNameTooLongError' do
+        result = subject.index_definitions_with_primary_key
+        expect(result.size).to eq(2), result.inspect
+        expect(result.first).to be_a(::DeclareSchema::Model::IndexDefinition)
+        expect(result.first.name).to eq('PRIMARY KEY')
+        expect(result.first.fields).to eq(['advertiser_campaign', 'tracking_pixel'])
+        expect(result.first.unique).to be_truthy
+      end
+    end
+
     describe '#index_definitions' do
       it 'returns index_definitions_with_primary_key' do
         result = subject.index_definitions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 1.2.3.pre.ga.6
+  version: 1.2.3.pre.ga.8
 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