departure 6.3.0 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d491f83699ed0a2a2932822f624162223ba8a3b74c018a56fd352a00378f3368
-  data.tar.gz: 6b6b6f192dab28cc61431e20bc7b0a35ecd76ab36a56edf5a0a59c42ae893e37
+  metadata.gz: 8e9b07d68819910b4f867268d8680b65677e6c11fe91b7f5c2f3a4b62cee627a
+  data.tar.gz: daf4792210ea603d0732fae6daebe97fcbea253960067d800495b49b6c2aa866
 SHA512:
-  metadata.gz: 106fa1f8b21f7ab468d6774147352bb2b631398c04df2eb60b664ae520ea44dd91f76fc084ec0215ab722369ad59b3047d9ff6009767329bf26da708f50e60af
-  data.tar.gz: 66396ee515d0a69e65eb8e39dce53d4eec89a5419886b3482f1b4276be1480cb08adf452585f09f7da48b4683e9f87a1d0b4311c6f9ab05a5801577052feb5cf
+  metadata.gz: 1ba37179c249db07bc0770288ff6103ee4502846488319356bb2aad94738dd5727c42fea899e97aaccb974d5e0bd6f06d475ee0f922d460ec0cc2a2a0ad95f4b
+  data.tar.gz: 9c5acbc1f3b3064341f371e584c3e3da4f326d9f3bfc9a32d844dccdd12bf50c4c6c4519c5742f086fbb4261e252fc31fa6c5cf5777f1d028da4e4798d127aa8

data/.github/workflows/test.yml

@@ -0,0 +1,45 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+        rails:
+          - 5.2.0
+          - 6.0.0
+          - 6.1.0
+        include:
+          - ruby: 2.4
+            rails: 5.2.0
+          - ruby: 2.7
+            rails: 7.0.1
+          - ruby: 3.0
+            rails: 6.1.0
+    env:
+      PERCONA_DB_USER: root
+      PERCONA_DB_PASSWORD: root
+      RAILS_VERSION: "~> ${{ matrix.rails }}"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: "Add Percona GPG key"
+        run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 9334A25F8507EFA5
+      - name: "Add Percona APT repository"
+        run: echo "deb http://repo.percona.com/apt `lsb_release -cs` main" | sudo tee -a /etc/apt/sources.list
+      - run: sudo apt-get update -qq
+      - run: sudo apt-get install percona-toolkit
+      - name: Start MySQL server
+        run: sudo systemctl start mysql.service
+      - run: bin/setup
+      - run: bundle exec rake

data/.gitignore

@@ -11,3 +11,4 @@
 tags
 departure_error.log
 .ruby-version
+.idea/

data/CHANGELOG.md

