declare_schema 2.1.0 → 2.2.0.colin.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8a41d2d1729b88c35fd470a36b55c6b57cd8dde48988be4ab2dcb745687e7b1
-  data.tar.gz: ef53c2e8a4388c9dae58298ca5bc5ba748cfc8ed952d7e91c11c373dde3520c6
+  metadata.gz: ab7ad89a134e904ebe32480e7fba499ecae239b0362eaea45db187567efeab2e
+  data.tar.gz: d141ca1f92626674d630199ee9f5675f92723950d6844c2c589a1936d42ddb24
 SHA512:
-  metadata.gz: 71e0acc2d6b3ef72e1c5ced0eef234cab4b2e776c5f607875ebe3c40649edfb040b6e0f8d74d47b3e536ec402bc76936407ae06cc8a4355a359e6754fce60938
-  data.tar.gz: fc23cc37d4f876d4658e74ba0e7409f9cf3a771288ad946dee95d820e40f6b3891eabd66a57815388f8aaf53b1295da27130caae671b6caff3cedd53896878d1
+  metadata.gz: 4e8936a3cf9ff16e2feab21ea3ba8d158bc716dc1944b6be71d36d0138f2f9a2ec6fbace9f4e73d79b08d37367b8d3647cb539d1adedc61fb384b70d449d3fe6
+  data.tar.gz: 8530622d7d6e7afa7150bb4a94e27bc04010b677acbc25493f8811b1ecbe232cd11f6e8b3490c279967acf43cbe072d8e54d34926a7bf564909dc61b979719f0

data/CHANGELOG.md

@@ -4,6 +4,13 @@ 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).
 
+## [2.2.0] - 2024-10-09
+### Changed
+- Drop/add index if its settings change (`unique:`, `length:`, etc.)
+- Drop/add index if order of columns changes
+- Drop indexes before adding, in case any have identical names
+- Drop foreign keys before adding, in case any have identical names
+
 ## [2.1.0] - 2024-08-20
 ### Added
 - Added support for Rails 7.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (2.1.0)
+    declare_schema (2.2.0.colin.1)
       rails (>= 6.0)
 
 GEM
@@ -172,8 +172,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.5)
-      strscan
+    rexml (3.3.8)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -213,7 +212,6 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
-    strscan (3.1.0)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)

data/lib/declare_schema/model/index_definition.rb

@@ -8,7 +8,7 @@ module DeclareSchema
       include Comparable
 
       OPTIONS = [:name, :unique, :where, :length].freeze
-      attr_reader :columns, :explicit_name, :table_name, *OPTIONS
+      attr_reader :columns, :allow_equivalent, :table_name, *OPTIONS
 
       alias fields columns # TODO: change callers to use columns. -Colin
 
@@ -16,11 +16,11 @@ module DeclareSchema
 
       PRIMARY_KEY_NAME = "PRIMARY"
 
-      def initialize(columns, table_name:, name: nil, allow_equivalent: false, unique: false, where: nil, length: nil)
+      def initialize(columns, table_name:, name: nil, allow_equivalent: true, unique: false, where: nil, length: nil)
         @table_name = table_name
-        @name = (name || self.class.default_index_name(table_name, columns)).to_s
+        @name = name&.to_s || self.class.default_index_name(table_name, columns)
         @columns = Array.wrap(columns).map(&:to_s)
-        @explicit_name = @name if !allow_equivalent
+        @allow_equivalent = allow_equivalent
         unique.in?([false, true]) or raise ArgumentError, "unique must be true or false: got #{unique.inspect}"
         if @name == PRIMARY_KEY_NAME
           unique or raise ArgumentError, "primary key index must be unique"
@@ -165,7 +165,7 @@ module DeclareSchema
       end
 
       def with_name(new_name)
-        self.class.new(@columns, name: new_name, table_name: @table_name, unique: @unique, allow_equivalent: @explicit_name.nil?, where: @where, length: @length)
+        self.class.new(@columns, name: new_name, table_name: @table_name, unique: @unique, allow_equivalent: @allow_equivalent, where: @where, length: @length)
       end
 
       alias eql? ==

data/lib/declare_schema/model.rb

@@ -49,7 +49,7 @@ module DeclareSchema
     end
 
     module ClassMethods
