tapsoob 0.3.13-java → 0.3.20-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8a00a3e0e55eebdd6fe0fadd07b36f728f6e7339484ca1dafe33672e08d72a
-  data.tar.gz: 61e763aae7ca21507d9558f652f1ed600dcce77bf53b1b72ceff81990b9b2d85
+  metadata.gz: a764dbe840834497a89fa5b22862cc3a0f1525606cab9e395b3dee38c5a5b1d7
+  data.tar.gz: f62b37a1ac1229751eb79d0a828eb5d5acc048d1f12279e888a024ff459607ec
 SHA512:
-  metadata.gz: 8fa22198dfbfbcfb103e7f217a83f6bb7160280d38ecca7fb595573563ac2ebc243a39fa63cd97d67422e08d38cb602b84544db74d6817e415e185e980fad3a5
-  data.tar.gz: 60c9d09e6218b649793a79b38ef521938dade0c4dc072864cd0fc37bbc9aeb46a9d9f6631cf98f2f8e9b7ccf2c7f53b6aed7b4cb6549cd7f20bff33047e7001c
+  metadata.gz: 14f6c283d2f67d3f6f5576e87cbe7ea4a2b23185f45f215f2493a5929cd5e109bed97cf18543f38216991e953238e672d4344215907388bb4cc56ca608a0c70c
+  data.tar.gz: baa89887c4baad4d90a4ba2429718be9c30eb52c111eeafba9d5ea5ab757fe40ebe8d5dca937e1e6b3fcd31b8a062f7c0236fd4afc653af0341d69bd074aacb3

data/README.md

@@ -36,6 +36,23 @@ You can list all available options using the command:
     tapsoob push -h
 
 
+## NEW : Piping your schema/indexes/data
+
+Due to some needs we added ways to pipe your schema/indexes/data directly from one database to another, here's an equivalent of the export/import process described above using this technique :
+
+```
+tapsoob schema dump <db_source_url> | tapsoob schema load <db_target_url> --drop=true
+tapsoob schema indexes <db_source_url> | tapsoob schema load_indexes <db_target_url>
+tapsoob data pull <db_source_url> -p false | tapsoob data push <db_target_url>
+tapsoob schema reset_db_sequences <db_target_url>
+```
+
+A few notes here :
+
+* the `--drop` option for the `schema load` command defaults to false, if you don't intend to drop your tables on your target databases you can ommit it (if a table already exists tapsoob will exit w/ an error) ;
+* the `data pull` and `data push` commands are new and have a few options that you can display w/ `tapsoob data <pull|push> -h`, by defaults it prints the progress of your data extraction/import but if you want to pipe directly your export into another database you'll have to set the `--progress` (shorthand `-p`) option to `false` (or `--no-progress`) as above ;
+* resetting database sequences is important as a `data push` command doesn't handle that directly.
+
 ## Integration with Rails
 
 If you're using Rails, there's also two Rake tasks provided:

data/lib/tapsoob/cli/root.rb

@@ -38,6 +38,7 @@ module Tapsoob
       option :filter, desc: "Regex Filter for tables", type: :string, aliases: "-f"
       option :tables, desc: "Shortcut to filter on a list of tables", type: :array, aliases: "-t"
       option :"exclude-tables", desc: "Shortcut to exclude a list of tables", type: :array, aliases: "-e"
+      option :purge, desc: "Purge data in tables prior to performing the import", default: false, type: :boolean, aliases: "-p"
       option :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"
       def push(dump_path, database_url)
         opts = parse_opts(options)
@@ -70,6 +71,9 @@ module Tapsoob
             debug: options[:debug]
           }
 
+          # Purge (push only)
+          opts[:purge] = options[:purge] if options.key?(:purge)
+
           # Resume
           if options[:resume]
             if File.exists?(options[:resume])

data/lib/tapsoob/data_stream.rb

@@ -218,6 +218,16 @@ module Tapsoob
     end
 
     def import_rows(rows)
