tapsoob 0.4.14-java → 0.4.18-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1d186408226b625b302951f8130ef2594579af0fe21c8e7a05c48324afd0a64
-  data.tar.gz: 002354b3ab09739f3687d9b14f9599f91870ad6bfe0dd5d7927f5e20b0aa81a6
+  metadata.gz: caa7d5a2e1a39c66d9565bd984c5b620fd7ce747425ef20548769030e9915389
+  data.tar.gz: a01c7fcf788caad90d1a6ef77f11efc36dbadafaadffd6cb525085cfc731630d
 SHA512:
-  metadata.gz: f4df3ae5d7c27a1f73f340854fc228f2e7d8ce0955edd0ba59796b5765a73a1d832acbae50024306f956dc7aea0ed5d589eff7dc65a3e0f718a94ccb4defa7b1
-  data.tar.gz: 98cc115db20635c92e788f193011537422c53a4a1c0a7bf64ac655c1f0aa490529c80a7cee27e40f7880779fb8d3b57a10c2dcd4736c1e42e10abfdb917cfca1
+  metadata.gz: af51cbe446d59d0b727aa64a5d0a3b67d963d678f45a812a3591b4ea2edfb5e515c2e4c057133ab9e281d9b38a2faaf1b099062ca151904a0732f9ef0f779e97
+  data.tar.gz: 956369b8b67eb9aadbc3222d5bb8a2ad3665c66059b78698cb42445692a0162d552dbc0db2abdcf40e911f69eb4aa9f7b20bbd30a73bdb24a94e8968760b31c8

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].nil? ? 0 : rows[:data].size)
-        (rows[:data].nil? ? 0 : rows[:data].size)
+        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,20 @@ 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 :Bignum
+          "integer"
+        when File
+          "blob"
+        when TrueClass
+          "boolean"
+        else
+          db.column_schema_to_ruby_type(c.last[:type])[:type].to_s.downcase
+        end
+      end unless schema.empty?
 
       res
     end
@@ -144,7 +157,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.14".freeze
+  VERSION = "0.4.18".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.18
 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