csvql 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e68503eec0dd74c109717ab1bedcb0ea3fc1a3f
-  data.tar.gz: 61183771ab2a1c321121b823f87004687afff0d5
+  metadata.gz: 810630ed534c79a2a4fa99ccf6757950352ae6eb
+  data.tar.gz: e11f9a88105893d4aea8eef4b1c47d949fd83ca4
 SHA512:
-  metadata.gz: faa2fa4062e48a66cdc05fa7be6228958b5523012b5c5e733fd8a0cb5a1b41ce943037321558b44cc9364cdc499412c64ed1e5adda591e2b2bafa849f05fc21f
-  data.tar.gz: 810fa43a79cef5114f57b700edd9e8cc84ab62358ab61e3059111b8ee2532a05149a3828d63abc940a35cbfdc0fe7e5ad57374670b017cc02d9387c9e5d0ca5b
+  metadata.gz: 1419f89fb4e2a4d484169348ffa1ff26ae8d6e2f465680c2651ea1f38810d13fa78dce29f63ee3a4e69974f70f1dc6e8e912050e3aa5e3cda07dabb61e69492a
+  data.tar.gz: da76917a1a2e45ebd1b11cce12a02e0da70dfded8c52fcb239a769a6b4e13004652e96b8520a9199d806828566c70a0349eebc922874b4e0435ddfd885d35056

data/lib/csvql/csvql.rb

@@ -13,45 +13,38 @@ module Csvql
       @db_file = if path && path.size > 0
                    path
                  elsif console
-                   @tmp_file = true
-                   Tempfile.new("csvql").path + ".sqlite3"
+                   @tmp_file = Tempfile.new("csvql").path
                  else
                    ":memory:"
                  end
       @db = SQLite3::Database.new(@db_file)
     end
 
-    def create_table(cols, header, table_name="tbl")
+    def create_table(cols, header, table_name="tbl", schema=nil)
       @col_size = cols.size
       @table_name = table_name
-      @col_name = if header
-                    cols
-                  else
-                    @col_size.times.map {|i| "c#{i}" }
-                  end
-      col = @col_name.map {|c| "#{c} NONE" }
-      sql = "CREATE TABLE #{@table_name} (#{col.join(",")})"
-      @db.execute(sql)
-    end
-
-    def single_insert(cols, line)
-      if cols.size != @col_size
-        puts "line #{line}: wrong number of fields in line"
-        return
+      if schema
+        file = File.expand_path(schema)
+        col = if File.exist?(file)
+                File.open(file).read
+              else
+                schema
+              end
+        @col_name = col.split(",").map {|c| c.split.first.strip }
+      else
+        @col_name = if header
+                      cols
+                    else
+                      @col_size.times.map {|i| "c#{i}" }
+                    end
+        col = @col_name.map {|c| "#{c} NONE" }.join(",")
       end
-      col = cols.map {|c| "'#{c}'" }
-      sql = "INSERT INTO #{@table_name} VALUES(#{col.join(",")});"
+      sql = "CREATE TABLE IF NOT EXISTS #{@table_name} (#{col})"
       @db.execute(sql)
     end
 
-    def bulk_insert(bulk)
-      rows = []
-      bulk.each do |cols|
-        col = cols.map {|c| "'#{c}'" }
-        rows << "(#{col.join(',')})"
-      end
-      sql = "INSERT INTO #{@table_name} VALUES#{rows.join(",")};"
-      # puts sql
+    def drop_table(table_name="tbl")
+      sql = "DROP TABLE IF EXISTS #{table_name}"
       @db.execute(sql)
     end
 
@@ -62,7 +55,7 @@ module Csvql
 
     def insert(cols, line)
       if cols.size != @col_size
-        puts "line #{line}: wrong number of fields in line"
+        puts "line #{line}: wrong number of fields in line (skipping)"
         return
       end
       @pre ||= prepare(cols)
@@ -80,7 +73,7 @@ module Csvql
 
     def open_console
       system("sqlite3", @db_file)
-      File.delete(@db_file) if @tmp_file
+      File.delete(@tmp_file) if @tmp_file
     end
   end
 
@@ -97,17 +90,21 @@ module Csvql
       opt.on("--[no-]header",     "Treat file as having the first row as a header row") {|v| option[:header] = v }
       opt.on('--output-dlm="|"',  "Output delimiter (|)")                               {|v| option[:output_dlm] = v }
       opt.on("--save-to=FILE",    "If set, sqlite3 db is left on disk at this path")    {|v| option[:save_to] = v }
+      opt.on("--append",          "Append mode (not dropping any tables)")              {|v| option[:append] = v }
       opt.on("--skip-comment",    "Skip comment lines start with '#'")                  {|v| option[:skip_comment] = v }
       opt.on("--source=FILE",     "Source file to load, or defaults to stdin")          {|v| option[:source] = v }
       opt.on("--sql=SQL",         "SQL Command(s) to run on the data")                  {|v| option[:sql] = v }
       opt.on("--select=COLUMN",   "Select column (*)")                                  {|v| option[:select] = v }
+      opt.on("--schema=FILE or STRING", "Specify a table schema")                       {|v| option[:schema] = v }
       opt.on("--where=COND",      "Where clause")                                       {|v| option[:where] = v }
       opt.on("--table-name=NAME", "Override the default table name (tbl)")              {|v| option[:table_name] = v }
       opt.on("--verbose",         "Enable verbose logging")                             {|v| option[:verbose] = v }
       opt.parse!(argv)
 
       option[:source] ||= argv[0]
+      # option[:where] ||= argv[1]
       option[:table_name] ||= "tbl"
+      option[:output_dlm] ||= "|"
       option
     end
 
@@ -125,7 +122,7 @@ module Csvql
       csvfile = option[:source] ? File.open(option[:source]) : $stdin
 
       tbl = TableHandler.new(option[:save_to], option[:console])
-      bulk = []
+      tbl.drop_table(option[:table_name]) unless option[:append]
       tbl.exec("PRAGMA synchronous=OFF")
       tbl.exec("BEGIN TRANSACTION")
       csvfile.each.with_index(1) do |line,i|
@@ -134,22 +131,24 @@ module Csvql
         next if option[:skip_comment] && line.start_with?("#")
         row = line.parse_csv
         if i == 1
-          tbl.create_table(row, option[:header], option[:table_name])
+          tbl.create_table(row, option[:header], option[:table_name], option[:schema])
           next if option[:header]
         end
-        tbl.insert(row,i)
+        tbl.insert(row, i)
       end
       tbl.exec("COMMIT TRANSACTION")
 
-      if option[:select] || option[:where]
+      if option[:sql]
+        sql = option[:sql]
+      elsif option[:select] || option[:where]
         option[:select] ||= "*"
-        option[:sql] = "select #{option[:select]} from #{option[:table_name]}"
+        sql = "select #{option[:select]} from #{option[:table_name]}"
         if option[:where]
-          option[:sql] += " where #{option[:where]}"
+          sql += " where (#{option[:where]})"
         end
       end
 
-      tbl.exec(option[:sql], option[:output_dlm]||"|") if option[:sql]
+      tbl.exec(sql, option[:output_dlm]) if sql
       tbl.open_console if option[:console]
     end
   end

data/lib/csvql/version.rb

@@ -1,3 +1,3 @@
 module Csvql
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvql
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - YANO Satoru
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: csvql