csvsql 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce133a74ba9ec0a5b04f8707ac7726050479c36
-  data.tar.gz: ae991420839c6c9d384c540e0682643abb48cef7
+  metadata.gz: 5aeb3aec3aede0115a427c13a63f1b19aba0b81b
+  data.tar.gz: 106281657817a283a65ed681234c7a4760dff1a3
 SHA512:
-  metadata.gz: 69c18609d496c4879f6d27baf5b27e93f765d3875ed3302cbd87782d6f88d48dc45ba84e7156d379055bdf372e72644c9d535848875774dec531579ac5fb40e8
-  data.tar.gz: 55a2436a8e436d4e674f0dc0879131c9de5be513723ddd93cf22df3f379631f2a8208acdd85d5091c6358fde0352ee3941003a514491653912b256549020a4f8
+  metadata.gz: d9065c162a7e4c0468cbd42bd37d669af905f365ce04c4ededbb5ac4e2df8fa606899a94a4c1dc01aa630bcd0b7204e426c693cca6afb19f41e1ee6cefe5f7e7
+  data.tar.gz: fbde2ef9b1f8b43247701b9c48c20ee0fbab9705ccd599c10cdb7d20589a2f907e3b49c42eabe000f6f5afbb221e331dac7fc266fe047c59f360ed5de16af784

data/exe/csvsql

@@ -26,6 +26,10 @@ OptionParser.new do |opts|
     options[:batch_rows] = n.to_i
   end
 
+  opts.on('-e', '--encoding encoding', "Set the file encoding, default is UTF-8") do |encoding|
+    options[:encoding] = encoding
+  end
+
   opts.on('--clear-cache', "Clear all cache data") do
     options[:clear_cache] = true
   end
@@ -49,6 +53,9 @@ 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], sql_error_action: 'exit'
+  use_cache: options[:use_cache],
+  batch_rows: options[:batch_rows],
+  sql_error_action: 'exit',
+  encoding: options[:encoding]
 )
 

data/lib/csvsql/db.rb

@@ -42,7 +42,7 @@ class Csvsql::Db
     process_sql_error(sql, e)
   end
 
-  def import(csv_data_or_path)
+  def import(csv_data_or_path, encoding: 'utf-8')
     case csv_data_or_path
     when StringIO, IO
       @csv_io = csv_data_or_path
@@ -53,7 +53,7 @@ class Csvsql::Db
 
     tables = db.execute("SELECT name FROM sqlite_master WHERE type='table';").flatten
     unless tables.include?('csv')
-      init_db_by_csv(@csv_io ? CSV.new(@csv_io) : CSV.open(@csv_path))
+      init_db_by_csv(@csv_io ? CSV.new(@csv_io) : CSV.open(@csv_path, "r:#{encoding}"))
     end
     true
   end

data/lib/csvsql/version.rb

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

data/lib/csvsql.rb

@@ -10,8 +10,9 @@ require 'csvsql/tracker'
 
 module Csvsql
   def self.execute(sql, csv_data, opts = {})
+    encoding = opts.delete(:encoding)
     csvdb = Csvsql::Db.new(opts)
-    csvdb.import(csv_data)
+    csvdb.import(csv_data, encoding: encoding)
     pst = Csvsql::Tracker.commit(:execute_query_sql) do
       csvdb.prepare(sql)
     end
@@ -22,4 +23,3 @@ module Csvsql
     end.tap { Csvsql::Tracker.commit(:output_format) }
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvsql
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - jiangzhi.xie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3