+      # Decode blobs
+      if rows.has_key?(:types) && rows[:types].include?("blob")
+        blob_indices = rows[:types].each_index.select { |idx| rows[:types][idx] == "blob" }
+        rows[:data].each_index do |idx|
+          blob_indices.each do |bi|
+            rows[:data][idx][bi] = Sequel::SQL::Blob.new(Tapsoob::Utils.base64decode(rows[:data][idx][bi])) unless rows[:data][idx][bi].nil?
+          end
+        end
+      end
+      
       table.import(rows[:header], rows[:data], :commit_every => 100)
       state[:offset] += rows[:data].size
     rescue Exception => ex

data/lib/tapsoob/operation.rb

@@ -393,6 +393,7 @@ module Tapsoob
 
       tables.each do |table_name, count|
         next unless File.exists?(File.join(dump_path, "data", "#{table_name}.json"))
+        db[table_name.to_sym].truncate if @opts[:purge]
         stream = Tapsoob::DataStream.factory(db,
           :table_name => table_name,
           :chunksize => default_chunksize)

data/lib/tapsoob/schema.rb

@@ -84,7 +84,16 @@ END_MIG
       Sequel.connect(database_url) do |db|
         db.extension :schema_dumper
         klass = eval(schema)
-        klass.apply(db, :down) if options[:drop]
+        if options[:drop]
+          # Start special hack for MySQL
+          db.run("SET foreign_key_checks = 0") if [:mysql, :mysql2].include?(db.adapter_scheme)
+
+          # Run down migration
+          klass.apply(db, :down)
+
+          # End special hack for MySQL
+          db.run("SET foreign_key_checks = 1") if [:mysql, :mysql2].include?(db.adapter_scheme)
+        end
         klass.apply(db, :up)
       end
     end

data/lib/tapsoob/utils.rb

@@ -51,7 +51,7 @@ module Tapsoob
 
       header = data[0].keys
       only_data = data.collect do |row|
-        row = blobs_to_string(row, string_columns)
+        row = encode_blobs(row, string_columns)
         row.each do |column, data|
           if data.to_s.length > (max_lengths[column] || data.to_s.length)
             raise Tapsoob::InvalidData.new(<<-ERROR)
@@ -70,27 +70,33 @@ Data : #{data}
         end
         header.collect { |h| row[h] }
       end
-      { table_name: table, header: header, data: only_data }
+
+      res = { table_name: table, header: header, data: only_data }
+
+      # Add types if schema isn't empty
+      res[:types] = schema.map { |c| c.last[:type] } unless schema.empty?
+
+      res
     end
 
     # mysql text and blobs fields are handled the same way internally
     # this is not true for other databases so we must check if the field is
     # actually text and manually convert it back to a string
     def incorrect_blobs(db, table)
-      return [] if (db.url =~ /mysql:\/\//).nil?
+      return [] if (db.url =~ /(mysql|mysql2):\/\//).nil?
 
       columns = []
       db.schema(table).each do |data|
         column, cdata = data
-        columns << column if cdata[:db_type] =~ /text/
+        columns << column if cdata[:type] == :blob
       end
       columns
     end
 
-    def blobs_to_string(row, columns)
+    def encode_blobs(row, columns)
       return row if columns.size == 0
       columns.each do |c|
-        row[c] = row[c].to_s if row[c].kind_of?(Sequel::SQL::Blob)
+        row[c] = base64encode(row[c]) unless row[c].nil?
       end
       row
     end

data/lib/tapsoob/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Tapsoob
-  VERSION = "0.3.13".freeze
+  VERSION = "0.3.20".freeze
 end

data/tapsoob.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "ripl", "~> 0.7.1"
-  s.add_dependency "sequel", "~> 5.25.0"
-  s.add_dependency "thor", "~> 0.20.3"
+  s.add_dependency "sequel", "~> 5.37.0"
+  s.add_dependency "thor", "~> 1.0.1"
 
   if (RUBY_PLATFORM =~ /java/).nil?
     s.add_development_dependency "mysql2",  "~> 0.4.10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.20
 platform: java
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.25.0
+        version: 5.37.0
   name: sequel
   prerelease: false
   type: :runtime
@@ -38,13 +38,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.25.0
+        version: 5.37.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.0.1
   name: thor
   prerelease: false
   type: :runtime
@@ -52,7 +52,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -149,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Simple tool to import/export databases.