tapsoob 0.3.7-java → 0.3.17-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c156f7a94d7fed3bef2101bbb69bc8694795e3f31ea0cccbbc5c99083bb7814
-  data.tar.gz: 31ea591df09f45f3342499123f5726a50103d9bbdbc58fce9b2d524618efb120
+  metadata.gz: dc5fc59bb301fada27f8d881680940916d55a17d98645a3761c5aa42cd1a4b44
+  data.tar.gz: 8aa7c7cdaa584109f932908f488b54b78dcd6de147386f1c60e4c09615be64ab
 SHA512:
-  metadata.gz: e235e9bf381de0b2afc193286fd6e07979823d1f42121afb944fdc0b14e04477f01d72735f8073f839a78ca3acc37974c4bd33f3a7dc22fb08a57ac9f19636a3
-  data.tar.gz: b108dcbe587442eb35e4c2ec47b18239df6ea6206168fe9b81a40811c08934ea9c0f8f9a89ba51bfcf08e31972668bc8d022ede3c0968ad7d365b7a7a5e3ccca
+  metadata.gz: 375467934ae7a5f53d9312aae0d675bd5095ec04af63672b875972ea4c0fcea29bc23d5e19d802664fbcdb0ed7393884bdb701d269ffb5f030b1d729ea4176fa
+  data.tar.gz: 6f628a7ff1a132d39b4377eb3dac4c1078a2bf1171cb436d2b72add56524d4c29d6ef32638095d6962084b9339effefd67ede9af34a4676e37cb51f5da3d8987

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/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/schema.rb

@@ -2,6 +2,7 @@
 require 'sequel'
 require 'sequel/extensions/schema_dumper'
 require 'sequel/extensions/migration'
+require 'erb'
 require 'json'
 
 module Tapsoob
@@ -11,7 +12,23 @@ module Tapsoob
     def dump(database_url)
       db = Sequel.connect(database_url)
       db.extension :schema_dumper
-      db.dump_schema_migration(:indexes => false)
+      template = ERB.new <<-END_MIG
+Class.new(Sequel::Migration) do
+  def up
+  <% db.tables.each do |table| %>
+    <%= db.dump_table_schema(table, indexes: false) %>
+  <% end %>
+  end
+
+  def down
+  <% db.tables.each do |table| %>
+    drop_table("<%= table %>", if_exists: true)
+  <% end %>
+  end
+end
+END_MIG
+
+      template.result(binding)
     end
 
     def dump_table(database_url, table)
@@ -21,11 +38,11 @@ module Tapsoob
         <<END_MIG
 Class.new(Sequel::Migration) do
   def up
-    #{db.dump_table_schema(table, :indexes => false)}
+    #{db.dump_table_schema(table, indexes: false)}
   end
 
   def down
-    drop_table("#{table}") if @db.table_exists?("#{table}")
+    drop_table("#{table}", if_exists: true)
   end
 end
 END_MIG
@@ -67,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.7".freeze
+  VERSION = "0.3.17".freeze
 end

data/tapsoob.gemspec

@@ -22,7 +22,7 @@ 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 "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.7
+  version: 0.3.17
 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: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     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.4
 signing_key:
 specification_version: 4
 summary: Simple tool to import/export databases.