tapsoob 0.3.22 → 0.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39668125ecb9a04823357801014aafd32b66b497ebe0e067b9b4cb19e641f04e
-  data.tar.gz: fe1b3dd5eb413addbc09960ec659cc935c40ce8ce416900dd0f5784369cb2e43
+  metadata.gz: b7b43f7fe0ec4c4f90c32f00e0ca57ab252c78cdf5f13dfe1c689f8d7a031d32
+  data.tar.gz: 3d27c0eb39663d9766d1104df903045be1ddbd1580cfcf854e0ea6a98eb64f70
 SHA512:
-  metadata.gz: eda88cd4c768141b177fd44cbb05392941d23a7bf285bcda2890d8b35bd972121b6fe6a8407b155ef8074abc971c991a1f8f41af9ed447643f4f8d88332adb6d
-  data.tar.gz: 7d2339542cb0b2c246cebdb2908f371cb695ce273eac7c11cabe1122a86febdbc947d293ca5c92601c1243d9c130a0026bb4d85f9d4e6036b8c2fddf78ba0a6e
+  metadata.gz: be0a84840b6036dfd5ee03a4c659978eb38b30353961f2797bdb03a6f5ea6fddad407ff3442252a87f0619968cafe57a7c52f7c3102de8757b70ffaf2babd0d4
+  data.tar.gz: c415ccc0c1d035ece72938c443ff2deba691432f4f9baa6560cba29eac0537bd7c48579a5640727af5f2a42091b2ffdffb63fd2c88bb90f7cf4c266a86449990

data/lib/tapsoob/data_stream.rb

@@ -219,6 +219,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" }
@@ -229,10 +232,27 @@ module Tapsoob
         end
       end
 
+      # Parse date/datetime/time columns
+      if rows.has_key?(:types)
+        %w(date datetime time).each do |type|
+          if rows[:types].include?(type)
+            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] = Sequel.send("string_to_#{type}".to_sym, rows[:data][idx][ti])
+              end
+            end
+          end
+        end
+      end
+
       # Remove id column
-      columns = ((@options[:"discard-identity"] && rows[:headers].include?("id")) ? rows[:headers] - ["id"] : rows[:headers])
+      if @options[:"discard-identity"]
+        columns = rows[:header] - ["id"]
+        data    = data.map { |d| d[1..-1] }
+      end
       
-      table.import(columns, rows[:data], :commit_every => 100)
+      table.import(columns, data, :commit_every => 100)
       state[:offset] += rows[:data].size
     rescue Exception => ex
       case ex.message
@@ -250,19 +270,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
@@ -270,8 +290,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/version.rb

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

metadata

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