tapsoob 0.4.13 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e222b69d72cdf605c2282625a4e3fae78310395ebb04c888e21c5a43a87bb62
-  data.tar.gz: dc997c5a29cf63de0e6f00b93542d582c58018fc655b4841387e98d9ec55ba80
+  metadata.gz: fb5c1ed1e219ec2410ed346a7c9cbee4e75990c706d1d8afba596d0494db4571
+  data.tar.gz: dff7182a190b95f92b18c348aeb0b58212e3d1b3e282c8edd38249a3fcd04af2
 SHA512:
-  metadata.gz: 309414b198731e14731810757ff8d32a084b70652e24d4aaa06268478a59cfd884c22126177dad428022ca07794834acf49f17e804e534f533d5739a25cc7691
-  data.tar.gz: 203243740782fa1aa6f711edf99cd3d1143e024ce0322dec33d9c1ee271865b05b863def2dd16334a72fd6639b07d599d3743bae39cbce8b5e3f42846f2184e9
+  metadata.gz: e2c71ef98ebc8b9354aed85dc11b6530ac6d83192125a94dbf71736947286fcd7584d4b81849e02fea8a7c638dab41c51bc97671eba0ad70c5fe372e40a2aa0d
+  data.tar.gz: c441227f8249ff7bfe47c09b436e4fd628f186847563fbf44d75134ed0b73619248edccd0451c891ec4aa40b4f23dc3adaa615eb097e6118515d34c6c219a395

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: ruby
 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
   name: ripl