declare_schema 1.4.0.colin.1 → 1.4.0.colin.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0a594fea50536d529c2d4e42280d9050726e1017524dbaff2b8a77e17c6b41
-  data.tar.gz: 89199ba5b58b936f93a7bfe0409c403b95da8bd771b425b2c61a6afd8a951f2a
+  metadata.gz: 33160a248adef9ac404a1efa4f6446fedabc2ddc49b02f0434ff3e1a91bfa8b2
+  data.tar.gz: ff9b214dfb3d31904927c906f244312571967de575ffcdadd4f100558bc3ffe4
 SHA512:
-  metadata.gz: ff4858ac26953e22a9dbf37ce5b2391295d05ec5a8401361434987e6e90c7fc01543f2bbb1cebaf91a0ce16dadb8ac5c8600d01130c81f361c3728bcd7c23f9b
-  data.tar.gz: 1fabf741327417f5beb76ba694de17e0176db5f63e95922a03d195eb4dcff60d71434cd6aeb4e8ff8212bc0b1fc7cc5a8cb400307efeb87a83593887621d366b
+  metadata.gz: aae64d3b2dff696f0ac532831df033fd0433e41eca6018c74eb07088ea2d0384e30bdae0c6648087ed15e367094558ec040b05f2869d7d28009f3396c343147a
+  data.tar.gz: 776c0b887fcbb9566b9b3347e8359c5ddd7b40020816ce18494ad6897eee5bc9b0e827167ae9ba759b3dcec4cd3244ea62c9a79e1f351e266a319339ca2534d7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (1.4.0.colin.1)
+    declare_schema (1.4.0.colin.2)
       rails (>= 5.0)
 
 GEM

data/lib/declare_schema/model.rb

@@ -51,9 +51,9 @@ module DeclareSchema
     module ClassMethods
       def index(fields, **options)
         # make index idempotent
-        index_fields_s = Array.wrap(fields).map(&:to_s)
-        unless index_definitions.any? { |index_spec| index_spec.fields == index_fields_s }
-          index_definitions << ::DeclareSchema::Model::IndexDefinition.new(self, fields, **options)
+        index = ::DeclareSchema::Model::IndexDefinition.new(self, fields, **options)
+        unless index_definitions.any? { |index_spec| index_spec.equivalent?(index) }
+          index_definitions << index
         end
       end
 
@@ -122,7 +122,7 @@ module DeclareSchema
           index_options = {}
           case index_value
           when String
-            Kernel.warn("belongs_to index: 'name' is deprecated; use index: { name: 'name' } instead")
+            Kernel.warn("belongs_to index: 'name' is deprecated; use index: { name: 'name' } instead (in #{self.class.name})")
             index_options[:name] = index_value
           # when false -- impossible since we checked that above
           when true
@@ -134,7 +134,7 @@ module DeclareSchema
           end
 
           if options.has_key?(:unique)
-            Kernel.warn("belongs_to unique: true|false is deprecated; use index: { unique: true|false } instead")
+            Kernel.warn("belongs_to unique: true|false is deprecated; use index: { unique: true|false } instead (in #{self.class.name})")
             index_options[:unique] = options.delete(:unique)
           end
 
@@ -305,7 +305,7 @@ module DeclareSchema
         if (to_name = options.delete(:index))
           index_opts =
             {
-              unique: args.include?(:unique) || options.delete(:unique)
+              unique: args.include?(:unique) || !!options.delete(:unique)
             }
           # support index: true declaration
           index_opts[:name] = to_name unless to_name == true

data/lib/declare_schema/schema_change/index_add.rb

@@ -5,13 +5,13 @@ require_relative 'base'
 module DeclareSchema
   module SchemaChange
     class IndexAdd < Base
-      def initialize(table_name, column_names, name:, unique:, where: nil, limit: nil)
+      def initialize(table_name, column_names, name:, unique:, where: nil, length: nil)
         @table_name = table_name
         @column_names = column_names
         @name = name
         @unique = unique
         @where = where.presence
-        @limit = limit.presence
+        @length = length
       end
 
       def up_command
@@ -20,7 +20,7 @@ module DeclareSchema
         }
         options[:unique] = true if @unique
         options[:where] = @where if @where
-        options[:limit] = @limit if @limit
+        options[:length] = @length if @length
 
         "add_index #{[@table_name.to_sym.inspect,
                       @column_names.map(&:to_sym).inspect,

data/lib/declare_schema/version.rb

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

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

@@ -457,11 +457,11 @@ module Generators
           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)
+            ::DeclareSchema::SchemaChange::IndexRemove.new(new_table_name, i.columns, **i.options)
           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)
+            ::DeclareSchema::SchemaChange::IndexAdd.new(new_table_name, i.columns, **i.options)
           end
 
           # the order is important here - adding a :unique, for instance needs to remove then add

data/spec/lib/declare_schema/schema_change/index_add_spec.rb

@@ -46,30 +46,30 @@ RSpec.describe DeclareSchema::SchemaChange::IndexAdd do
         end
       end
 
-      context 'with limit: nil' do
-        let(:limit) { nil }
-        subject { described_class.new(table_name, column_names, name: name, unique: unique, limit: limit) }
+      context 'with length: nil' do
+        let(:length) { nil }
+        subject { described_class.new(table_name, column_names, name: name, unique: unique, length: length) }
 
         it 'responds with command' do
           expect(subject.up).to eq("add_index :#{table_name}, #{column_names.map(&:to_sym).inspect}, name: #{name.to_sym.inspect}\n")
         end
       end
 
-      context 'with limit: 2' do
-        let(:limit) { 2 }
-        subject { described_class.new(table_name, column_names, name: name, unique: unique, limit: limit) }
+      context 'with length: 2' do
+        let(:length) { 2 }
+        subject { described_class.new(table_name, column_names, name: name, unique: unique, length: length) }
 
         it 'responds with command' do
-          expect(subject.up).to eq("add_index :#{table_name}, #{column_names.map(&:to_sym).inspect}, name: #{name.to_sym.inspect}, limit: #{limit}\n")
+          expect(subject.up).to eq("add_index :#{table_name}, #{column_names.map(&:to_sym).inspect}, name: #{name.to_sym.inspect}, length: #{length}\n")
         end
       end
 
-      context 'with limit: hash' do
-        let(:limit) { { last_name: 10, first_name: 1 } }
-        subject { described_class.new(table_name, column_names, name: name, unique: unique, limit: limit) }
+      context 'with length: hash' do
+        let(:length) { { last_name: 10, first_name: 1 } }
+        subject { described_class.new(table_name, column_names, name: name, unique: unique, length: length) }
 
         it 'responds with command' do
-          expect(subject.up).to eq("add_index :#{table_name}, #{column_names.map(&:to_sym).inspect}, name: #{name.to_sym.inspect}, limit: { last_name: 10, first_name: 1 }\n")
+          expect(subject.up).to eq("add_index :#{table_name}, #{column_names.map(&:to_sym).inspect}, name: #{name.to_sym.inspect}, length: { last_name: 10, first_name: 1 }\n")
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 1.4.0.colin.1
+  version: 1.4.0.colin.2
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails