ridgepole 1.0.4 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93755589225b2104033ca2e660fdb5e4d3efa0da2784dbbd7fe4d0f1ff2a455d
-  data.tar.gz: 297bc45e7568a26ebec4a410cb2ce8bece3fd0c960fda4ad3955f09f58981004
+  metadata.gz: 7886d7c158b4776c9db77e73c72ab5d882241950ed6a9f2c945a99220b7bcc4a
+  data.tar.gz: 6429c8b8ed0c17dd1361c0e01592180c521002fa64fead1e625e9ec7ab2436a9
 SHA512:
-  metadata.gz: 32fca405de8475e0a09fcac001fbc92ed955a13ae2b2a6175b161c8cec135b5f2c99fb18d214f0e34aa0015503b2885c0c9420ae1d2912ac70b7ce98bbfbfe12
-  data.tar.gz: 20cebc14f9eb4976b644569af06c93c78a4573c8368dbe98447153aaabf601113a6cc8db8a2e8f3bd6def07ebb7971c5358dfcced15513e9fcc0d69903a0d233
+  metadata.gz: a7a06ba181dbdad2e0dd6f054366d745a3dbd119715bdb83b9a5e440c8a2258014859b2f9a8916b75fd5fb0ed9c27c4a32efe7d51761d7dd62a5e313cbad6fae
+  data.tar.gz: '0277821bd5e0fc9c47ec038bf938a1b1a8c18c8395af8fd5ccfdf14ed9a8b80b03c5b6550f7b11d4da7220023be6e14782261a0a85f5b70ad7d136561bce4724'

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.7 (2022/06/09)
+
+* Normalize list partition values for PostgreSQL [pull#389](https://github.com/ridgepole/ridgepole/pull/389)
+
+### 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)

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

@@ -640,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

data/lib/ridgepole/dsl_parser/context.rb

@@ -96,7 +96,10 @@ module Ridgepole
           values = partition_definition.fetch(:values)
           raise ArgumentError unless values.is_a?(Hash)
 
-          values[:in] = Array.wrap(values[:in]) if values.key?(:in)
+          if values.key?(:in)
+            values[:in] = Array.wrap(values[:in])
+            values[:in] = values[:in].map(&:to_s) if Ridgepole::ConnectionAdapters.postgresql?
+          end
           values[:to] = Array.wrap(values[:to]) if values.key?(:to)
           values[:from] = Array.wrap(values[:from]) if values.key?(:from)
         end

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.4'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.7
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-06-08 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.