tapsoob 0.3.21-java → 0.3.26-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58cd9a0f8c1ad8356c661c091d51d53e515aee22b746622f08173e31eaef7edf
-  data.tar.gz: 6802b841f8c59cb73687c1f22a0e696ae26f23732871f44063bbf712290a1ea2
+  metadata.gz: 9257ce158006409f702d21898b3352d8269aa1dd4459096e76b89521125e45be
+  data.tar.gz: 45c341a28a30a5ac78d68b426b9afae60bb604172c9dd2bd7b2b0333774d4a97
 SHA512:
-  metadata.gz: f2d55a4ce17d26490e587e118bdcbe43f9430b7c9cbd0c9672c17dd358d37d9c203564a8c04cd6638a326f50966e6dc5a657a7dbecd1c40a08ca94ced1c21876
-  data.tar.gz: 2ec0bb229614e453d5832f60b14cfd7e98e5a3cbec264499d0b50cfb77bd1790ba4505a599c3fd21af87ae1bb4da4c5f215e3ff34cb23c9b583cc5473aba1402
+  metadata.gz: 0d7a546a51d161e10bc35e7059cc80b1df2061653763daac67f8a3189ebb7b4d63fb68eff14150f13cedbcfb150142f1d3cc8401aaa1d97cf70aed9d7167fdbf
+  data.tar.gz: 12ab879416b51181480181e6ca41e538e332b2c88c94d40e968d68eff69069b1d98b7442b284aa429d016c07e9dcb1a6a0c2253d93982c5afda9d7f0e56a42a4

data/lib/tapsoob/cli/root.rb

@@ -39,6 +39,7 @@ module Tapsoob
       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 :"discard-identity", desc: "Remove identity when pushing data (may result in creating duplicates)", default: false, type: :boolean
       option :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"
       def push(dump_path, database_url)
         opts = parse_opts(options)
@@ -71,8 +72,9 @@ module Tapsoob
             debug: options[:debug]
           }
 
-          # Purge (push only)
+          # Push only options
           opts[:purge] = options[:purge] if options.key?(:purge)
+          opts[:"discard-identity"] = options[:"discard-identity"] if options.key?(:"discard-identity")
 
           # Resume
           if options[:resume]

data/lib/tapsoob/data_stream.rb

@@ -1,4 +1,7 @@
 # -*- encoding : utf-8 -*-
+require 'date'
+require 'time'
+
 require 'tapsoob/log'
 require 'tapsoob/utils'
 
@@ -6,9 +9,9 @@ module Tapsoob
   class DataStream
     DEFAULT_CHUNKSIZE = 1000
 
-    attr_reader :db, :state
+    attr_reader :db, :state, :options
 
-    def initialize(db, state)
+    def initialize(db, state, opts = {})
       @db = db
       @state = {
         :offset          => 0,
@@ -17,6 +20,7 @@ module Tapsoob
         :total_chunksize => 0
       }.merge(state)
       @state[:chunksize] ||= DEFAULT_CHUNKSIZE
+      @options = opts
       @complete = false
     end
 
@@ -218,6 +222,9 @@ module Tapsoob
     end
 
     def import_rows(rows)
+      columns = rows[:header]
+      data    = rows[:data]
+
       # Decode blobs
       if rows.has_key?(:types) && rows[:types].include?("blob")
         blob_indices = rows[:types].each_index.select { |idx| rows[:types][idx] == "blob" }
@@ -227,8 +234,38 @@ module Tapsoob
           end
         end
       end
+
+      # Parse date/datetime/time columns
+      if rows.has_key?(:types)
+        %w(date datetime time).each do |type|
+          if rows[:types].include?(type)
+            klass = case type
+            when "date"
+              Date
+            when "datetime"
+              DateTime
+            when "time"
+              Time
+            end
+
+
+            type_indices = rows[:types].each_index.select { |idx| rows[:types][idx] == type }
+            rows[:data].each_index do |idx|
+              type_indices.each do |ti|
+                rows[:data][idx][ti] = klass.parse(rows[:data][idx][ti])
+              end
+            end
+          end
+        end
+      end
+
+      # Remove id column
+      if @options[:"discard-identity"]
+        columns = rows[:header] - ["id"]
+        data    = data.map { |d| d[1..-1] }
+      end
       
-      table.import(rows[:header], rows[:data], :commit_every => 100)
+      table.import(columns, data, :commit_every => 100)
       state[:offset] += rows[:data].size
     rescue Exception => ex
       case ex.message
@@ -246,19 +283,19 @@ module Tapsoob
       state[:offset] = table.count
     end
 
-    def self.factory(db, state)
+    def self.factory(db, state, opts)
       if defined?(Sequel::MySQL) && Sequel::MySQL.respond_to?(:convert_invalid_date_time=)
         Sequel::MySQL.convert_invalid_date_time = :nil
       end
 
       if state.has_key?(:klass)
-        return eval(state[:klass]).new(db, state)
+        return eval(state[:klass]).new(db, state, opts)
       end
 
       if Tapsoob::Utils.single_integer_primary_key(db, state[:table_name].to_sym)
-        DataStreamKeyed.new(db, state)
+        DataStreamKeyed.new(db, state, opts)
       else
-        DataStream.new(db, state)
+        DataStream.new(db, state, opts)
       end
     end
   end
@@ -266,8 +303,8 @@ module Tapsoob
   class DataStreamKeyed < DataStream
     attr_accessor :buffer
 
-    def initialize(db, state)
-      super(db, state)
+    def initialize(db, state, opts = {})
+      super(db, state, opts)
       @state = { :primary_key => order_by(state[:table_name]).first, :filter => 0 }.merge(@state)
       @state[:chunksize] ||= DEFAULT_CHUNKSIZE
       @buffer = []

data/lib/tapsoob/operation.rb

@@ -394,9 +394,9 @@ 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,
+        stream = Tapsoob::DataStream.factory(db, {
           :table_name => table_name,
-          :chunksize => default_chunksize)
+          :chunksize => default_chunksize }, { :"discard-identity" => @opts[:"discard-identity"] || false })
         progress = ProgressBar.new(table_name.to_s, count)
         push_data_from_file(stream, progress)
       end

data/lib/tapsoob/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.3.26
 platform: java
 authors:
 - Félix Bellanger