ridgepole 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f2be3783ec61f227ecfe28f6886bd190b3c0d842b70a525c0e875a94b6203da
-  data.tar.gz: 813db605ad690e1e1fc67c35d43c8b8d5ea3f176be5e8231ebf729a4d0e59b39
+  metadata.gz: 8fd50f2c89f1cffa71ee02cf208bfe4d9b41ffefba5c9a93b164975a08a71687
+  data.tar.gz: f9ff68ec24ad420cbe070d769671721ac71fd3acf13322b3b340db07d4141f57
 SHA512:
-  metadata.gz: 5298fb7f40541eaa1165119bda5bfad7c97ef0ab32989271abdf58209fb6e8302a0ed48100cd7d8e7b3d9baf38e94b654af7fa8437e6d3d84a0e82023a0edf0f
-  data.tar.gz: 6cd5e1415f034bcc34b803c509c1c3a6603117b008202b97525567a60824c35290871b33e8133fa2bf61e8eb37323c79e2926666d195d35a8b4c35884d1a7193
+  metadata.gz: 286bff861331444fdef459dd5063d7dfbb4007dd1b15a96efd38af1f95e65bf30f520ed5e2d9c0e87295516ee586f2742df78923304345db245fdd595f9599a7
+  data.tar.gz: 6e42ba5e0a2de5cfc2ce8f72179ac4ec41ddbacc27000d8906010d199556accd1348fa0b9d75fd0e322d9cbc5e3c12f07fdc28c8ee12b0db3355127ee837c299

data/CHANGELOG.md

@@ -2,7 +2,19 @@
 
 ## 1.0
 
-### 1.0.2 (Unreleased)
+### 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)
+
+### 1.0.2 (2022/02/06)
 
 * Add support for partitioning ([pull#374](https://github.com/ridgepole/ridgepole/pull/374))
 * Suppress warning of table option differences ([pull#378](https://github.com/ridgepole/ridgepole/pull/378))

data/README.md

@@ -11,6 +11,10 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 
 **Notice**
 
+* 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**.
   * cf. https://github.com/ridgepole/ridgepole/pull/323
@@ -210,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/diff.rb

@@ -422,9 +422,6 @@ module Ridgepole
             opts[:limit] = 4_294_967_295
           end
         end
-
-        # Workaround for Active Record 7.0
-        opts.delete(:precision) if attrs[:type] == :datetime && opts[:precision].nil?
       end
     end
 
@@ -509,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
 
@@ -652,7 +657,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/dumper.rb

@@ -39,7 +39,7 @@ module Ridgepole
 
       dsl = stream.string.lines.select do |line|
         line !~ /\A#/ &&
-          line !~ /\AActiveRecord::Schema\.define/ &&
+          line !~ /\AActiveRecord::Schema(\[\d\.\d\])?\.define/ &&
           line !~ /\Aend/
       end
 

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

@@ -51,20 +51,24 @@ 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 }
+                       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)
@@ -97,7 +101,9 @@ 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(',')

data/lib/ridgepole/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-06 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.