ridgepole 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e83bd61a718b5b97d6be9214742e452fce8c54e9bff48e2b604344753138c0bb
-  data.tar.gz: f2ed01a46f18174e3173f07715002fc222467a341d9e93682910ef2c2497d613
+  metadata.gz: 7e42446dbd4e240dcb801dbd26b995e91d9afea59c52131d97e44d4242dd5cb7
+  data.tar.gz: a986057d2aefe29e1ac34f9e8e224eaea86efbf3d900ab095e9b55c1281fc34c
 SHA512:
-  metadata.gz: 62a7e740ec77f0124b3b9776a3c78fc8186a9f00d0f97917cae79342664f1a77e1f2ce3992e7e6e463c8fad76e2fba92af0f9a6031a70f7d545768dae2942ba1
-  data.tar.gz: 2f43e6f67be8820450c9fd47ddde4dacabe69778bbc1d3837b9ce8988e6b7393f80df3ed5a400a142a0a20a06c58344aa08490ea81cc25d4fdb10b56de824aec
+  metadata.gz: 899809c201c1fe7bed640dac621bb3e98edd4c2606f7107ce3faf4420de2e5ca5087f6499be4b1d66d55e58becd55d6746057033a7dc6b4ea58c3112deadf9c6
+  data.tar.gz: edf7a56bad1187f2e749205afb4c35bbf84b79476b6f00641d452714099374ca69c504425db29dc45b470e769b3cb8381aaa510cc8ca7d0b9cf233e39da7c3a6

data/.rubocop.yml

@@ -21,7 +21,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 Layout/LineLength:
-  Enabled: false
+  Max: 200
 Metrics/MethodLength:
   Enabled: false
 Metrics/ModuleLength:

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## 1.0
 