-      def index(columns, name: nil, allow_equivalent: false, unique: false, where: nil, length: nil)
+      def index(columns, name: nil, allow_equivalent: true, ignore_equivalent_definitions: false, unique: false, where: nil, length: nil)
         index_definition = ::DeclareSchema::Model::IndexDefinition.new(
           columns,
           name: name, table_name: table_name, allow_equivalent: allow_equivalent, unique: unique, where: where, length: length
@@ -59,9 +59,9 @@ module DeclareSchema
           if equivalent == index_definition
             # identical is always idempotent
           else
-            # equivalent is idempotent iff allow_equivalent: true passed
-            allow_equivalent or
-              raise ArgumentError, "equivalent index definition found (pass allow_equivalent: true to ignore):\n" \
+            # equivalent is idempotent iff ignore_equivalent_definitions: true passed
+            ignore_equivalent_definitions or
+              raise ArgumentError, "equivalent index definition found (pass ignore_equivalent_definitions: true to ignore):\n" \
                                    "#{index_definition.inspect}\n#{equivalent.inspect}"
           end
         else
@@ -156,8 +156,8 @@ module DeclareSchema
                                 end || false
         column_options[:default] = options.delete(:default) if options.has_key?(:default)
         if options.has_key?(:limit)
-          options.delete(:limit)
-          DeclareSchema.deprecator.warn("belongs_to #{name.inspect}, limit: is deprecated since it is now inferred")
+          limit = options.delete(:limit)
+          DeclareSchema.deprecator.warn("belongs_to #{name.inspect}, limit: #{limit} is deprecated since it is now inferred")
         end
 
         # index: true means create an index on the foreign key

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "2.1.0"
+  VERSION = "2.2.0.colin.1"
 end

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

@@ -285,10 +285,10 @@ module Generators
                                 ColumnRename
                                 ColumnChange
                                   PrimaryKeyChange
-                                  IndexAdd
-                                    ForeignKeyAdd
-                                    ForeignKeyRemove
-                                  IndexRemove
+                                  ForeignKeyRemove
+                                    IndexRemove
+                                    IndexAdd
+                                  ForeignKeyAdd
                                 ColumnRemove
                               TableRemove ]
 
@@ -437,12 +437,14 @@ module Generators
           new_table_name = model.table_name
           existing_indexes = ::DeclareSchema::Model::IndexDefinition.for_table(old_table_name || new_table_name, model.ignore_indexes, model.connection)
           model_indexes_with_equivalents = model.index_definitions_with_primary_key.to_a
-          model_indexes = model_indexes_with_equivalents.map do |i|
-            if i.explicit_name.nil?
-              if (existing = existing_indexes.find { |e| i != e && e.equivalent?(i) })
-                i.with_name(existing.name)
+          model_indexes = model_indexes_with_equivalents.map do |index|
+            if index.allow_equivalent
+              if (existing = existing_indexes.find { |existing_index| index != existing_index && existing_index.equivalent?(index) }) &&
+                  # TODO: push this logic into IndexDefinition so that it knows about column renames and includes the (renamed) columns in the settings it compares. -Colin
+                  existing.columns.map { |col_name| to_rename[col_name] || col_name } == index.columns
+                index.with_name(existing.name)
               end
-            end || i
+            end || index
           end
           existing_primary_keys, existing_indexes_without_primary_key = existing_indexes.partition { |i| i.primary_key? }
           defined_primary_keys, model_indexes_without_primary_key = model_indexes.partition { |i| i.primary_key? }
@@ -464,7 +466,7 @@ 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)
+          renamed_indexes_to_drop, renamed_indexes_to_add = index_changes_solely_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, **i.options)
@@ -478,17 +480,25 @@ module Generators
           [Array(change_primary_key) + drop_indexes + add_indexes]
         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)|
+        # @return [Array<Array<IndexDefinition>>] pair of arrays of indexes that changed solely due to column renames...not any settings changes.
+        # Note: if the column order changed, that is considered a change of settings--not solely a column rename--so it will not be returned
+        def index_changes_solely_due_to_column_renames(indexes_to_drop, indexes_to_add, to_rename)
+          renamed_indexes_to_drop = []
+          renamed_indexes_to_add = []
+
+          indexes_to_drop.each do |index_to_drop|
             renamed_columns = index_to_drop.columns.map do |column|
               to_rename.fetch(column, column)
