tapsoob 0.3.22-java → 0.3.27-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0902657538025d8da02f1bcfe8d15b8e14746bb56083cc021044f25aa4e81f24'
-  data.tar.gz: 41a7f3a480214954e2d06869f094e38b73ac79ba59e38b17b6c06d9a37a991cd
+  metadata.gz: 2c121ad1d7de6889a3cc1e79d39ab7844099a88a3da79654c1bfba1ddaba87f6
+  data.tar.gz: fac74e80043e1e2418f11541db774650f483a866e52fdfbe7282d4eb3f63a47a
 SHA512:
-  metadata.gz: 42f9ca1dd0dd01eb5f257b30e8872db9bf6de0606453a74558d0be1094abfeae036f0394d32c73fb6a99ed19e383e4dbddae0ab63a90d33d04c015096564664e
-  data.tar.gz: 2f42ab39fbb77d28620c4b174429fc8d1861e5a11a708c34ddece07a809f1a5d4e436dbf1e9bed8e3ce925421a7439c1098f5f60d135b10ed813144dddcf512d
+  metadata.gz: 4091d6a83bd692f59661236077028ee8c082b9fbe46d8adc7bb38afe736a6f26b3fcb404e4eeb9e2f0597cad75438cfbdeea5dabe9ad70f34f1582f202b7f54e
+  data.tar.gz: 3faea33ccd48dc605cd0f70e8f8fd9c68ed9a0d77ae057af193051a004124a91a9d2b65f3265878368e0aa9d035631ce6af4eb4142b2bd6bcc0070b4a9060152

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