ridgepole 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5906641e6a784f8548801ef9b94acedf8580ce9f5fcf2d8c23640b29968d9a65
-  data.tar.gz: fcbbf42e5eba4bfa9d16f8ba813d5c2374c357265a96bbf0322a66b84c17b99b
+  metadata.gz: f90fd48ae734b53cd516ac3006e2a3d0b2582c1ed3a2ed1eacccc8884a382bf0
+  data.tar.gz: 926c56a91a6e58a64fbbb46f44ca640983a9285e509ec5b3295aaa5b7d2317c3
 SHA512:
-  metadata.gz: 8eab1b038598d76ad94806aeeeda51af292527fa9ca84cecbc9be8b28b8351225c80782069824c7f7ca8619cdbacb7f85a9c29ef647e783a5d850957273d5f25
-  data.tar.gz: 834667f47a46455e1969574fb2341d620742e119c8882e70dc7d30c29c5780bf2671698f9982dbfed7a99cfc61f29344e7bffc0ec654c6f161d37af8189e4531
+  metadata.gz: d00a0d85d16b360912b06da4b26185cea444dc7de4f96cb388881f5859e8592852c3c2fba6797e68436aa4ee000bfd705e0edaea76fafb7333c1b9d81d38001b
+  data.tar.gz: b2a4beae21348b43a401af11448d922dbb1e40c8149ea0d7369d4bc4ff14fc10a6f468e1c2d660ad7fd31731d9661feca62c3a04165f8a9fd098c69b872a285d

data/.rubocop.yml

@@ -3,8 +3,9 @@ AllCops:
     - "gemfiles/**/*"
     - "omnibus-ridgepole/**/*"
     - "vendor/bundle/**/*"
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   NewCops: enable
+  SuggestExtensions: false
 Bundler/OrderedGems:
   Include:
     - "Appraisals"
@@ -53,3 +54,5 @@ Lint/DuplicateBranch:
   Enabled: false
 Style/OptionalBooleanParameter:
   Enabled: false
+Gemspec/DevelopmentDependencies:
+  Enabled: false

data/Appraisals

@@ -1,22 +1,13 @@
 # frozen_string_literal: true
 
-appraise 'activerecord-5.1' do
-  gem 'activerecord', '~> 5.1.0'
-end
-
-appraise 'activerecord-5.2' do
-  gem 'activerecord', '~> 5.2.0'
-  gem 'mysql2', '~> 0.4.4'
-end
-
 appraise 'activerecord-6.0' do
-  gem 'activerecord', '~> 6.0.0'
+  gem 'activerecord', '~> 6.0.6'
 end
 
 appraise 'activerecord-6.1' do
-  gem 'activerecord', '~> 6.1.0'
+  gem 'activerecord', '~> 6.1.7'
 end
 
 appraise 'activerecord-7.0' do
-  gem 'activerecord', '~> 7.0.0'
+  gem 'activerecord', '~> 7.0.4'
 end

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Changelog
 