-            end.sort
+            end
 
-            if (index_to_add = indexes_to_add.find { |index_to_add| renamed_columns == index_to_add.columns.sort })
+            if (index_to_add = indexes_to_add.find { |index_to_add| renamed_columns == index_to_add.columns }) &&
+                index_to_add.settings == index_to_drop.settings
               renamed_indexes_to_drop << index_to_drop
               renamed_indexes_to_add << index_to_add
             end
           end
+
+          [renamed_indexes_to_drop, renamed_indexes_to_add]
         end
 
         def change_foreign_key_constraints(model, old_table_name, to_rename)

data/spec/fixtures/migrations/sqlite3/will_generate_unique_constraint_names_rails_6.txt

@@ -9,7 +9,5 @@ create_table :affiliates, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE u
   t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
   t.integer :category_id, limit: 8, null: false
 end
-add_index :advertisers, [:category_id], name: :index_advertisers_on_category_id
-add_index :affiliates, [:category_id], name: :index_affiliates_on_category_id
 add_foreign_key :advertisers, :categories, column: :category_id, name: :index_advertisers_on_category_id
 add_foreign_key :affiliates, :categories, column: :category_id, name: :index_affiliates_on_category_id

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -365,7 +365,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       )
 
       Advert.field_specs.delete(:category_id)
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["category_id"] }
+      Advert.index_definitions.clear
 
       # If you specify a custom foreign key, the migration generator observes that:
 
@@ -388,8 +388,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       )
 
       Advert.field_specs.delete(:c_id)
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["c_id"] }
-      Advert.constraint_definitions.delete_if { |spec| spec.foreign_key_column == "c_id" }
+      Advert.index_definitions.clear
+      Advert.constraint_definitions.clear
 
       # You can avoid generating the index by specifying `index: false`
 
@@ -408,8 +408,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       )
 
       Advert.field_specs.delete(:category_id)
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["category_id"] }
-      Advert.constraint_definitions.delete_if { |spec| spec.foreign_key_column == "category_id" }
+      Advert.index_definitions.clear
+      Advert.constraint_definitions.clear
 
       # You can specify the index name with index: 'name' [deprecated]
 
@@ -433,10 +433,10 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       )
 
       Advert.field_specs.delete(:category_id)
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["category_id"] }
-      Advert.constraint_definitions.delete_if { |spec| spec.foreign_key_column == "category_id" }
+      Advert.index_definitions.clear
+      Advert.constraint_definitions.clear
 
-      # You can specify the index name with index: { name: }'name', unique: true|false }
+      # You can specify the index name with index: { name: 'name', unique: true|false }
 
       class Category < ActiveRecord::Base; end # rubocop:disable Lint/ConstantDefinitionInBlock
 
@@ -454,8 +454,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       )
 
       Advert.field_specs.delete(:category_id)
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["category_id"] }
-      Advert.constraint_definitions.delete_if { |spec| spec.foreign_key_column == "category_id" }
+      Advert.index_definitions.clear
+      Advert.constraint_definitions.clear
 
       ### Timestamps and Optimimistic Locking
 
@@ -515,8 +515,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       )
 
       Advert.field_specs.delete(:category_id)
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] || spec.fields == ["category_id"] }
-      Advert.constraint_definitions.delete_if { |spec| spec.foreign_key_column == "category_id" }
+      Advert.index_definitions.clear
+      Advert.constraint_definitions.clear
 
       # You can ask for a unique index (deprecated syntax; use index: { unique: true } instead).
 
@@ -533,7 +533,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         EOS
       )
 
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
+      Advert.index_definitions.clear
 
       # You can specify the name for the index
 
@@ -550,7 +550,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         EOS
       )
 
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
+      Advert.index_definitions.clear
 
       # You can ask for an index outside of the fields block
 
@@ -568,37 +568,91 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         EOS
       )
 
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
+      Advert.index_definitions.clear
 
-      # The available options for the index function are :unique, :name, :where, and :length.
+      # The available options for the index function are :unique, :name, :where, and :length (as well as :allow_equivalent, :ignore_equivalent_definitions).
 
       class Advert < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
         index :title, unique: false, name: 'my_index', length: 10
       end
 
