tapsoob 0.3.21 → 0.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7109b252c22de2c4c796068f6ac2fc4df267e4b1130ee875a40b08f9ee7a1224
-  data.tar.gz: 5530cb2317ae8a4829335b20e90bbb1788a546f898839a1f330c379ecd2973c1
+  metadata.gz: 39668125ecb9a04823357801014aafd32b66b497ebe0e067b9b4cb19e641f04e
+  data.tar.gz: fe1b3dd5eb413addbc09960ec659cc935c40ce8ce416900dd0f5784369cb2e43
 SHA512:
-  metadata.gz: cf1960e1ef01a40a0e22f66a042616d7a16b3030f8c7ad20227b7ab44805b175872ec3b030d4e1a3c08469ccf3a33f606b8bcdd14bfddb58ce2378ade773dfac
-  data.tar.gz: 9abb44b2ca81049159c78dc771938bb13e8334f008f51d9c899f5b8c22928621d003a429537fc639eef713d3005ce9804731b09db95d5bde24f97d2615dd7bef
+  metadata.gz: eda88cd4c768141b177fd44cbb05392941d23a7bf285bcda2890d8b35bd972121b6fe6a8407b155ef8074abc971c991a1f8f41af9ed447643f4f8d88332adb6d
+  data.tar.gz: 7d2339542cb0b2c246cebdb2908f371cb695ce273eac7c11cabe1122a86febdbc947d293ca5c92601c1243d9c130a0026bb4d85f9d4e6036b8c2fddf78ba0a6e

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: ruby
 authors:
 - Félix Bellanger