departure 6.4.0 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e9b07d68819910b4f867268d8680b65677e6c11fe91b7f5c2f3a4b62cee627a
-  data.tar.gz: daf4792210ea603d0732fae6daebe97fcbea253960067d800495b49b6c2aa866
+  metadata.gz: ee45de2b99d380a21a086335118fc3737d266e8e0404e9d817b87e5a9845d907
+  data.tar.gz: 72dc6b4c1ba181668e3ebc3ee0a723a490dd0b741cee1fa68bc35a3436ed5b63
 SHA512:
-  metadata.gz: 1ba37179c249db07bc0770288ff6103ee4502846488319356bb2aad94738dd5727c42fea899e97aaccb974d5e0bd6f06d475ee0f922d460ec0cc2a2a0ad95f4b
-  data.tar.gz: 9c5acbc1f3b3064341f371e584c3e3da4f326d9f3bfc9a32d844dccdd12bf50c4c6c4519c5742f086fbb4261e252fc31fa6c5cf5777f1d028da4e4798d127aa8
+  metadata.gz: 0bcd5216f4500f1e2f14d537ee0cf2c70de874e675e596216ba318ef4295898ff5d25f6b389ee966b925b49b9762ab5325030a9b333a08fe895624c0515be1d5
+  data.tar.gz: 3ec64dd81b991764c971ace8abaf1504270fcf9f56aa814c1ecf40e876b514657fab1f6c809dcdb2d4e2951ecade01aaf1a6bf37657deb38b81accc7e7e29010

data/CHANGELOG.md

@@ -4,9 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 Please follow the format in [Keep a Changelog](http://keepachangelog.com/)
 
-## [Unreleased]
+## [6.5.0] - 2023-01-24
 
-## [6.4.0] - 2020-06-23
+- Support mysql gem version 0.5.5
+- Support for connection to MySQL server over socket
+- Support appending items to the general DSN. Used to apply workaround for [PT-2126](https://jira.percona.com/browse/PT-2126)
+
+## [6.4.0] - 2022-08-24
 
 - Support for ActiveRecord 6.1.4
 - Relax mysql2 requirement to allow mysql2 0.5.4

data/config.yml.erb

@@ -2,3 +2,4 @@ username: <%= ENV['PERCONA_DB_USER'] || 'root' %>
 password: <%= ENV['PERCONA_DB_PASSWORD'] || '' %> 
 database: <%= ENV['PERCONA_DB_NAME'] || 'departure_test' %> 
 hostname: <%= ENV['PERCONA_DB_HOST'] || 'localhost' %>
+socket: <%= ENV['PERCONA_DB_SOCKET'] || '' %>

data/departure.gemspec

@@ -25,7 +25,7 @@ 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.4'
+  spec.add_runtime_dependency 'mysql2', '>= 0.4.0', '<= 0.5.5'
 
   spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'

data/lib/departure/connection_details.rb

@@ -5,7 +5,7 @@ module Departure
     DEFAULT_PORT = 3306
     # Constructor
     #
-    # @param [Hash] connection parametes as used in #establish_conneciton
+    # @param connection_data [Hash] connection parameters as used in #establish_conneciton
     def initialize(connection_data)
       @connection_data = connection_data
     end
@@ -15,7 +15,7 @@ module Departure
     #
     # @return [String]
     def to_s
-      @to_s ||= "#{host_argument} -P #{port} -u #{user} #{password_argument}"
+      @to_s ||= "#{base_connection} -u #{user} #{password_argument}"
     end
 
     # TODO: Doesn't the abstract adapter already handle this somehow?
@@ -40,6 +40,19 @@ module Departure
       end
     end
 
+    private
+
+    attr_reader :connection_data
+
+    # Returns conditionally host or socket configuration
+    #
+    # @return [String]
+    def base_connection
+      return socket_argument if socket.present?
+
+      "#{host_argument} -P #{port}"
+    end
+
     # Returns the host fragment of the details string, adds ssl options if needed
     #
     # @return [String]
@@ -51,9 +64,13 @@ module Departure
       "-h \"#{host_string}\""
     end
 
-    private
-
-    attr_reader :connection_data
+    # Returns the socket fragment of the details string
+    # FIXME: SSL connection
+    #
+    # @return [String]
+    def socket_argument
+      "-S #{socket}"
+    end
 
     # Returns the database host name, defaulting to localhost. If PERCONA_DB_HOST
     # is passed its value will be used instead
@@ -79,6 +96,14 @@ module Departure
       ENV.fetch('PERCONA_DB_PASSWORD', connection_data[:password])
     end
 
+    # Returns the database socket path. If PERCONA_DB_SOCKET is passed its value
+    # will be used instead
+    #
+    # @return [String]
+    def socket
+      ENV.fetch('PERCONA_DB_SOCKET', connection_data[:socket])
+    end
+
     # Returns the database's port.
     #
     # @return [String]

data/lib/departure/dsn.rb

@@ -9,16 +9,17 @@ module Departure
     def initialize(database, table_name)
       @database = database
       @table_name = table_name
+      @suffix = ENV.fetch('PERCONA_DSN_SUFFIX', nil)
     end
 
     # Returns the pt-online-schema-change DSN string. See
     # https://www.percona.com/doc/percona-toolkit/2.0/pt-online-schema-change.html#dsn-options
     def to_s
-      "D=#{database},t=#{table_name}"
+      "D=#{database},t=#{table_name}#{suffix.nil? ? nil : ',' + suffix}"
     end
 
     private
 
-    attr_reader :table_name, :database
+    attr_reader :table_name, :database, :suffix
   end
 end

data/lib/departure/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: departure
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.5.0
 platform: ruby
 authors:
 - Ilya Zayats
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -78,7 +78,7 @@ dependencies:
         version: 0.4.0
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -88,7 +88,7 @@ dependencies:
         version: 0.4.0
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: pt-online-schema-change runner for ActiveRecord migrations