tapsoob 0.3.21-java → 0.3.22-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58cd9a0f8c1ad8356c661c091d51d53e515aee22b746622f08173e31eaef7edf
-  data.tar.gz: 6802b841f8c59cb73687c1f22a0e696ae26f23732871f44063bbf712290a1ea2
+  metadata.gz: '0902657538025d8da02f1bcfe8d15b8e14746bb56083cc021044f25aa4e81f24'
+  data.tar.gz: 41a7f3a480214954e2d06869f094e38b73ac79ba59e38b17b6c06d9a37a991cd
 SHA512:
-  metadata.gz: f2d55a4ce17d26490e587e118bdcbe43f9430b7c9cbd0c9672c17dd358d37d9c203564a8c04cd6638a326f50966e6dc5a657a7dbecd1c40a08ca94ced1c21876
-  data.tar.gz: 2ec0bb229614e453d5832f60b14cfd7e98e5a3cbec264499d0b50cfb77bd1790ba4505a599c3fd21af87ae1bb4da4c5f215e3ff34cb23c9b583cc5473aba1402
+  metadata.gz: 42f9ca1dd0dd01eb5f257b30e8872db9bf6de0606453a74558d0be1094abfeae036f0394d32c73fb6a99ed19e383e4dbddae0ab63a90d33d04c015096564664e
+  data.tar.gz: 2f42ab39fbb77d28620c4b174429fc8d1861e5a11a708c34ddece07a809f1a5d4e436dbf1e9bed8e3ce925421a7439c1098f5f60d135b10ed813144dddcf512d

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

@@ -6,9 +6,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 +17,7 @@ module Tapsoob
         :total_chunksize => 0
       }.merge(state)
       @state[:chunksize] ||= DEFAULT_CHUNKSIZE
+      @options = opts
       @complete = false
     end
 
@@ -227,8 +228,11 @@ module Tapsoob
           end
         end
       end
+
+      # Remove id column
+      columns = ((@options[:"discard-identity"] && rows[:headers].include?("id")) ? rows[:headers] - ["id"] : rows[:headers])
       
-      table.import(rows[:header], rows[:data], :commit_every => 100)
+      table.import(columns, rows[:data], :commit_every => 100)
       state[:offset] += rows[:data].size
     rescue Exception => ex
       case ex.message

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.22".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.22
 platform: java
 authors:
 - Félix Bellanger