mysql2postgres 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc905b9634e92298f5b5d192b6f4388294f6153a777b551b408bc5e944247b3f
-  data.tar.gz: 108d90760f0600e55f117df749147f8137d3044a7724dd901f76869db7b45caf
+  metadata.gz: f9dc76770d64295e3a3f9d6559063f3e8dc8599519e175f80b034349f1aeb5d9
+  data.tar.gz: 4d794d660cc3762d1208248fbf4ef64ae144f36947a46c2627b4548c26df4548
 SHA512:
-  metadata.gz: 6b08edc13623c942b61d03cecce1f577eca9fce3906e3c06ef17c848396dfebadb39017cb7ae7aecb5193e91cffc85d2a4cea2e49054f0e7dd3dffc8f53012eb
-  data.tar.gz: 5ef72f3a6ac5961102d282b38cf2eb5bc62d301f5e84b590dc4e9dd7d057fa51c43f5272b112478ab6b6d3513fc3ac67e8a24bae0d9f23d3f162c0ddd8f591e0
+  metadata.gz: 8fcd9276a35e01baf595134a54d9db329e4b1f5517c53883885c936b3ece504acd2646205384f9a743dbdc7cd8699ee842015d3825d3faa82272677a992b2e20
+  data.tar.gz: e86280a311c1e2a530da4bf5da1802999163008890cfa7764f9065f311ceb128f16c7e498c93670a49f10b78bbb7ecc77ec3a397922095370a5ec833232e98c0

data/bin/mysql2postgres