+### 1.0.6 (2022/06/06)
+
+* Support Hash partition for PostgreSQL [pull#387](https://github.com/ridgepole/ridgepole/pull/387)
+
+### 1.0.5 (2022/06/05)
+
+* Support DEFAULT partition for PostgreSQL [pull#386](https://github.com/ridgepole/ridgepole/pull/386)
+
+### 1.0.4 (2022/03/28)
+
+* Add warning for generated column [pull#382](https://github.com/ridgepole/ridgepole/pull/382)
+
 ### 1.0.3 (2022/02/12)
 
 * Support Rails 7.0.2 [pull#380](https://github.com/ridgepole/ridgepole/pull/380)

data/README.md

@@ -11,7 +11,9 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 
 **Notice**
 
-For ActiveRecord 7.x series, please use AcriveRecord 7.0.2 or higher / Ridgepole 1.0.3 or higher.
+* ActiveRecord 7.x has some incompatible changes. If you get unintended differences in `datetime`, add `precision`.
+  * cf. https://github.com/ridgepole/ridgepole/issues/381
+* 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.
   * **If you use ActiveRecord 6.1, please modify Schemafile format**.
@@ -212,6 +214,19 @@ activerecord 5.0.0 and activerecord-mysql-awesome dumps a collation rather than
 
 See `mysql> show character set;` to find charset / collation pair for your system.
 
+## Generated Column (MySQL)
+
+There should be NO extra white spaces in the expression (such as after comma).  
+Quotes in expression may cause the operations failure with MySQL 8.0.
+
+```ruby
+create_table "users", force: :cascade do |t|
+  t.string   "last_name"
+  t.string   "first_name"
+  t.virtual  "full_name", type: :string, as: "concat(`last_name`,' ',`first_name`)", stored: true
+end
+```
+
 ## Execute
 ```ruby
 create_table "authors", force: :cascade do |t|

data/lib/ridgepole/delta.rb

@@ -349,7 +349,10 @@ 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_table_raw_options(table_name, table_options, table_charset, table_collation, buf) if table_options || table_charset || table_collation
+      if table_options || table_charset || table_collation
+        append_change_table_raw_options(table_name, table_options, table_charset, table_collation,
+                                        buf)
+      end
 
       append_change_table_comment(table_name, table_comment, buf) if table_comment
 

data/lib/ridgepole/diff.rb

@@ -506,6 +506,14 @@ module Ridgepole
         attrs2.fetch(:options).delete(:comment)
       end
 
+      if attrs1[:options][:as] != attrs2[:options][:as] && attrs1[:options].fetch(:as, '').delete(' ') == attrs2[:options].fetch(:as, '').delete(' ')
+        @logger.warn(<<-MSG)
+[WARNING] Same expressions but only differed by white spaces were detected. This operation may fail.
+  Before: '#{attrs1[:options][:as]}'
+  After : '#{attrs2[:options][:as]}'
+        MSG
+      end
+
       attrs1 == attrs2
     end
 
@@ -632,7 +640,9 @@ MSG
           return
         end
 
-        raise "All partition is different. please check partition settings.to:  #{to}, from: #{from}" if from[:partition_definitions].present? && (to[:partition_definitions] & from[:partition_definitions]).empty?
+        if from[:partition_definitions].present? && (to[:partition_definitions] & from[:partition_definitions]).empty?
+          raise "All partition is different. please check partition settings.to:  #{to}, from: #{from}"
+        end
 
         scan_partition_definition_chanage(from, to, table_delta)
       end
@@ -649,7 +659,7 @@ MSG
 
       (from_partitions.keys - to_partitions.keys).each do |name|
         partition_definitions_delta[:delete] ||= {}
-        partition_definitions_delta[:delete][name] = attrs.merge(valuve: from_partitions[name][:values])
+        partition_definitions_delta[:delete][name] = attrs.merge(values: from_partitions[name][:values])
       end
 
       (to_partitions.keys - from_partitions.keys).each do |name|

data/lib/ridgepole/dsl_parser.rb

@@ -40,7 +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/ext/abstract_mysql_adapter/partitioning.rb

@@ -46,7 +46,8 @@ module Ridgepole
 
         # SchemaStatements
         def create_partition(table_name, type:, columns:, partition_definitions:)
-          execute schema_creation.accept(ActiveRecord::ConnectionAdapters::PartitionOptions.new(table_name, type, columns, partition_definitions: partition_definitions))
+          execute schema_creation.accept(ActiveRecord::ConnectionAdapters::PartitionOptions.new(table_name, type, columns,
+                                                                                                partition_definitions: partition_definitions))
         end
 
         def add_partition(table_name, name:, values:)

data/lib/ridgepole/ext/postgresql_adapter/partitioning.rb

@@ -51,23 +51,31 @@ module Ridgepole
             ORDER BY p.relname
           SQL
 
-          partition_definitions = partition_info.map do |row|
-            values = case options[:type]
-                     when :list
-                       values = row[1].match(/FOR VALUES IN \((?<csv>.+)\)$/)[:csv].split(',').map(&:strip).map { |value| cast_value(value) }
-                       { in: Array.wrap(values) }
-                     when :range
-                       match = row[1].match(/FOR VALUES FROM \((?<from>.+)\) TO \((?<to>.+)\)/)
-                       from = match[:from].split(',').map(&:strip).map { |value| cast_value(value) }
-                       to = match[:to].split(',').map(&:strip).map { |value| cast_value(value) }
-                       { from: from, to: to }
+          partition_definitions = partition_info.map do |name, val_str|
+            values = if val_str == 'DEFAULT'
+                       { default: true }
                      else
-                       raise NotImplementedError
+                       case options[:type]
+                       when :list
+                         values = val_str.match(/FOR VALUES IN \((?<csv>.+)\)$/)[:csv].split(',').map(&:strip).map { |value| cast_value(value) }
+                         { in: Array.wrap(values) }
+                       when :range
+                         match = val_str.match(/FOR VALUES FROM \((?<from>.+)\) TO \((?<to>.+)\)/)
+                         from = match[:from].split(',').map(&:strip).map { |value| cast_value(value) }
+                         to = match[:to].split(',').map(&:strip).map { |value| cast_value(value) }
+                         { from: from, to: to }
+                       when :hash
+                         match = val_str.match(/FOR VALUES WITH \(modulus (?<modulus>\d+), remainder (?<remainder>\d+)\)/)
+                         { modulus: match[:modulus].to_i, remainder: match[:remainder].to_i }
+                       else
+                         raise NotImplementedError
+                       end
                      end
-            { name: row[0], values: values }
+            { name: name, values: values }
           end
 
-          ActiveRecord::ConnectionAdapters::PartitionOptions.new(table_name, options[:type], options[:columns], partition_definitions: partition_definitions)
+          ActiveRecord::ConnectionAdapters::PartitionOptions.new(table_name, options[:type], options[:columns],
+                                                                 partition_definitions: partition_definitions)
         end
 
         def cast_value(value)
@@ -97,12 +105,16 @@ module Ridgepole
 
         # SchemaStatements
         def add_partition(table_name, name:, values:)
-          condition = if values.key?(:in)
+          condition = if values.key?(:default)
+                        'DEFAULT'
+                      elsif values.key?(:in)
                         "FOR VALUES IN (#{values[:in].map { |v| quote_value(v) }.join(',')})"
                       elsif values.key?(:to)
                         from = values[:from].map { |v| quote_value(v) }.join(',')
                         to = values[:to].map { |v| quote_value(v) }.join(',')
                         "FOR VALUES FROM (#{from}) TO (#{to})"
+                      elsif values.key?(:modulus)
+                        "FOR VALUES WITH (modulus #{values[:modulus]}, remainder #{values[:remainder]})"
                       else
                         raise NotImplementedError
                       end

data/lib/ridgepole/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -342,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.