-      expect(Generators::DeclareSchema::Migration::Migrator.run).to(
+      up, down = Generators::DeclareSchema::Migration::Migrator.run
+      expect([up, down]).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
           add_index :adverts, [:title], name: :my_index, length: { title: 10 }
         EOS
       )
 
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
+      Advert.index_definitions.clear
+
+      ActiveRecord::Migration.class_eval(up)
+
+      # You can migrate an index to have slightly different settings
+
+      class Advert < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+        declare_schema do
+          string :title, limit: 250, null: true, index: { unique: true, name: 'my_index', length: 5 }
+        end
+      end
+
+      # Note: the index is removed first, then re-added so that we don't get an error about the index already existing.
+      expect(Generators::DeclareSchema::Migration::Migrator.run).to(
+        migrate_up(<<~EOS.strip)
+          remove_index :adverts, name: :my_index
+          add_index :adverts, [:title], name: :my_index, unique: true, length: { title: 5 }
+        EOS
+      )
+
+      ActiveRecord::Migration.class_eval(down)
+      Advert.index_definitions.clear
 
       # You can create an index on more than one field
 
       class Advert < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+        declare_schema do
+          string :title, limit: 250, null: true, index: { unique: true, name: 'my_index' }
+          integer :category_id, limit: 8
+        end
         index [:title, :category_id]
       end
 
-      expect(Generators::DeclareSchema::Migration::Migrator.run).to(
+      up, down = Generators::DeclareSchema::Migration::Migrator.run
+      expect([up, down]).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
+          add_column :adverts, :category_id, :integer, limit: 8, null: false
+          add_index :adverts, [:title], name: :my_index, unique: true
           add_index :adverts, [:title, :category_id], name: :index_adverts_on_title_and_category_id
         EOS
       )
 
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["title", "category_id"] }
+      ActiveRecord::Migration.class_eval(up)
+
+      Advert.connection.schema_cache.clear!
+      Advert.reset_column_information
+      Advert.index_definitions.clear
+      nuke_model_class(Advert)
+
+      # You can change the column order of an index
+
+      class Advert < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+        declare_schema do
+          string :title, limit: 250, null: true, index: { unique: true, name: 'my_index' }
+          integer :category_id, limit: 8
+        end
+        index [:category_id, :title], name: :index_adverts_on_title_and_category_id
+      end
+
+      up, down = Generators::DeclareSchema::Migration::Migrator.run
+      puts "!!!!up: #{up}\n\ndown: #{down}\n"
+      expect(Generators::DeclareSchema::Migration::Migrator.run).to(
+        migrate_up(<<~EOS.strip)
+          remove_index :adverts, name: :index_adverts_on_title_and_category_id
+          add_index :adverts, [:category_id, :title], name: :index_adverts_on_title_and_category_id
+          remove_column :adverts, :name
+        EOS
+      )
 
       # Finally, you can specify that the migration generator should completely ignore an
       # index by passing its name to ignore_index in the model.
@@ -608,26 +662,28 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
       # The migration generator respects the `set_table_name` declaration, although as before, we need to explicitly tell the generator that we want a rename rather than a create and a drop.
 
+      Advert.connection.schema_cache.clear!
+      Advert.reset_column_information
+      Advert.index_definitions.clear
+      nuke_model_class(Advert)
+
       class Advert < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
-        self.table_name = "ads"
         declare_schema do
           string :title, limit: 250, null: true
           text :body, null: true
         end
       end
 
-      Advert.connection.schema_cache.clear!
-      Advert.reset_column_information
+      up, _down = Generators::DeclareSchema::Migration::Migrator.run
+      ActiveRecord::Migration.class_eval(up)
+
+      Advert.table_name = "ads"
 
       expect(Generators::DeclareSchema::Migration::Migrator.run(adverts: "ads")).to(
         migrate_up(<<~EOS.strip)
           rename_table :adverts, :ads
-          add_column :ads, :title, :string, limit: 250, null: true#{charset_and_collation}
-          add_column :ads, :body, :text#{', limit: 4294967295' if current_adapter == 'mysql2'}, null: true#{charset_and_collation}
         EOS
         .and(migrate_down(<<~EOS.strip))
-          remove_column :ads, :body
-          remove_column :ads, :title
           rename_table :ads, :adverts
         EOS
       )
