ridgepole 1.2.1 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f90fd48ae734b53cd516ac3006e2a3d0b2582c1ed3a2ed1eacccc8884a382bf0
-  data.tar.gz: 926c56a91a6e58a64fbbb46f44ca640983a9285e509ec5b3295aaa5b7d2317c3
+  metadata.gz: f259bb56c8c8193c060dd6b3e14b9c90fbe8e5105046ebbefcd9e140656fd176
+  data.tar.gz: 6b5d498ac6dfde45c7a2306942baf0bdef2dba66d5a3073e7fe886d6092e4cdf
 SHA512:
-  metadata.gz: d00a0d85d16b360912b06da4b26185cea444dc7de4f96cb388881f5859e8592852c3c2fba6797e68436aa4ee000bfd705e0edaea76fafb7333c1b9d81d38001b
-  data.tar.gz: b2a4beae21348b43a401af11448d922dbb1e40c8149ea0d7369d4bc4ff14fc10a6f468e1c2d660ad7fd31731d9661feca62c3a04165f8a9fd098c69b872a285d
+  metadata.gz: 3ed96d3b0f2d451544d0154a1840342b4bd873fcd416d9c65f17181d22e1742ea39deb17abc03e52002a204e80943390975087ff46992501283dc658e71a9253
+  data.tar.gz: eb533bb2e3613b82fc3ca2e11f1d1b6d4a17e8238030acaba0f679b31b11798d7accd9347d4c1e575cbf09da3de95851244360735a024ea77fa904962aab13d0

data/Appraisals

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'activerecord-6.0' do
-  gem 'activerecord', '~> 6.0.6'
-end
-
 appraise 'activerecord-6.1' do
   gem 'activerecord', '~> 6.1.7'
 end
@@ -11,3 +7,7 @@ end
 appraise 'activerecord-7.0' do
   gem 'activerecord', '~> 7.0.4'
 end
+
+appraise 'activerecord-7.1' do
+  gem 'activerecord', '~> 7.1.0'
+end

data/CHANGELOG.md

@@ -1,10 +1,17 @@
 # Changelog
 
