ridgepole 0.9.6 → 1.0.2

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

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+require 'active_record/connection_adapters/postgresql_adapter'
+
+module Ridgepole
+  module Ext
+    module PostgreSQLAdapter
+      module Partitioning
+        def supports_partitions?
+          ActiveRecord::VERSION::MAJOR >= 6 && postgresql_version >= 100_000 # >= 10.0
+        end
+
+        def table_options(table_name)
+          options = partition_options(table_name)
+          if options
+            (super || {}).merge(options: "PARTITION BY #{options[:type].to_s.upcase}(#{options[:columns].join(',')})")
+          else
+            super
+          end
+        end
+
+        def partition_options(table_name)
+          return unless supports_partitions?
+
+          scope = quoted_scope(table_name)
+          result = query_value(<<~SQL, 'SCHEMA')
+            SELECT pg_get_partkeydef(t.oid)
+            FROM pg_class t
+              LEFT JOIN pg_namespace n ON n.oid = t.relnamespace
+            WHERE t.relname = #{scope[:name]}
+              AND n.nspname = #{scope[:schema]}
+          SQL
+          return unless result
+
+          type, *columns = result.scan(/\w+/).map { |value| value.downcase.to_sym }
+          { type: type, columns: columns }
+        end
+
+        def partition(table_name)
+          options = partition_options(table_name)
+          return unless options
+
+          scope = quoted_scope(table_name)
+          partition_info = query(<<~SQL, 'SCHEMA')
+            SELECT p.relname, pg_get_expr(p.relpartbound, p.oid, true)
+            FROM pg_class t
+            JOIN pg_inherits i on i.inhparent = t.oid
+            JOIN pg_class p on p.oid = i.inhrelid
+            WHERE t.relname = #{scope[:name]}
+              AND p.relnamespace::regnamespace::text = #{scope[:schema]}
+            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 }
+                     else
+                       raise NotImplementedError
+                     end
+            { name: row[0], values: values }
+          end
+
+          ActiveRecord::ConnectionAdapters::PartitionOptions.new(table_name, options[:type], options[:columns], partition_definitions: partition_definitions)
+        end
+
+        def cast_value(value)
+          Integer(value)
+        rescue ArgumentError
+          value.delete(%q("')) # "
+        end
+
+        def quote_value(value)
+          if %w[MINVALUE MAXVALUE].include?(value)
+            value
+          else
+            quote(value)
+          end
+        end
+
+        def partition_tables
+          partition_info = query(<<~SQL, 'SCHEMA')
+            SELECT p.relname
+            FROM pg_class t
+            JOIN pg_inherits i on i.inhparent = t.oid
+            JOIN pg_class p on p.oid = i.inhrelid
+            ORDER BY p.relname
+          SQL
+          partition_info.map { |row| row[0] }
+        end
+
+        # SchemaStatements
+        def add_partition(table_name, name:, values:)
+          condition = if 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})"
+                      else
+                        raise NotImplementedError
+                      end
+          create_table(name, id: false, options: "PARTITION OF #{table_name} #{condition}")
+        end
+
+        def remove_partition(_table_name, name:)
+          drop_table(name)
+        end
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  module ConnectionAdapters
+    class PostgreSQLAdapter
+      prepend Ridgepole::Ext::PostgreSQLAdapter::Partitioning
+    end
+  end
+end

data/lib/ridgepole/ext/schema_dumper.rb

@@ -45,6 +45,30 @@ module Ridgepole
           stream.puts add_foreign_key_statements.sort.join("\n")
         end
       end
+
+      def tables(stream)
+        original = ignore_tables.dup
+        ignore_tables.concat(@connection.partition_tables)
+        super
+      ensure
+        self.ignore_tables = original
+      end
+
+      def table(table, stream)
+        super
+        partition(table, stream)
+      end
+
+      def partition(table, stream)
+        if (partition = @connection.partition(table))
+          partition_definitions = partition.partition_definitions.map do |partition_definition|
+            "{ name: #{partition_definition.name.inspect}, values: #{partition_definition.values} }"
+          end.join(' ,')
+
+          stream.puts "  add_partition #{partition.table.inspect}, #{partition.type.inspect}, #{partition.columns.inspect}, partition_definitions: [#{partition_definitions}]"
+          stream.puts
+        end
+      end
     end
   end
 end