@@ -658,14 +714,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run(adverts: "advertisements")).to(
         migrate_up(<<~EOS.strip)
           rename_table :adverts, :advertisements
-          add_column :advertisements, :title, :string, limit: 250, null: true#{charset_and_collation}
-          add_column :advertisements, :body, :text#{', limit: 4294967295' if current_adapter == 'mysql2'}, null: true#{charset_and_collation}
-          remove_column :advertisements, :name
         EOS
         .and(migrate_down(<<~EOS.strip))
-          add_column :advertisements, :name, :string, limit: 250, null: true#{charset_and_collation}
-          remove_column :advertisements, :body
-          remove_column :advertisements, :title
           rename_table :advertisements, :adverts
         EOS
       )
@@ -684,7 +734,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         EOS
         .and(migrate_down(<<~EOS.strip))
           create_table "adverts"#{table_options}, force: :cascade do |t|
-            t.string "name", limit: 250#{charset_and_collation}
+            t.string "title", limit: 250#{charset_and_collation}
+            t.text "body"#{text_limit}#{charset_and_collation}
           end
         EOS
       )
@@ -728,7 +779,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       Advert.field_specs.delete(:type)
       nuke_model_class(SuperFancyAdvert)
       nuke_model_class(FancyAdvert)
-      Advert.index_definitions.delete_if { |spec| spec.fields == ["type"] }
+      Advert.index_definitions.clear
 
       ## Coping with multiple changes
 
@@ -944,7 +995,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       it 'will generate unique constraint names' do
-        expect(Generators::DeclareSchema::Migration::Migrator.run).to(migrate_up(File.read(File.expand_path(fixture_file_path, __dir__)).chomp))
+        expect(Generators::DeclareSchema::Migration::Migrator.run).to(migrate_up(File.read(File.expand_path(fixture_file_path, __dir__)).chomp), fixture_file_path)
 
         migrate
 
@@ -1223,7 +1274,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           end
 
           it 'deprecates limit:' do
-            expect(DeclareSchema.deprecator).to receive(:warn).with("belongs_to :ad_category, limit: is deprecated since it is now inferred")
+            expect(DeclareSchema.deprecator).to receive(:warn).with("belongs_to :ad_category, limit: 4 is deprecated since it is now inferred")
             eval <<~EOS # rubocop:disable Style/EvalWithLocation
               class UsingLimit < ActiveRecord::Base
                 declare_schema { }
@@ -1493,7 +1544,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
       it "when equivalent and marked to allow, it is idempotent and doesn't raise" do
         expect do
-          Advert.index [:ad_category_id], name: :on_ad_category_id, allow_equivalent: true
+          Advert.index [:ad_category_id], name: :on_ad_category_id, ignore_equivalent_definitions: true
         end.to_not change { Advert.index_definitions.size }
       end
 

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

@@ -56,19 +56,13 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
           it { is_expected.to eq(fields) }
         end
 
-        describe '#explicit_name' do
-          subject { instance.explicit_name }
+        describe '#allow_equivalent' do
+          subject { instance.allow_equivalent }
 
           context 'with allow_equivalent' do
             let(:options) { { table_name: table_name, allow_equivalent: true } }
 
-            it { is_expected.to eq(nil) }
-          end
-
-          context 'with name option' do
-            let(:options) { { table_name: table_name, name: 'index_auth_users_on_names' } }
-
-            it { is_expected.to eq('index_auth_users_on_names') }
+            it { is_expected.to eq(true) }
           end
         end
 

data/spec/lib/generators/declare_schema/migration/migrator_spec.rb

@@ -89,10 +89,10 @@ module Generators
                 ColumnRename
                 ColumnChange
                 PrimaryKeyChange
-                IndexAdd
-                ForeignKeyAdd
                 ForeignKeyRemove
                 IndexRemove
+                IndexAdd
+                ForeignKeyAdd
                 ColumnRemove
                 TableRemove ]
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0.colin.1
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.4.16
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Database schema declaration and migration generator for Rails