+## 2.0
+
+### 2.0.0.beta (2023/10/22)
+
+* Support Rails 7.1 [pull#441](https://github.com/ridgepole/ridgepole/pull/441)
+* Drop Rails 6.0 support [pull#440](https://github.com/ridgepole/ridgepole/pull/440)
+
 ## 1.2
 
 ### 1.2.1 (2023/07/29)
 
-* Support `create_enum` [pull#405](https://github.com/ridgepole/ridgepole/pull/405)
+* Support `t.enum` [pull#405](https://github.com/ridgepole/ridgepole/pull/405)
 * Fix timestamps with index behavior [pull#428](https://github.com/ridgepole/ridgepole/pull/428)
 * Fix broken `DEFAULT CURRENT_TIMESTAMP` spec [pull#420](https://github.com/ridgepole/ridgepole/pull/420)
 * Add Ruby 3.2 to CI matrix [pull#419](https://github.com/ridgepole/ridgepole/pull/419)

data/README.md

@@ -11,6 +11,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 
 **Notice**
 
+* Support Rails 7.1 ridgepole v2.0.0.
+* Drop support AcriveRecord 6.0 in ridgepole v2.0.0.
 * Drop support ActiveRecord 5.x in ridgepole v1.2.0.
 * Partitioning is no longer supported in ridgepole v1.1.0.
 * ActiveRecord 7.x has some incompatible changes. If you get unintended differences in `datetime` columns consider changing `precision`:
@@ -312,7 +314,7 @@ end
 ```
 
 ```sh
-$ ridgepole -a -c database.yml --check-relation-type bigint # default primary key type (e.g. `<5.1`: integer, `>=5.1`: bigint for MySQL)
+$ ridgepole -a -c database.yml --check-relation-type bigint # default primary key type (e.g. bigint for MySQL)
 Apply `Schemafile`
 ...
 [WARNING] Relation column type is different.

data/gemfiles/activerecord_7.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.0.4"
+gem "activerecord", "~> 7.0.7"
 
 gemspec path: "../"

data/gemfiles/{activerecord_6.0.gemfile → activerecord_7.1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.6"
+gem "activerecord", "~> 7.1.0"
 
 gemspec path: "../"

data/lib/ridgepole/delta.rb

@@ -251,6 +251,18 @@ create_table(#{table_name.inspect}, #{inspect_options_include_default_proc(optio
         end
       end
 
+      unless (exclusion_constraints = attrs[:exclusion_constraints] || {}).empty?
+        exclusion_constraints.each do |_, exclusion_constraint_attrs|
+          append_add_exclusion_constraint(table_name, exclusion_constraint_attrs, buf, true)
+        end
+      end
+
+      unless (unique_constraints = attrs[:unique_constraints] || {}).empty?
+        unique_constraints.each do |_, unique_constraint_attrs|
+          append_add_unique_constraint(table_name, unique_constraint_attrs, buf, true)
+        end
+      end
+
       buf.puts(<<-RUBY)
 end
       RUBY
@@ -299,7 +311,7 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
     end
 
     def append_change_table_raw_options(table_name, raw_table_options, table_charset, table_collation, buf)
-      if raw_table_options.blank? && ActiveRecord.gem_version >= Gem::Version.new('6.1.0')
+      if raw_table_options.blank?
         # Implicit engine is InnoDB in 6.1.0
         # related: https://github.com/rails/rails/pull/39365/files#diff-868f1dccfcbed26a288bf9f3fd8a39c863a4413ab0075e12b6805d9798f556d1R441
         raw_table_options = +'ENGINE=InnoDB'
@@ -322,6 +334,8 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
       indices = attrs[:indices] || {}
       foreign_keys = attrs[:foreign_keys] || {}
       check_constraints = attrs[:check_constraints] || {}
+      exclusion_constraints = attrs[:exclusion_constraints] || {}
+      unique_constraints = attrs[:unique_constraints] || {}
       table_options = attrs[:table_options]
       table_charset = attrs[:table_charset]
       table_collation = attrs[:table_collation]
@@ -338,6 +352,8 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
 
       append_change_foreign_keys(table_name, foreign_keys, pre_buf_for_fk, post_buf_for_fk, @options) unless foreign_keys.empty?
       append_change_check_constraints(table_name, check_constraints, buf) unless check_constraints.empty?
+      append_change_exclusion_constraints(table_name, exclusion_constraints, buf) unless exclusion_constraints.empty?
+      append_change_unique_constraints(table_name, unique_constraints, buf) unless unique_constraints.empty?
 
       if table_options || table_charset || table_collation
         append_change_table_raw_options(table_name, table_options, table_charset, table_collation,
@@ -553,6 +569,74 @@ remove_check_constraint(#{table_name.inspect}, #{expression.inspect}, **#{attrs_
       RUBY
     end
 
+    def append_change_exclusion_constraints(table_name, delta, buf)
+      (delta[:delete] || {}).each do |_, attrs|
+        append_remove_exclusion_constraint(table_name, attrs, buf)
+      end
+
+      (delta[:add] || {}).each do |_, attrs|
+        append_add_exclusion_constraint(table_name, attrs, buf)
+      end
+    end
+
+    def append_add_exclusion_constraint(table_name, attrs, buf, force_bulk_change = false)
+      expression = attrs.fetch(:expression)
+      attrs_options = attrs[:options] || {}
+
+      if force_bulk_change
+        buf.puts(<<-RUBY)
+  t.exclusion_constraint(#{expression.inspect}, **#{attrs_options.inspect})
+        RUBY
+      else
+        buf.puts(<<-RUBY)
+add_exclusion_constraint(#{table_name.inspect}, #{expression.inspect}, **#{attrs_options.inspect})
+        RUBY
+      end
+    end
+
+    def append_remove_exclusion_constraint(table_name, attrs, buf)
+      expression = attrs.fetch(:expression)
+      attrs_options = attrs[:options] || {}
+
+      buf.puts(<<-RUBY)
+remove_exclusion_constraint(#{table_name.inspect}, #{expression.inspect}, **#{attrs_options.inspect})
+      RUBY
+    end
+
+    def append_change_unique_constraints(table_name, delta, buf)
+      (delta[:delete] || {}).each do |_, attrs|
+        append_remove_unique_constraint(table_name, attrs, buf)
+      end
+
+      (delta[:add] || {}).each do |_, attrs|
+        append_add_unique_constraint(table_name, attrs, buf)
+      end
+    end
+
+    def append_add_unique_constraint(table_name, attrs, buf, force_bulk_change = false)
+      column_name = attrs.fetch(:column_name)
+      attrs_options = attrs[:options] || {}
+
+      if force_bulk_change
+        buf.puts(<<-RUBY)
+  t.unique_constraint(#{column_name.inspect}, **#{attrs_options.inspect})
+        RUBY
+      else
+        buf.puts(<<-RUBY)
+add_unique_constraint(#{table_name.inspect}, #{column_name.inspect}, **#{attrs_options.inspect})
+        RUBY
+      end
+    end
+
+    def append_remove_unique_constraint(table_name, attrs, buf)
+      column_name = attrs.fetch(:column_name)
+      attrs_options = attrs[:options] || {}
+
+      buf.puts(<<-RUBY)
+remove_unique_constraint(#{table_name.inspect}, #{column_name.inspect}, **#{attrs_options.inspect})
+      RUBY
+    end
+
     def delta_execute
       @delta[:execute] || []
     end

data/lib/ridgepole/diff.rb

@@ -102,6 +102,8 @@ module Ridgepole
       scan_indices_change(from[:indices], to[:indices], to[:definition], table_delta, from[:options], to[:options])
       scan_foreign_keys_change(from[:foreign_keys], to[:foreign_keys], table_delta, @options)
       scan_check_constraints_change(from[:check_constraints], to[:check_constraints], table_delta)
+      scan_exclusion_constraints_change(from[:exclusion_constraints], to[:exclusion_constraints], table_delta)
+      scan_unique_constraints_change(from[:unique_constraints], to[:unique_constraints], table_delta)
 
       unless table_delta.empty?
         delta[:change] ||= {}
@@ -505,6 +507,70 @@ module Ridgepole
       table_delta[:check_constraints] = check_constraints_delta unless check_constraints_delta.empty?
     end
 
+    def scan_exclusion_constraints_change(from, to, table_delta)
+      from = (from || {}).dup
+      to = (to || {}).dup
+      exclusion_constraints_delta = {}
+
+      to.each do |name, to_attrs|
+        from_attrs = from.delete(name)
+
+        if from_attrs
+          if from_attrs != to_attrs
+            exclusion_constraints_delta[:add] ||= {}
+            exclusion_constraints_delta[:add][name] = to_attrs
+
+            exclusion_constraints_delta[:delete] ||= {}
+            exclusion_constraints_delta[:delete][name] = from_attrs
+          end
+        else
+          exclusion_constraints_delta[:add] ||= {}
+          exclusion_constraints_delta[:add][name] = to_attrs
+        end
+      end
+
+      unless @options[:merge]
+        from.each do |name, from_attrs|
+          exclusion_constraints_delta[:delete] ||= {}
+          exclusion_constraints_delta[:delete][name] = from_attrs
+        end
+      end
+
+      table_delta[:exclusion_constraints] = exclusion_constraints_delta unless exclusion_constraints_delta.empty?
+    end
+
+    def scan_unique_constraints_change(from, to, table_delta)
+      from = (from || {}).dup
+      to = (to || {}).dup
+      unique_constraints_delta = {}
+
+      to.each do |name, to_attrs|
+        from_attrs = from.delete(name)
+
+        if from_attrs
+          if from_attrs != to_attrs
+            unique_constraints_delta[:add] ||= {}
+            unique_constraints_delta[:add][name] = to_attrs
+
+            unique_constraints_delta[:delete] ||= {}
+            unique_constraints_delta[:delete][name] = from_attrs
+          end
+        else
+          unique_constraints_delta[:add] ||= {}
+          unique_constraints_delta[:add][name] = to_attrs
+        end
+      end
+
+      unless @options[:merge]
+        from.each do |name, from_attrs|
+          unique_constraints_delta[:delete] ||= {}
+          unique_constraints_delta[:delete][name] = from_attrs
+        end
+      end
+
+      table_delta[:unique_constraints] = unique_constraints_delta unless unique_constraints_delta.empty?
+    end
+
     # XXX: MySQL only?
     # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb#L760
     # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb#L102

data/lib/ridgepole/dsl_parser/context.rb

@@ -106,6 +106,36 @@ module Ridgepole
         }
       end
 
+      def add_exclusion_constraint(table_name, expression, options = {})
+        table_name = table_name.to_s
+        expression = expression.to_s
+        options[:name] = options[:name].to_s if options[:name]
+
+        idx = options[:name] || expression
+
+        @__definition[table_name] ||= {}
+        @__definition[table_name][:exclusion_constraints] ||= {}
+        @__definition[table_name][:exclusion_constraints][idx] = {
+          expression: expression,
+          options: options,
+        }
+      end
+
+      def add_unique_constraint(table_name, column_name, options = {})
+        table_name = table_name.to_s
+        column_name = Array(column_name).map(&:to_sym)
+        options[:name] = options[:name].to_s if options[:name]
+
+        idx = options[:name] || column_name
+
+        @__definition[table_name] ||= {}
+        @__definition[table_name][:unique_constraints] ||= {}
+        @__definition[table_name][:unique_constraints][idx] = {
+          column_name: column_name,
+          options: options,
+        }
+      end
+
       def require(file)
         schemafile = %r{\A/}.match?(file) ? file : File.join(@__working_dir, file)
 

data/lib/ridgepole/dsl_parser/table_definition.rb

@@ -179,6 +179,14 @@ module Ridgepole
       def check_constraint(expression, options = {})
         @base.add_check_constraint(@table_name, expression, options)
       end
+
+      def exclusion_constraint(expression, options = {})
+        @base.add_exclusion_constraint(@table_name, expression, options)
+      end
+
+      def unique_constraint(column_name, options = {})
+        @base.add_unique_constraint(@table_name, column_name, options)
+      end
     end
   end
 end

data/lib/ridgepole/ext/abstract_adapter/disable_table_options.rb

@@ -18,8 +18,6 @@ module Ridgepole
 
           if options && @__without_table_options
             options.delete(:options)
-
-            # For >= AR 6.1.0
             options.delete(:charset)
             options.delete(:collation)
           end

data/lib/ridgepole/ext/schema_dumper.rb

@@ -30,7 +30,7 @@ module Ridgepole
               remove_prefix_and_suffix(foreign_key.to_table).inspect
             ]
 
-            parts << "column: #{foreign_key.column.inspect}" if foreign_key.column != @connection.foreign_key_column_for(foreign_key.to_table)
+            parts << "column: #{foreign_key.column.inspect}" if foreign_key.column != foreign_key_column_for(foreign_key)
 
             parts << "primary_key: #{foreign_key.primary_key.inspect}" if foreign_key.custom_primary_key?
 
@@ -45,6 +45,16 @@ module Ridgepole
           stream.puts add_foreign_key_statements.sort.join("\n")
         end
       end
+
+      private
+
+      def foreign_key_column_for(foreign_key)
+        if ActiveRecord.gem_version < Gem::Version.new('7.1.0')
+          @connection.foreign_key_column_for(foreign_key.to_table)
+        else
+          @connection.foreign_key_column_for(foreign_key.to_table, 'id')
+        end
+      end
     end
   end
 end

data/lib/ridgepole/external_sql_executer.rb

@@ -8,7 +8,7 @@ module Ridgepole
     end
 
     def execute(sql)
-      cmd = Shellwords.join([@script, sql, JSON.dump(connection_configuration_hash)])
+      cmd = Shellwords.join([@script, sql, JSON.dump(ActiveRecord::Base.connection_db_config.configuration_hash)])
       @logger.info("Execute #{@script}")
       script_basename = File.basename(@script)
 
@@ -46,16 +46,5 @@ module Ridgepole
         raise "`#{@script}` execution failed" unless wait_thr.value.success?
       end
     end
-
-    private
-
-    def connection_configuration_hash
-      if ActiveRecord.gem_version < Gem::Version.new('6.1.0')
-        # NOTE: Remove code when stopping support for versions below 6.1
-        ActiveRecord::Base.connection_config
-      else
-        ActiveRecord::Base.connection_db_config.configuration_hash
-      end
-    end
   end
 end

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '1.2.1'
+  VERSION = '2.0.0.beta'
 end

data/ridgepole.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.7')
 
-  spec.add_dependency 'activerecord', '>= 5.1', '< 7.1'
+  spec.add_dependency 'activerecord', '>= 6.1', '< 7.2'
   spec.add_dependency 'diffy'
 
   spec.add_development_dependency 'appraisal', '>= 2.2.0'
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
   spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
-  spec.add_development_dependency 'rubocop', '1.54.2'
+  spec.add_development_dependency 'rubocop', '1.57.1'
   spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
   spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
   spec.add_development_dependency 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-29 00:00:00.000000000 Z
+date: 2023-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -204,14 +204,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.54.2
+        version: 1.57.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.54.2
+        version: 1.57.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -288,9 +288,9 @@ files:
 - Rakefile
 - bin/ridgepole
 - compose.yml
-- gemfiles/activerecord_6.0.gemfile
 - gemfiles/activerecord_6.1.gemfile
 - gemfiles/activerecord_7.0.gemfile
+- gemfiles/activerecord_7.1.gemfile
 - lib/ridgepole.rb
 - lib/ridgepole/cli/config.rb
 - lib/ridgepole/client.rb
@@ -330,9 +330,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key: