csvsql 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 399abac44119bfde664bcf81ac25f8c2b61271d8abefbdb616488ca21fbdc343
-  data.tar.gz: b7ffecdfe6a9fc94014bd23ebe1ce10928501d934bce6045eb0ccdaaf70ba6b3
+SHA1:
+  metadata.gz: dce133a74ba9ec0a5b04f8707ac7726050479c36
+  data.tar.gz: ae991420839c6c9d384c540e0682643abb48cef7
 SHA512:
-  metadata.gz: 1455183640dda81a26234dfd2a072e4ef4e076776e62ad28727601d688493c49e42d264e3918226d1a661a4365f9f408f30a9fd30cc3e0beca2e1cd4f332df0e
-  data.tar.gz: 90ef8555cbfd7022f2acd8057a284c76f0ce697f125549aff58116ea028c1432e1f5a3ab8c518972d80bd3547cdfda8881c1846b9074dbf1af97699ca6ffafb7
+  metadata.gz: 69c18609d496c4879f6d27baf5b27e93f765d3875ed3302cbd87782d6f88d48dc45ba84e7156d379055bdf372e72644c9d535848875774dec531579ac5fb40e8
+  data.tar.gz: 55a2436a8e436d4e674f0dc0879131c9de5be513723ddd93cf22df3f379631f2a8208acdd85d5091c6358fde0352ee3941003a514491653912b256549020a4f8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    csvsql (0.1.1)
+    csvsql (0.1.3)
       sqlite3 (~> 1.3.13)
 
 GEM

data/exe/csvsql

@@ -47,4 +47,8 @@ end
 
 csv_data = options[:csv_path] || StringIO.new($stdin.read)
 
-puts Csvsql.execute(ARGV[0], csv_data, use_cache: options[:use_cache], batch_rows: options[:batch_rows])
+puts Csvsql.execute(
+  ARGV[0], csv_data,
+  use_cache: options[:use_cache], batch_rows: options[:batch_rows], sql_error_action: 'exit'
+)
+

data/lib/csvsql/db.rb

@@ -14,12 +14,13 @@ class Csvsql::Db
     FileUtils.rm_f(Dir.glob(File.join(CACHE_DIR, '*')))
   end
 
-  def initialize(use_cache: false, batch_rows: nil)
+  def initialize(use_cache: false, batch_rows: nil, sql_error_action: nil)
     @db = nil
     @csv_io = nil
     @csv_path = nil
     @use_cache = use_cache
     @batch_rows = batch_rows || BATCH_ROWS
+    @sql_error_action = (sql_error_action || :raise).to_sym
   end
 
   # action:
@@ -77,7 +78,7 @@ class Csvsql::Db
     col_names = header.map(&:first)
     Csvsql::Tracker.commit(:import_csv)
     csv.each do |line|
-      cache << line.each_with_index.map { |v, i| format_sql_val(v, header[i][1]) }
+      cache << header.each_with_index.map { |h, i| format_sql_val(line[i], h[1]) }
 
       if cache.length >= batch_rows then
         import_lines(cache, col_names)
@@ -98,6 +99,8 @@ class Csvsql::Db
   end
 
   def format_sql_val(val, type)
+    return 'null' if val.nil? || val.to_s.strip.empty?
+
     case type
     when :int, :integer then val.to_i
     when :float, :double then val.to_f
@@ -107,14 +110,14 @@ class Csvsql::Db
       "'#{val.gsub("'", "''")}'"
     end
   rescue => e
-    process_sql_error("Parse val: #{val}", e)
+    process_sql_error("Parse #{type} val: #{val}", e)
   end
 
   def process_sql_error(sql, err)
     $stderr.puts(sql)
 
-    if @error_action == :exit
-      $stderr.puts(e.message)
+    if @sql_error_action == :exit
+      $stderr.puts(err.message)
       exit
     else
       raise err

data/lib/csvsql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Csvsql
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csvsql
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - jiangzhi.xie
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Process csv with SQL.