tapsoob 0.4.13-java → 0.4.17-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11a4c534d396b9a61d02e8d9723d4b207853e38e9638ec8702533828ac222d6d
-  data.tar.gz: 440dec8672cb33356b659dca108fcaa48f94b42d8a4a9120081476459184d850
+  metadata.gz: 7dde8f342520a6d2dd96362628bdd3d2ccf91fbc3590ee27a1b09e5ad264a4cd
+  data.tar.gz: 0e3df729ea764e07bdc1631483892a5313d93b136b4fb7c01392a8de88505ec2
 SHA512:
-  metadata.gz: c6182f0faeff1b53db954b2bdd64102ad2d9361dcacff4f057401ab720d1dd7fc09f49bb570c007230eea55ca283f95fd72124a766ebb6ef6452f5d8dbf7e84a
-  data.tar.gz: 69287437c2161b6ebb5df7f3a0579c7590255249de7251bd047bf654ede3b7102c1605989067a13ef6dcb4477a36c6aa3c0682b55fc515d2201baab7c7857db6
+  metadata.gz: e5e2418c63d6be6f1f03252160ce27dc822cc892ae82ee7fa620ca5b9638c103d24577f180a34bd327557bf38e13874f8bb94eaa7245a47d259bc3746a7409a8
+  data.tar.gz: 889704b167c445922382e8c379ef1277ccd94d1cb96f4a48e089c7bef878467f5758de981be6ce91a079396b623791b5d5d1cddab29513c2aa51531c99630946

data/lib/tapsoob/data_stream.rb

@@ -75,7 +75,7 @@ module Tapsoob
       state[:chunksize] = fetch_chunksize
       ds = table.order(*order_by).limit(state[:chunksize], state[:offset])
       log.debug "DataStream#fetch_rows SQL -> #{ds.sql}"
-      rows = Tapsoob::Utils.format_data(ds.all,
+      rows = Tapsoob::Utils.format_data(db, ds.all,
         :string_columns => string_columns,
         :schema => db.schema(table_name),
         :table => table_name
@@ -152,15 +152,15 @@ module Tapsoob
 
       rows = parse_encoded_data(encoded_data, json[:checksum])
 
-      @complete = rows[:data] == [ ]
+      @complete = rows == { }
 
       # update local state
       state.merge!(json[:state].merge(:chunksize => state[:chunksize]))
 
       unless @complete
         yield rows if block_given?
-        state[:offset] += (rows[:data].size.nil? ? 0 : rows[:data].size)
-        rows[:data].size || 0
+        state[:offset] += rows[:data].size
+        rows[:data].size
       else
         0
       end

data/lib/tapsoob/utils.rb

@@ -37,7 +37,7 @@ module Tapsoob
       data.unpack("m").first
     end
 
-    def format_data(data, opts = {})
+    def format_data(db, data, opts = {})
       return {} if data.size == 0
       string_columns = opts[:string_columns] || []
       schema = opts[:schema] || []
@@ -75,7 +75,16 @@ Data : #{data}
       res = { table_name: table, header: header, data: only_data }
 
       # Add types if schema isn't empty
-      res[:types] = schema.map { |c| c.last[:type] } unless schema.empty?
+      res[:types] = schema.map do |c|
+        case db.column_schema_to_ruby_type(c.last[:type])[:type]
+        when BigDecimal
+          "float"
+        when File
+          "blob"
+        else
+          db.column_schema_to_ruby_type(c.last[:type])[:type].to_s.downcase
+        end
+      end unless schema.empty?
 
       res
     end
@@ -144,7 +153,7 @@ Data : #{data}
       data = row_data
       if File.exists?(File.join(dump_path, "data", "#{table}.json"))
         previous_data = JSON.parse(File.read(File.join(dump_path, "data", "#{table}.json")))
-        data[:data] = previous_data["data"] + row_data[:data]
+        data[:data] = previous_data["data"] + row_data[:data] unless row_data[:data].nil?
       end
 
       File.open(File.join(dump_path, "data", "#{table}.json"), 'w') do |file|

data/lib/tapsoob/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.17
 platform: java
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement