sqlconv 1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dad0487cbd81b9dd742216fcbf77cff8cdbe0409599faf1719c52a6eab74429d
-  data.tar.gz: 6472f28fe595994f837c861d2aaa45974fa7327e9473fcf0aaeab1cb424d5713
+  metadata.gz: e823f40e2647848b38ea093b7127f31ea1984ca5f178826d595e72fa7f08c71b
+  data.tar.gz: 6467e992cf18952ec3dc357ef60f93d6ba95d488ea9a1c8edb6d3c6efe576f29
 SHA512:
-  metadata.gz: fa417046fe5c9c5ca098cfade1b042a59d418f7f27e076726d7c6f56a2ac82ae6b66a7a7d2885a6061b6f249636452d673bd352b2ace8085b17dedb3b5ff5d37
-  data.tar.gz: db52a84b235ecda37b54604013922ab68cd53dd702fe62d0888a411714f3ad3db78fa5db18ffef1f0cdd8c0a8583161fd9eee1fb6441e7a0d1905f58fa010420
+  metadata.gz: e725ce923d38cdc32c5a824f07e0734ebfaa06a371c5a4ca0b1ccf671880f89d5e68b413f1f40d4900ce95fcce61a78977ac768779de0c677c1c0f90461d654b
+  data.tar.gz: ee0fb55e02a53abee3f1a8cebfc2be79e5001f460ff7f45f8989cbfb3fcb5e412f03f5a55833823d9cd184afb8b7d7d5c967db4f4269b9ec99e1d54e314633a1

data/bin/sqlconv

@@ -1,15 +1,59 @@
 #!/usr/bin/env ruby
 
+VERSION = "1.2.0"
+
 STDOUT.sync = true
 
-def die(str)
-  warn str
-  exit
+require "censive"
+require "optparse"
+require "strscan"
+
+trap("INT" ) { abort "\n" }
+
+def die!; abort "#{File.basename($0)}: invalid usage, use -h for help"; end
+
+OptionParser.new.instance_eval do
+  @banner  = "usage: #{program_name} <options> <src_table>(:[sel1,sel2,...]) [dst_table][:][col1,col2,...] <dumpfile.sql or ARGF>"
+
+  on       "--csv"                    , "Output comma separated values instead of SQL"
+  on       "--psv"                    , "Output pipe separated values instead of SQL"
+  on       "--tsv"                    , "Output tab separated values instead of SQL"
+  on "-p", "--plugin <plugin1.rb,...>", "Comma separated list of plugins"
+  on "-r", "--replace"                , "Use 'replace into' instead of 'insert into'"
+  on "-s", "--show"                   , "Show column indexes and values for the first row"
+  on "-t", "--table"                  , "Display output as a formatted table"
+
+  on "-h", "--help"                   , "Show help and command usage" do Kernel.abort to_s; end
+  on "-v", "--version"                , "Show version number" do Kernel.abort "#{program_name} #{VERSION}"; end
+
+  self
+end.parse!(into: opts={}) rescue abort($!.message)
+
+csvs = opts[:csv    ] and mode = "csv"
+pipe = opts[:psv    ] and mode = "psv"
+tabs = opts[:tsv    ] and mode = "tsv"
+nice = opts[:table  ] and mode = "table"
+repl = opts[:replace] and mode = "replace"
+show = opts[:show   ] and mode = "show"
+plug = opts[:plugin].to_s.downcase.split(",")
+
+die! if [csvs, pipe, tabs, nice, repl, show].compact.size > 1
+
+if ARGV.shift =~ /^([a-z][-\w]*):?(.+)?$/i
+  tab1 = $1
+  map1 = $2
+end
+
+if !ARGV.empty? and !File.exist?(ARGV.first)
+  if ARGV.shift =~ /^((?>[a-z]?[-\w]*)(?::|$))?(.+)?$/i
+    $1.to_s.size > 0 and tab2 = $1.chomp(":")
+    $2.to_s.size > 0 and map2 = $2.squeeze(",").sub(/^,+/,"").sub(/,+$/,"")
+  end
+  die! if $0.empty?
 end
 
