tapsoob 0.4.15-java → 0.4.19-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf90aef94141e6d998c8ec0661f8d0b2d6f4340b40a565113bee04865c881314
-  data.tar.gz: 4123d828e01e86483c8ebf0a2a600e2eeb1c5a7788fc699e6348bee62fd95304
+  metadata.gz: a478b81adfae4bae3508db6802b7b9a7280f8579e4da19cd1d575d741dacd0f3
+  data.tar.gz: 2b29446e1aa6ce40c4aabacbfd2d2e227b75d11f7426706de97948489ee2d87d
 SHA512:
-  metadata.gz: ac7bba0277b68116b4a46673d90f0f6bef88d35293ad47d517f3f23928c65fc42041e4da6ecb7bf6ddf3028828d7c85858b703fdb3c9d25685a806f29a1d12f3
-  data.tar.gz: fe2aeb16c60b303db8190e0b20de0e4129410c50ad17b0a71ef7e64793a0ea80df35582b1747098270f40f83d0ceb4c07ec60021d9c21e1456e996f07e692e90
+  metadata.gz: e4c76f4fb86ef9b0358e24657ea12911dacdd118a484210a97b206ba6b486c7afa1126d0d2fb7f52dc40bca96da9d29317dea687581ff953f4c92d0ca3f43878
+  data.tar.gz: fcfe1fc46dce2b88616557c419c04e451307a0c86e295663a750564efb6de1bf67c1f108d1ea86e9294d6a133abc258995562df657c038a127a3f4b2f9e160b4

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]
+        when BigDecimal
+          "float"
+        when :Bignum
+          "integer"
+        when File
+          "blob"
+        when TrueClass
+          "boolean"
+        else
+          db.column_schema_to_ruby_type(c.last)[:type].to_s.downcase
+        end
+      end unless schema.empty?
 
       res
     end

data/lib/tapsoob/version.rb

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

metadata

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