-## 1.0
+## 1.2
+
+### 1.2.1 (2023/07/29)
+
+* Support `create_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)
+
+### 1.2.0 (2022/09/24)
+
+* Updated supported column types [pull#399](https://github.com/ridgepole/ridgepole/pull/399) [pull#400](https://github.com/ridgepole/ridgepole/pull/400)
+* Support check constraint [pull#393](https://github.com/ridgepole/ridgepole/pull/393) [pull#397](https://github.com/ridgepole/ridgepole/pull/397)
+* Drop suport Rails 5.x [pull#395](https://github.com/ridgepole/ridgepole/pull/395 )
+
+## 1.1
 
 ### 1.1.0 (2022/06/18)
 

data/README.md

@@ -5,15 +5,17 @@ Ridgepole is a tool to manage DB schema.
 It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.html#types-of-schema-dumps), and updates DB schema according to DSL.
 (like Chef/Puppet)
 
-[![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)
-[![Build Status](https://github.com/ridgepole/ridgepole/workflows/test/badge.svg?branch=1.0)](https://github.com/ridgepole/ridgepole/actions)
-[![Coverage Status](https://coveralls.io/repos/github/ridgepole/ridgepole/badge.svg?branch=1.0)](https://coveralls.io/github/ridgepole/ridgepole?branch=1.0)
+[![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](https://badge.fury.io/rb/ridgepole)
+[![Build Status](https://github.com/ridgepole/ridgepole/workflows/test/badge.svg?branch=1.2)](https://github.com/ridgepole/ridgepole/actions)
+[![Coverage Status](https://coveralls.io/repos/github/ridgepole/ridgepole/badge.svg?branch=1.2)](https://coveralls.io/github/ridgepole/ridgepole?branch=1.2)
 
 **Notice**
 
+* 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`, add `precision`.
-  * cf. https://github.com/ridgepole/ridgepole/issues/381
+* ActiveRecord 7.x has some incompatible changes. If you get unintended differences in `datetime` columns consider changing `precision`:
+  * Add `precision: nil` for columns that previously had no `precision` specified (cf. https://github.com/ridgepole/ridgepole/issues/381)
+  * Remove `precision: 6` from columns that previously had `precision: 6` specified explicitly (cf. https://github.com/ridgepole/ridgepole/issues/406)
 * For ActiveRecord 7.x series, please use AcriveRecord 7.0.2 or higher / Ridgepole 1.0.3 or higher.
   * cf. https://github.com/ridgepole/ridgepole/pull/380
 * ActiveRecord 6.1 is supported in ridgepole v0.9, but the ActiveRecord dump has been changed, so there is a difference between ActiveRecord 5.x/6.0 format.
@@ -323,12 +325,12 @@ Apply `Schemafile`
 
 
 ```sh
-docker-compose up -d
+docker compose up -d
 bundle install
 bundle exec appraisal install
 bundle exec appraisal activerecord-7.0 rake
 # POSTGRESQL=1 bundle exec appraisal activerecord-7.0 rake
-# MYSQL57=1 bundle exec appraisal activerecord-7.0 rake
+# MYSQL80=1 bundle exec appraisal activerecord-7.0 rake
 ```
 
 **Notice:** Ruby 2.6 or above/mysql-client/postgresql-client is required.
@@ -340,6 +342,6 @@ bundle exec appraisal activerecord-7.0 rake
 
 ## Example project
 
-* https://github.com/ridgepole/ridgepole-example
-  * https://github.com/ridgepole/ridgepole-example/pull/1
-  * https://github.com/ridgepole/ridgepole-example/pull/2
+* https://github.com/winebarrel/ridgepole-example
+  * https://github.com/winebarrel/ridgepole-example/pull/1
+  * https://github.com/winebarrel/ridgepole-example/pull/2

data/{docker-compose.yml → compose.yml}

@@ -1,15 +1,9 @@
-version: "3.8"
 services:
-  mysql:
-    image: "mysql:5.6"
-    ports:
-      - "13316:3306"
-    environment:
-      MYSQL_ROOT_PASSWORD: password
   mysql57:
     image: "mysql:5.7"
+    platform: linux/amd64
     ports:
-      - "13317:3306"
+      - "13316:3306"
     environment:
       MYSQL_ROOT_PASSWORD: password
   mysql80:

data/gemfiles/activerecord_6.0.gemfile

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

data/gemfiles/activerecord_6.1.gemfile

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

data/gemfiles/activerecord_7.0.gemfile

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

data/lib/ridgepole/cli/config.rb

@@ -66,7 +66,7 @@ module Ridgepole
 
         query_hash =
           if uri.query
-            uri.query.split('&').map { |pair| pair.split('=') }.to_h
+            uri.query.split('&').to_h { |pair| pair.split('=') }
           else
             {}
           end

data/lib/ridgepole/delta.rb

@@ -245,6 +245,12 @@ create_table(#{table_name.inspect}, #{inspect_options_include_default_proc(optio
         end
       end
 
+      unless (check_constraints = attrs[:check_constraints] || {}).empty?
+        check_constraints.each do |_, check_constraint_attrs|
+          append_add_check_constraint(table_name, check_constraint_attrs, buf, true)
+        end
+      end
+
       buf.puts(<<-RUBY)
 end
       RUBY
@@ -315,6 +321,7 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
       primary_key_definition = attrs[:primary_key_definition] || {}
       indices = attrs[:indices] || {}
       foreign_keys = attrs[:foreign_keys] || {}
+      check_constraints = attrs[:check_constraints] || {}
       table_options = attrs[:table_options]
       table_charset = attrs[:table_charset]
       table_collation = attrs[:table_collation]
@@ -330,6 +337,7 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
       end
 
       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?
 
       if table_options || table_charset || table_collation
         append_change_table_raw_options(table_name, table_options, table_charset, table_collation,
@@ -511,6 +519,40 @@ remove_foreign_key(#{table_name.inspect}, #{target})
     RUBY
     end
 
+    def append_change_check_constraints(table_name, delta, buf)
+      (delta[:delete] || {}).each do |_, attrs|
+        append_remove_check_constraint(table_name, attrs, buf)
+      end
+
+      (delta[:add] || {}).each do |_, attrs|
+        append_add_check_constraint(table_name, attrs, buf)
+      end
+    end
+
+    def append_add_check_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.check_constraint(#{expression.inspect}, **#{attrs_options.inspect})
+        RUBY
+      else
+        buf.puts(<<-RUBY)
+add_check_constraint(#{table_name.inspect}, #{expression.inspect}, **#{attrs_options.inspect})
+        RUBY
+      end
+    end
+
+    def append_remove_check_constraint(table_name, attrs, buf)
+      expression = attrs.fetch(:expression)
+      attrs_options = attrs[:options] || {}
+
+      buf.puts(<<-RUBY)
+remove_check_constraint(#{table_name.inspect}, #{expression.inspect}, **#{attrs_options.inspect})
+      RUBY
+    end
+
     def delta_execute
       @delta[:execute] || []
     end

data/lib/ridgepole/diff.rb

@@ -101,6 +101,7 @@ module Ridgepole
       scan_definition_change(from[:definition], to[:definition], from[:indices], table_name, from[:options], table_delta)
       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)
 
       unless table_delta.empty?
         delta[:change] ||= {}
@@ -472,6 +473,38 @@ module Ridgepole
       table_delta[:foreign_keys] = foreign_keys_delta unless foreign_keys_delta.empty?
     end
 
+    def scan_check_constraints_change(from, to, table_delta)
+      from = (from || {}).dup
+      to = (to || {}).dup
+      check_constraints_delta = {}
+
+      to.each do |name, to_attrs|
+        from_attrs = from.delete(name)
+
+        if from_attrs
+          if from_attrs != to_attrs
+            check_constraints_delta[:add] ||= {}
+            check_constraints_delta[:add][name] = to_attrs
+
+            check_constraints_delta[:delete] ||= {}
+            check_constraints_delta[:delete][name] = from_attrs
+          end
+        else
+          check_constraints_delta[:add] ||= {}
+          check_constraints_delta[:add][name] = to_attrs
+        end
+      end
+
+      unless @options[:merge]
+        from.each do |name, from_attrs|
+          check_constraints_delta[:delete] ||= {}
+          check_constraints_delta[:delete][name] = from_attrs
+        end
+      end
+
+      table_delta[:check_constraints] = check_constraints_delta unless check_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

@@ -91,6 +91,21 @@ module Ridgepole
         }
       end
 
+      def add_check_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][:check_constraints] ||= {}
+        @__definition[table_name][:check_constraints][idx] = {
+          expression: expression,
+          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

@@ -26,32 +26,41 @@ module Ridgepole
       DEFAULT_PRIMARY_KEY_TYPE = :bigint
 
       TYPES = {
-        # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L274
-        string: {},
-        text: {},
-        integer: {},
+        # https://github.com/rails/rails/blob/main/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L300-L301
         bigint: {},
-        float: {},
-        decimal: {},
-        datetime: {},
-        timestamp: {},
-        time: {},
-        date: {},
         binary: {},
         boolean: {},
+        date: {},
+        datetime: {},
+        decimal: {},
+        float: {},
+        integer: {},
+        json: {},
+        string: {},
+        text: {},
+        time: {},
+        timestamp: {},
+        virtual: {},
 
-        # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L79
+        # https://github.com/rails/rails/blob/v6.0.6/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L101
         serial: { null: false },
         bigserial: { null: false },
+        # string: {},
+        # text: {},
+        # integer: {},
+        # float: {},
+        # decimal: {},
+        # datetime: {},
+        # time: {},
+        # date: {},
         daterange: {},
         numrange: {},
         tsrange: {},
         tstzrange: {},
         int4range: {},
         int8range: {},
-        # binary: {}, # dup key
-        # boolean: {}, # dup key
-        # bigint: {}, # dup key
+        # binary: {},
+        # boolean: {},
         xml: {},
         tsvector: {},
         hstore: {},
@@ -59,20 +68,27 @@ module Ridgepole
         cidr: {},
         macaddr: {},
         uuid: {},
-        json: {},
+        # json: {},
         jsonb: {},
         ltree: {},
         citext: {},
         point: {},
+        line: {},
+        lseg: {},
+        box: {},
+        path: {},
+        polygon: {},
+        circle: {},
         bit: {},
         bit_varying: {},
         money: {},
+        interval: {},
+        oid: {},
 
-        # https://github.com/rails/rails/blob/v5.1.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L184
-        virtual: {},
+        # https://github.com/ridgepole/ridgepole/issues/394
+        timestamptz: {},
 
-        # https://github.com/rails/rails/blob/v5.0.4/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb#L53
-        # json: {}, # dup key
+        enum: {},
       }.freeze
 
       TYPES.each do |column_type, default_options|
@@ -129,8 +145,8 @@ module Ridgepole
 
       def timestamps(*args)
         options = { null: false }.merge(args.extract_options!)
-        column(:created_at, :datetime, options)
-        column(:updated_at, :datetime, options)
+        column(:created_at, :datetime, options.dup)
+        column(:updated_at, :datetime, options.dup)
       end
 
       def references(*args)
@@ -159,6 +175,10 @@ module Ridgepole
         end
       end
       alias belongs_to references
+
+      def check_constraint(expression, options = {})
+        @base.add_check_constraint(@table_name, expression, options)
+      end
     end
   end
 end

data/lib/ridgepole/dsl_parser.rb

@@ -40,9 +40,9 @@ module Ridgepole
         # NOTE: For composite primary keys, the first column of the primary key is used as the foreign key index
         next if Array(attrs[:options][:primary_key]).first == fk_index
 
-        raise("The column `#{fk_index}` of the table `#{table_name}` has a foreign key but no index." \
-              ' Although InnoDB creates an index automatically,' \
-              ' please add one explicitly in order for ridgepole to manage it.')
+        raise("The column `#{fk_index}` of the table `#{table_name}` has a foreign key but no index. " \
+              'Although InnoDB creates an index automatically, ' \
+              'please add one explicitly in order for ridgepole to manage it.')
       end
     end
   end

data/lib/ridgepole/version.rb

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

data/lib/ridgepole.rb

@@ -2,7 +2,7 @@
 
 require 'logger'
 require 'open3'
-require 'pp'
+require 'pp' # rubocop:disable Lint/RedundantRequireStatement
 require 'shellwords'
 require 'singleton'
 require 'stringio'

data/ridgepole.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.7') # rubocop:disable Gemspec/RequiredRubyVersion
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7')
 
   spec.add_dependency 'activerecord', '>= 5.1', '< 7.1'
   spec.add_dependency 'diffy'
@@ -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.24.1'
+  spec.add_development_dependency 'rubocop', '1.54.2'
   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.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-18 00:00:00.000000000 Z
+date: 2023-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -204,14 +204,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.24.1
+        version: 1.54.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.24.1
+        version: 1.54.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -287,9 +287,7 @@ files:
 - README.md
 - Rakefile
 - bin/ridgepole
-- docker-compose.yml
-- gemfiles/activerecord_5.1.gemfile
-- gemfiles/activerecord_5.2.gemfile
+- compose.yml
 - gemfiles/activerecord_6.0.gemfile
 - gemfiles/activerecord_6.1.gemfile
 - gemfiles/activerecord_7.0.gemfile
@@ -329,7 +327,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.7
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/gemfiles/activerecord_5.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.0"
-
-gemspec path: "../"

data/gemfiles/activerecord_5.2.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.2.0"
-gem "mysql2", "~> 0.4.4"
-
-gemspec path: "../"