-require 'strscan'
+# ==[ Helpers ]==
 
-# parsing helpers
 class StringScanner
   def scan_for(regx)
     data = scan_until(Regexp === regx ? regx : /#{regx}/)
@@ -64,20 +108,23 @@ end
 def table(cols, rows)
   cols.is_a?(Array) && cols.size > 0 or return
   rows.is_a?(Array) && rows.size > 0 or return
-  join = " | "
+  join = " │ "
   both = [cols] + rows
   flip = both.transpose
   wide = flip.map {|row| row.map {|col| col.to_s.size }.max }
   pict = wide.map {|len| "%-#{len}.#{len}s" }.join(join)
   pict = [join, pict, join].join.strip
-  line = (pict % ([""] * cols.size)).tr("| ", "+-")
+  base = (pict % ([""] * cols.size))[1...-1]
+  ltop = "┌" + base.tr("│ ", "┬─") + "┐"
+  lmid = "├" + base.tr("│ ", "┼─") + "┤"
+  lbot = "└" + base.tr("│ ", "┴─") + "┘"
   seen = -1
-  puts "", line
+  puts "", ltop
   both.each do |vals|
     puts pict % vals
-    puts line if (seen += 1) == 0
+    puts lmid if (seen += 1) == 0
   end
-  puts line, "#{seen} rows displayed", ""
+  puts lbot, "#{seen} rows displayed", ""
 end
 
 def escape(str)
@@ -86,7 +133,7 @@ end
 
 def unescape(str, nulls=false)
   str =~ /\A['"]/ and return str[1..-2].gsub("|","~").gsub("''", "'")
-  str == 'NULL'   and return '' unless nulls
+  str == "NULL"   and return "" unless nulls
   str
 end
 
@@ -115,13 +162,18 @@ def conv(tab1, map1, tab2, map2, mode, dump)
   # find source table
   data.string = dump.read # dump.read(5000) # TODO: Add streaming support
   into = data.scan_for(/insert into (['"`]?)#{tab1}\1 values /io)
-  into or die "unable to find insert statements for the '#{tab1}' table"
+  into or abort "unable to find insert statements for the '#{tab1}' table"
 
   # if needed, output pipes header
-  if mode == "pipes"
-    puts map2.gsub(',','|') if map2
+  case mode
+  when "psv", "tsv"
+    puts map2.gsub(",", mode == "psv" ? "|" : "\t") if map2
     lean = true
-  elsif mode == "table"
+  when "csv"
+    $csv = Censive.writer(out: $stdout)
+    $csv << map2.split(",") if map2
+    lean = true
+  when "table"
     rows = []
     lean = true
   end
@@ -132,7 +184,7 @@ def conv(tab1, map1, tab2, map2, mode, dump)
     # parse insert statements
     if data.scan_str("(") or data.scan_str(into + "(")
       cols = data.scan_while(/('.*?(?<!\\)'|(?>[^',()]+)|,)/, 2)
-      cols.empty? and die "bad sql parse: '#{line}'"
+      cols.empty? and abort "bad sql parse: '#{line}'"
       cols.map! {|item| unescape(item)} if lean
       data.scan(/\)[;,]\s*/)
     else
@@ -143,15 +195,10 @@ def conv(tab1, map1, tab2, map2, mode, dump)
     unless len1
       len1 = cols.size
       if mode == "show"
-        max = 32
-        sep = "+-----+-#{'-' * max}-+"
-        puts sep, "| col | %-*.*s |" % [max, max, 'data'], sep
-        len1.times do |pos|
-          val = cols[pos]
-          val[max-3..-1] = '...' if val.size > max
-          puts "| %3d | %-*.*s | " % [pos + 1, max, max, val]
+        data = cols.map.with_index do |data, i|
+          [i + 1, data.size > 32 ? data[...-3] + "..." : data]
         end
-        puts sep
+        table %w[ col data], data
         exit
       end
       need.each do |item|
@@ -182,7 +229,7 @@ def conv(tab1, map1, tab2, map2, mode, dump)
             val = val[0, item.from]
             ours.push(val)
           else
-            defined?(item.func) == "method" or die "undefined function '#{item.func}'"
+            defined?(item.func) == "method" or abort "undefined function '#{item.func}'"
             ours.push *(send item.func, *Array[cols[item.from-1]])
           end
         when item.text # literal
@@ -207,7 +254,7 @@ def conv(tab1, map1, tab2, map2, mode, dump)
     # perform one-time check on destination column counts
     unless len2
       if map2 and (len2 = map2.split(",").size) != ours.size
-        warn "destination column mismatch (#{len2} defined but #{ours.size} generated)"
+        warn "destination column mismatch (#{ours.size} sourced but #{len2} targeted)"
         cols &&= nil
       else
         len2 = ours.size
@@ -216,64 +263,22 @@ def conv(tab1, map1, tab2, map2, mode, dump)
     end
 
     # generate output
-    if mode == "pipes"
-      puts ours * "|"
-    elsif mode == "table"
-      rows << ours.dup
-    else
-      puts [pref, ours * ",", ");"].join
+    case mode
+    when "psv"   then puts ours * "|"
+    when "tsv"   then puts ours * "\t"
+    when "csv"   then $csv << ours
+    when "table" then rows << ours.dup
+    else puts [pref, ours * ",", ");"].join
     end
   end
 
   # output table
   if mode == "table"
-    cols = map2 ? map2.split(',') : rows[0].size.times.map {|i| "col#{i+1}"}
+    cols = map2 ? map2.split(",") : rows[0].size.times.map {|i| "col#{i+1}"}
     table cols, rows
   end
 end
 
-# ==[ invoke the cli ]==
-
-argv = -1
-ARGV.size.times do
-  if ARGV[argv += 1] == "-x"
-    begin
-      require plugin = ARGV[argv += 1]
-    rescue LoadError
-      die "unable to load the '#{plugin}' plugin"
-    end
-    ARGV.slice!((argv -= 2) + 1, 2)
-  end
-end
-
-# mutually exclusive options
-if    ARGV.delete "-s" then mode = "show"
-elsif ARGV.delete "-r" then mode = "replace"
-elsif ARGV.delete "-p" then mode = "pipes"
-elsif ARGV.delete "-t" then mode = "table"; end
-
-if ARGV.shift =~ /^([a-z][-\w]*):?(.+)?$/
-  tab1 = $1
-  map1 = $2
-end
-
-if ARGV.size > 0 and !File.exists?(ARGV.first)
-  if ARGV.shift =~ /^((?>[a-z]?[-\w]*)(?::|$))?(.+)?$/
-    $1.to_s.size > 0 and tab2 = $1.chomp(":")
-    $2.to_s.size > 0 and map2 = $2.squeeze(',').sub(/^,+/,'').sub(/,+$/,'')
-  end
-  tab1 = nil if $0.size == 0 # no match, show usage
-end
-
-tab1 or die [
-  "Usage: #{File.basename $0} <options> " +
-  "<src_table>(:[sel1,sel2,...]) " +
-  "[dst_table][:][col1,col2,...] file",
-  "       -p (output pipe separated values instead of SQL",
-  "       -r (use 'replace into' instead of 'insert into')",
-  "       -s (show column indexes and values for the first row)",
-  "       -t (display output as a formatted table)",
-  "       -x <plugin1.rb> [-x <plugin2.rb>]...]",
-] * "\n"
+# ==[ Let 'er rip! ]==
 
 conv tab1, map1, tab2 || tab1, map2, mode, ARGF

data/sqlconv.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "sqlconv"
-  s.version     = "1.1"
+  s.version     = `grep '^VERSION' bin/sqlconv | cut -f 2 -d '"'`
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     = "Handy utility to massage MySQL dump files"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlconv
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.2.0
 platform: ruby
 authors:
 - Steve Shreeve
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies: []
 description: Allows mapping columns from a source to a destination table
 email: steve.shreeve@gmail.com
@@ -17,7 +17,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md
@@ -27,7 +26,7 @@ homepage: https://github.com/shreeve/sqlconv
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -42,9 +41,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.4.8
+signing_key:
 specification_version: 4
 summary: Handy utility to massage MySQL dump files
 test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-2.5