data/lib/ridgepole/external_sql_executer.rb

@@ -25,20 +25,18 @@ module Ridgepole
             readable = ready[0]
 
             readable.each do |f|
-              begin
-                data = f.read_nonblock(1024)
-                next if data.nil?
-
-                data.chomp!
-
-                if f == stderr
-                  @logger.warn("[WARNING] #{script_basename}: #{data}")
-                else
-                  @logger.info("#{script_basename}: #{data}")
-                end
-              rescue EOFError
-                files.delete f
+              data = f.read_nonblock(1024)
+              next if data.nil?
+
+              data.chomp!
+
+              if f == stderr
+                @logger.warn("[WARNING] #{script_basename}: #{data}")
+              else
+                @logger.info("#{script_basename}: #{data}")
               end
+            rescue EOFError
+              files.delete f
             end
           end
         rescue EOFError

data/lib/ridgepole/version.rb

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

data/lib/ridgepole.rb

@@ -16,6 +16,9 @@ require 'diffy'
 module Ridgepole; end
 
 require 'ridgepole/ext/abstract_adapter/disable_table_options'
+require 'ridgepole/ext/abstract_adapter/partition_definition'
+require 'ridgepole/ext/abstract_adapter/partition_options'
+require 'ridgepole/ext/abstract_adapter/partitioning'
 require 'ridgepole/ext/pp_sort_hash'
 require 'ridgepole/ext/schema_dumper'
 require 'ridgepole/client'

data/ridgepole.gemspec

@@ -24,12 +24,12 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.2.7') # rubocop:disable Gemspec/RequiredRubyVersion
 
-  spec.add_dependency 'activerecord', '>= 5.1', '< 6.2'
+  spec.add_dependency 'activerecord', '>= 5.1', '< 7.1'
   spec.add_dependency 'diffy'
 
   spec.add_development_dependency 'appraisal', '>= 2.2.0'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'erbh', '>= 0.1.2'
+  spec.add_development_dependency 'erbh', '>= 0.2.1'
   spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'
   spec.add_development_dependency 'hash_order_helper', '>= 0.1.6'
   spec.add_development_dependency 'mysql2'
@@ -38,9 +38,10 @@ 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.9.1'
+  spec.add_development_dependency 'rubocop', '1.24.1'
   spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
   spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-lcov'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 1.0.2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2022-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: hash_modern_inspect
   requirement: !ruby/object:Gem::Requirement
@@ -204,14 +204,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.24.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +281,7 @@ files:
 - ".rubocop.yml"
 - ".simplecov"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -291,6 +292,7 @@ files:
 - gemfiles/activerecord_5.2.gemfile
 - gemfiles/activerecord_6.0.gemfile
 - gemfiles/activerecord_6.1.gemfile
+- gemfiles/activerecord_7.0.gemfile
 - lib/ridgepole.rb
 - lib/ridgepole/cli/config.rb
 - lib/ridgepole/client.rb
@@ -304,7 +306,13 @@ files:
 - lib/ridgepole/dumper.rb
 - lib/ridgepole/execute_expander.rb
 - lib/ridgepole/ext/abstract_adapter/disable_table_options.rb
+- lib/ridgepole/ext/abstract_adapter/partition_definition.rb
+- lib/ridgepole/ext/abstract_adapter/partition_options.rb
+- lib/ridgepole/ext/abstract_adapter/partitioning.rb
 - lib/ridgepole/ext/abstract_mysql_adapter/dump_auto_increment.rb
+- lib/ridgepole/ext/abstract_mysql_adapter/partitioning.rb
+- lib/ridgepole/ext/abstract_mysql_adapter/schema_creation.rb
+- lib/ridgepole/ext/postgresql_adapter/partitioning.rb
 - lib/ridgepole/ext/pp_sort_hash.rb
 - lib/ridgepole/ext/schema_dumper.rb
 - lib/ridgepole/external_sql_executer.rb
@@ -317,7 +325,8 @@ files:
 homepage: https://github.com/ridgepole/ridgepole
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -333,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.