mysql2postgres 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc905b9634e92298f5b5d192b6f4388294f6153a777b551b408bc5e944247b3f
-  data.tar.gz: 108d90760f0600e55f117df749147f8137d3044a7724dd901f76869db7b45caf
+  metadata.gz: 1108264fc3155986e78c07a12abd11c6ef39a1fb671a252e6921bf4bbf7f3a4b
+  data.tar.gz: 19837bf3a64bf6a204c9325b1271566e982467f7a3e9a53f966681c8a680e1ad
 SHA512:
-  metadata.gz: 6b08edc13623c942b61d03cecce1f577eca9fce3906e3c06ef17c848396dfebadb39017cb7ae7aecb5193e91cffc85d2a4cea2e49054f0e7dd3dffc8f53012eb
-  data.tar.gz: 5ef72f3a6ac5961102d282b38cf2eb5bc62d301f5e84b590dc4e9dd7d057fa51c43f5272b112478ab6b6d3513fc3ac67e8a24bae0d9f23d3f162c0ddd8f591e0
+  metadata.gz: e5c54b071adaa63e1bfa5819fcadc7520f1063a4a0d2218adb5337361df259ddf574ab37bec2bc7f7683a0c4024679fd87c6d6715fe692a56768365cb5021a71
+  data.tar.gz: 992c22cdfa9e8ebea90fdecb10f95a00367b3ba9cd744c6cb0d954a0a2be81138376319a7f657337e8a50b83cd4969e577e7b6de480369e34edd1b9dcc8697e6

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
@@ -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'
@@ -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.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2postgres
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 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: 2023-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -124,7 +124,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: MySQL to PostgreSQL Data Translation