@@ -11,7 +11,7 @@ config_file = ARGV.empty? ? File.join(File.dirname(__dir__), 'config', 'database
 
 raise "'#{config_file}' does not exist" unless FileTest.exist? config_file
 
-db_yaml = YAML.safe_load File.read(config_file)
+db_yaml = YAML.safe_load_file config_file
 
 raise "'#{config_file}' does not contain a mysql configuration directive for conversion" unless db_yaml.key? 'mysql'
 raise "'#{config_file}' does not contain destinations configuration directive for conversion" unless db_yaml.key? 'destinations'

data/lib/mysql2postgres/converter.rb

@@ -27,7 +27,7 @@ class Mysql2postgres
 
     def convert
       tables = reader.tables
-      tables.reject! { |table| exclude_tables.include?(table.name) }
+      tables.reject! { |table| exclude_tables.include? table.name }
       tables.select! { |table| only_tables ? only_tables.include?(table.name) : true }
 
       # preserve order only works, if only_tables are specified

data/lib/mysql2postgres/mysql_reader.rb

@@ -125,7 +125,7 @@ class Mysql2postgres
               @indexes << index
             elsif (match_data = /PRIMARY KEY .*\((.*)\)/.match(line))
               index[:primary] = true
-              index[:columns] = match_data[1].split(',').map { |col| col.strip.delete('`') }
+              index[:columns] = match_data[1].split(',').map { |col| col.strip.delete '`' }
               @indexes << index
             end
           end
@@ -202,8 +202,8 @@ class Mysql2postgres
       connect
     end
 
-    def query(*args, &block)
-      mysql.query(*args, &block)
+    def query(*args, &)
+      mysql.query(*args, &)
     rescue Mysql::Error => e
       if e.message.match?(/gone away/i)
         reconnect
@@ -216,7 +216,7 @@ class Mysql2postgres
     end
 
     def tables
-      @tables ||= @mysql.query('SHOW TABLES').map { |row| Table.new(self, row.first) }
+      @tables ||= @mysql.query('SHOW TABLES').map { |row| Table.new self, row.first }
     end
 
     def paginated_read(table, page_size)

data/lib/mysql2postgres/postgres_file_writer.rb

@@ -151,7 +151,7 @@ class Mysql2postgres
     private
 
     def quoted_list(list)
-      list.map { |c| PG::Connection.quote_ident(c) }.join(', ')
+      list.map { |c| PG::Connection.quote_ident c }.join(', ')
     end
   end
 end

data/lib/mysql2postgres/postgres_writer.rb

@@ -51,7 +51,7 @@ class Mysql2postgres
              when 'double precision'
                default = " DEFAULT #{column[:default].nil? ? 'NULL' : column[:default]}" if default
                'double precision'
-             when 'datetime'
+             when 'datetime', 'datetime(6)'
                default = nil
                'timestamp without time zone'
              when 'date'
@@ -63,7 +63,7 @@ class Mysql2postgres
                  default = ' DEFAULT CURRENT_TIMESTAMP'
                when datetime_zero
                  default = " DEFAULT '#{datetime_zero_fix}'"
-               when datetime_zero(with_seconds: true) # rubocop: disable Style/MethodCallWithArgsParentheses
+               when datetime_zero(with_seconds: true)
                  default = " DEFAULT '#{datetime_zero_fix with_seconds: true}'"
                end
                'timestamp without time zone'
@@ -102,14 +102,14 @@ class Mysql2postgres
         if column_type(column) == 'boolean'
           row[index] = if row[index] == 1
                          't'
-                       elsif row[index].zero?
+                       elsif row[index]&.zero?
                          'f'
                        else
                          row[index]
                        end
         end
 
-        row[index] = string_data row, index, column if row[index].is_a? String
+        row[index] = string_data table, row, index, column if row[index].is_a? String
 
         row[index] = '\N' unless row[index]
       end
@@ -137,7 +137,7 @@ class Mysql2postgres
       value.join ':'
     end
 
-    def string_data(row, index, column)
+    def string_data(table, row, index, column)
       if column_type(column) == 'bytea'
         if column[:name] == 'data'
           with_gzip = false
@@ -153,16 +153,16 @@ class Mysql2postgres
           escape_bytea row[index]
         end
       else
-        escape_data(row[index]).gsub(/\n/, '\n').gsub(/\t/, '\t').gsub(/\r/, '\r').gsub(/\0/, '')
+        escape_data(row[index]).gsub("\n", '\n').gsub("\t", '\t').gsub("\r", '\r').gsub(/\0/, '')
       end
     end
 
     def escape_bytea(data)
-      escape_data(PG::Connection.escape_bytea(data)).gsub(/''/, "'")
+      escape_data(PG::Connection.escape_bytea(data)).gsub("''", "'")
     end
 
     def escape_data(value)
-      value.gsub(/\\/, '\\\\\\')
+      value.gsub '\\', '\\\\\\'
     end
   end
 end

data/lib/mysql2postgres/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Mysql2postgres
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 end

data/lib/mysql2postgres.rb

@@ -5,7 +5,7 @@ require 'yaml'
 require 'pg'
 require 'pg_ext'
 require 'pg/exceptions'
-require 'pg/constants'
+# require 'pg/constants'
 require 'pg/connection'
 require 'pg/result'
 

data/mysql2postgres.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.email = 'a.meindl@alphanodes.com'
   s.metadata = { 'rubygems_mfa_required' => 'true' }
   s.executables = ['mysql2postgres']
-  s.required_ruby_version = '>= 2.7'
+  s.required_ruby_version = '>= 3.1'
 
   s.files = [
     '.gitignore',
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.summary = 'MySQL to PostgreSQL Data Translation'
 
-  s.add_runtime_dependency 'pg', '~> 1.2.2'
-  s.add_runtime_dependency 'rake'
-  s.add_runtime_dependency 'ruby-mysql', '~> 3.0'
+  s.add_dependency 'pg', '~> 1.5.3'
+  s.add_dependency 'rake'
+  s.add_dependency 'ruby-mysql', '~> 4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2postgres
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Max Lapshin <max@maxidoors.ru>
@@ -24,7 +24,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-31 00:00:00.000000000 Z
+date: 2025-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
 description: Translates MySQL -> PostgreSQL
 email: a.meindl@alphanodes.com
 executables:
@@ -117,14 +117,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: MySQL to PostgreSQL Data Translation