@@ -6,6 +6,16 @@ Please follow the format in [Keep a Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [6.4.0] - 2020-06-23
+
+- Support for ActiveRecord 6.1.4
+- Relax mysql2 requirement to allow mysql2 0.5.4
+- Support Rails 6' #upsert_all
+
+## [6.3.0] - 2020-06-23
+
+- Support for ActiveRecord 6.1
+
 ## [6.2.0] - 2020-06-23
 
 ### Added

data/README.md

@@ -1,4 +1,6 @@
-# Departure [![Build Status](https://travis-ci.org/departurerb/departure.svg?branch=master)](https://travis-ci.org/departurerb/departure) [![Code Climate](https://codeclimate.com/github/departurerb/departure/badges/gpa.svg)](https://codeclimate.com/github/departurerb/departure) ![GitHub commits since latest release (by date)](https://img.shields.io/github/commits-since/departurerb/departure/latest/master?style=plastic)
+# Departure
+
+![Build Status](https://img.shields.io/travis/departurerb/departure?style=for-the-badge) ![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/departurerb/departure?style=for-the-badge) ![GitHub commits since latest release (by date)](https://img.shields.io/github/commits-since/departurerb/departure/latest/master?style=for-the-badge)
 
 Departure is an **ActiveRecord connection adapter** that allows running
 **MySQL online and non-blocking DDL** through `ActiveRecord::Migration` without needing

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'percona_migrator'
+require 'departure'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/departure.gemspec

@@ -7,7 +7,7 @@ require 'departure/version'
 
 # This environment variable is set on CI to facilitate testing with multiple
 # versions of Rails.
-RAILS_DEPENDENCY_VERSION = ENV.fetch('RAILS_VERSION', ['>= 5.2.0', '<= 6.1'])
+RAILS_DEPENDENCY_VERSION = ENV.fetch('RAILS_VERSION', ['>= 5.2.0', '!= 7.0.0', '< 7.1'])
 
 Gem::Specification.new do |spec|
   spec.name          = 'departure'
@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'railties', *Array(RAILS_DEPENDENCY_VERSION)
   spec.add_runtime_dependency 'activerecord', *Array(RAILS_DEPENDENCY_VERSION)
-  spec.add_runtime_dependency 'mysql2', '>= 0.4.0', '<= 0.5.3'
+  spec.add_runtime_dependency 'mysql2', '>= 0.4.0', '<= 0.5.4'
 
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
   spec.add_development_dependency 'rspec-its', '~> 1.2'
   spec.add_development_dependency 'pry-byebug'

data/lib/active_record/connection_adapters/for_alter.rb

@@ -32,7 +32,7 @@ module ForAlterStatements
     }.merge(options)
 
     td = create_table_definition(table_name)
-    cd = td.new_column_definition(column.name, type, options)
+    cd = td.new_column_definition(column.name, type, **options)
     schema_creation.accept(ActiveRecord::ConnectionAdapters::ChangeColumnDefinition.new(cd, column.name))
   end
 
@@ -47,20 +47,26 @@ module ForAlterStatements
     columns_sql = "SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE #{quote(column_name)}"
     current_type = exec_query(columns_sql, 'SCHEMA').first['Type']
     td = create_table_definition(table_name)
-    cd = td.new_column_definition(new_column_name, current_type, options)
+    cd = td.new_column_definition(new_column_name, current_type, **options)
     schema_creation.accept(ActiveRecord::ConnectionAdapters::ChangeColumnDefinition.new(cd, column.name))
   end
 
   def add_index_for_alter(table_name, column_name, options = {})
-    index_name, index_type, index_columns, _,
-      index_algorithm, index_using = add_index_options(table_name, column_name, options)
+    if ActiveRecord::VERSION::STRING >= '6.1'
+      index_definition, = add_index_options(table_name, column_name, **options)
 
-    index_algorithm[0, 0] = ', ' if index_algorithm.present?
-    "ADD #{index_type} INDEX #{quote_column_name(index_name)} #{index_using} (#{index_columns})#{index_algorithm}"
+      "ADD #{schema_creation.accept(index_definition)}"
+    else
+      index_name, index_type, index_columns, _,
+        index_algorithm, index_using = add_index_options(table_name, column_name, **options)
+      index_algorithm[0, 0] = ', ' if index_algorithm.present?
+
+      "ADD #{index_type} INDEX #{quote_column_name(index_name)} #{index_using} (#{index_columns})#{index_algorithm}"
+    end
   end
 
-  def remove_index_for_alter(table_name, options = {})
-    index_name = index_name_for_remove(table_name, options)
+  def remove_index_for_alter(table_name, column_name, options = {})
+    index_name = index_name_for_remove(table_name, column_name, options)
     "DROP INDEX #{quote_column_name(index_name)}"
   end
 
@@ -77,7 +83,7 @@ module ForAlterStatements
 
   def add_column_for_alter(table_name, column_name, type, options = {})
     td = create_table_definition(table_name)
-    cd = td.new_column_definition(column_name, type, options)
+    cd = td.new_column_definition(column_name, type, **options)
     schema_creation.accept(ActiveRecord::ConnectionAdapters::AddColumnDefinition.new(cd))
   end
 
@@ -85,7 +91,7 @@ module ForAlterStatements
     "DROP COLUMN #{quote_column_name(column_name)}"
   end
 
-  def remove_columns_for_alter(table_name, *column_names)
+  def remove_columns_for_alter(table_name, *column_names, **options)
     column_names.map { |column_name| remove_column_for_alter(table_name, column_name) }
   end
 end

data/lib/active_record/connection_adapters/percona_adapter.rb

@@ -1,6 +1,7 @@
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 require 'active_record/connection_adapters/statement_pool'
 require 'active_record/connection_adapters/mysql2_adapter'
+require 'active_support/core_ext/string/filters'
 require 'departure'
 require 'forwardable'
 
@@ -69,7 +70,7 @@ module ActiveRecord
 
       ADAPTER_NAME = 'Percona'.freeze
 
-      def_delegators :mysql_adapter, :last_inserted_id, :each_hash, :set_field_encoding
+      def_delegators :mysql_adapter, :each_hash, :set_field_encoding
 
       def initialize(connection, _logger, connection_options, _config)
         @mysql_adapter = connection_options[:mysql_adapter]
@@ -93,9 +94,10 @@ module ActiveRecord
         execute(to_sql(sql, binds), name)
       end
 
-      def exec_query(sql, name = 'SQL', _binds = [])
+      def exec_query(sql, name = 'SQL', _binds = [], **_kwargs)
         result = execute(sql, name)
-        ActiveRecord::Result.new(result.fields, result.to_a)
+        fields = result.fields if defined?(result.fields)
+        ActiveRecord::Result.new(fields, result.to_a)
       end
 
       # Executes a SELECT query and returns an array of rows. Each row is an
@@ -107,8 +109,8 @@ module ActiveRecord
 
       # Executes a SELECT query and returns an array of record hashes with the
       # column names as keys and column values as values.
-      def select(sql, name = nil, binds = [])
-        exec_query(sql, name, binds)
+      def select(sql, name = nil, binds = [], **kwargs)
+        exec_query(sql, name, binds, **kwargs)
       end
 
       # Returns true, as this adapter supports migrations
@@ -129,12 +131,18 @@ module ActiveRecord
       # @param options [Hash] optional
       def add_index(table_name, column_name, options = {})
         if ActiveRecord::VERSION::STRING >= '6.1'
-          index, algorithm, if_not_exists = add_index_options(table_name, column_name, options)
-          create_index = CreateIndexDefinition.new(index, algorithm, if_not_exists)
-          execute schema_creation.accept(create_index)
+          index_definition, = add_index_options(table_name, column_name, **options)
+          execute <<-SQL.squish
+            ALTER TABLE #{quote_table_name(index_definition.table)}
+              ADD #{schema_creation.accept(index_definition)}
+          SQL
         else
-          index_name, index_type, index_columns, index_options = add_index_options(table_name, column_name, options)
-          execute "ALTER TABLE #{quote_table_name(table_name)} ADD #{index_type} INDEX #{quote_column_name(index_name)} (#{index_columns})#{index_options}" # rubocop:disable Metrics/LineLength
+          index_name, index_type, index_columns, index_options = add_index_options(table_name, column_name, **options)
+          execute <<-SQL.squish
+            ALTER TABLE #{quote_table_name(table_name)}
+              ADD #{index_type} INDEX
+              #{quote_column_name(index_name)} (#{index_columns})#{index_options}
+          SQL
         end
       end
 
@@ -142,14 +150,14 @@ module ActiveRecord
       #
       # @param table_name [String, Symbol]
       # @param options [Hash] optional
-      def remove_index(table_name, *args, **options)
-        column_name = args.first
-        if column_name
+      def remove_index(table_name, column_name = nil, **options)
+        if ActiveRecord::VERSION::STRING >= '6.1'
           return if options[:if_exists] && !index_exists?(table_name, column_name, **options)
-          index_name = index_name_for_remove(table_name, column_name, **options)
+          index_name = index_name_for_remove(table_name, column_name, options)
         else
           index_name = index_name_for_remove(table_name, options)
         end
+
         execute "ALTER TABLE #{quote_table_name(table_name)} DROP INDEX #{quote_column_name(index_name)}"
       end
 
@@ -181,6 +189,10 @@ module ActiveRecord
         mysql_adapter.raw_connection.server_info[:version]
       end
 
+      def last_inserted_id(result)
+        mysql_adapter.send(:last_inserted_id, result)
+      end
+
       private
 
       attr_reader :mysql_adapter

data/lib/departure/command.rb

@@ -8,10 +8,11 @@ module Departure
     # @param command_line [String]
     # @param error_log_path [String]
     # @param logger [#write_no_newline]
-    def initialize(command_line, error_log_path, logger)
+    def initialize(command_line, error_log_path, logger, redirect_stderr)
       @command_line = command_line
       @error_log_path = error_log_path
       @logger = logger
+      @redirect_stderr = redirect_stderr
     end
 
     # Executes the command returning its status. It also prints its stdout to
@@ -35,7 +36,7 @@ module Departure
 
     private
 
-    attr_reader :command_line, :error_log_path, :logger, :status
+    attr_reader :command_line, :error_log_path, :logger, :status, :redirect_stderr
 
     # Runs the command in a separate process, capturing its stdout and
     # execution status
@@ -56,11 +57,15 @@ module Departure
     end
 
     # Builds the actual command including stderr redirection to the specified
-    # log file
+    # log file or stdout
     #
     # @return [String]
     def full_command
-      "#{command_line} 2> #{error_log_path}"
+      if redirect_stderr
+        "#{command_line} 2> #{error_log_path}"
+      else
+        "#{command_line} 2>&1"
+      end
     end
 
     # Validates the status of the execution

data/lib/departure/configuration.rb

@@ -1,12 +1,13 @@
 module Departure
   class Configuration
-    attr_accessor :tmp_path, :global_percona_args, :enabled_by_default
+    attr_accessor :tmp_path, :global_percona_args, :enabled_by_default, :redirect_stderr
 
     def initialize
       @tmp_path = '.'.freeze
       @error_log_filename = 'departure_error.log'.freeze
       @global_percona_args = nil
       @enabled_by_default = true
+      @redirect_stderr = true
     end
 
     def error_log_path

data/lib/departure/connection_base.rb

@@ -6,4 +6,6 @@ module Departure
       end
     end
   end
+
+  class OriginalAdapterConnection < ConnectionBase; end
 end

data/lib/departure/migration.rb

@@ -81,7 +81,7 @@ module Departure
     # enabled in a previous migration.
     def reconnect_without_percona
       return unless connection_config[:adapter] == 'percona'
-      Departure::ConnectionBase.establish_connection(connection_config.merge(adapter: original_adapter))
+      Departure::OriginalAdapterConnection.establish_connection(connection_config.merge(adapter: original_adapter))
     end
 
     private

data/lib/departure/runner.rb

@@ -15,6 +15,7 @@ module Departure
       @cli_generator = cli_generator
       @mysql_adapter = mysql_adapter
       @error_log_path = config.error_log_path
+      @redirect_stderr = config.redirect_stderr
     end
 
     # Executes the passed sql statement using pt-online-schema-change for ALTER
@@ -44,12 +45,12 @@ module Departure
     # @param command_line [String]
     # @return [Boolean]
     def execute(command_line)
-      Command.new(command_line, error_log_path, logger).run
+      Command.new(command_line, error_log_path, logger, redirect_stderr).run
     end
 
     private
 
-    attr_reader :logger, :cli_generator, :mysql_adapter, :error_log_path
+    attr_reader :logger, :cli_generator, :mysql_adapter, :error_log_path, :redirect_stderr
 
     # Checks whether the sql statement is an ALTER TABLE
     #

data/lib/departure/version.rb

@@ -1,3 +1,3 @@
 module Departure
-  VERSION = '6.3.0'.freeze
+  VERSION = '6.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: departure
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0
 platform: ruby
 authors:
 - Ilya Zayats
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -24,9 +24,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
-    - - "<="
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 7.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,9 +37,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
-    - - "<="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -44,9 +50,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
-    - - "<="
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 7.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -54,9 +63,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
-    - - "<="
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 7.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +78,7 @@ dependencies:
         version: 0.4.0
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,19 +88,19 @@ dependencies:
         version: 0.4.0
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -168,11 +180,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".pryrc"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile
@@ -233,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: pt-online-schema-change runner for ActiveRecord migrations

data/.travis.yml

@@ -1,31 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.5.5
-  - 2.6.3
-  - 2.7.0
-
-env:
-  - RAILS_VERSION="~> 6.1.0"
-  - RAILS_VERSION="~> 6.0.0"
-  - RAILS_VERSION="~> 5.2.0"
-
-jobs:
-  include:
-    - rvm: 2.4.6
-      env: RAILS_VERSION="~> 5.2.0"
-
-services:
-  - mysql
-
-before_install:
-  - travis_retry sudo apt-key adv --keyserver keys.gnupg.net --recv-keys 8507EFA5
-  - echo "deb http://repo.percona.com/apt `lsb_release -cs` main" | sudo tee -a /etc/apt/sources.list
-  - sudo apt-get update -qq
-  - sudo apt-get install percona-toolkit
-  - gem update bundler
-
-install: bin/setup
-
-after_success:
-  - codeclimate-test-reporter