sqlconv 0.9.2 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f5a4cff886763224e9216e3f42be20d97ecb9dd96a9bcb23be71d2cc5553276
-  data.tar.gz: df12b1041887989c6782ed1e2a64ce4f47f09b31f40130cc1cb8833e1bd8b95f
+  metadata.gz: 953b48afedc6e52ef6430f3d1bc1b66d6d652dfdc33c494b5950a961f157b6ec
+  data.tar.gz: 6d6d791ba8c0611245143d0198a9ef8a2be00f84e2b5faf1d01c16a3426826e3
 SHA512:
-  metadata.gz: 36e69fad7422741a99aeb03b28541eec399875c45993d1c7b86ca6bdccf27ad9d04d5aa751cde238c0e8f9fb303e1fbd009e8d82c0915116f568f25eff0ea290
-  data.tar.gz: 4c49fa603ecb629a4fc6c3c0bcb366ca9ac45bbb87d515ed866550e03dc9e4cf79d3d52cc82f115c2ec664e30db5d742e5a848bd2966818dd98453b88babb56c
+  metadata.gz: 9a9cfa9b993be6d3ffbeadd9deef4e6c5af05933a1d680e0e4975a335530d11029066f7b26cd76d7e2466bc809d16a15f98164fc60664ec86dab67f423d0184f
+  data.tar.gz: 2cbe842f8898108c0b627151f6ae5014df61b5d6ea5f3d31300f11067563739bd96520cfec746d670e4951a7d0e7ee38ba55c7aed99a110e1deec4048d8d02c7

data/bin/sqlconv

@@ -61,10 +61,31 @@ def grok(want)
   end or raise "invalid selector '#{want}'"
 end
 
+# display table output
+def table(cols, rows)
+  cols.is_a?(Array) && cols.size > 0 or return
+  rows.is_a?(Array) && rows.size > 0 or return
+  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("| ", "+-")
+  seen = -1
+  puts "", line
+  both.each do |vals|
+    puts pict % vals
+    puts line if (seen += 1) == 0
+  end
+  puts line, "#{seen} rows displayed", ""
+end
+
 # convert the insert statements
 def conv(tab1, map1, tab2, map2, mode, dump)
   data = StringScanner.new("")
   need = grok(map1)
+  rows = nil
   cols = nil
   len1 = nil
   len2 = nil
@@ -86,6 +107,8 @@ def conv(tab1, map1, tab2, map2, mode, dump)
   # if needed, output pipes header
   if mode == "pipes" && map2
     puts map2.gsub(',','|')
+  elsif mode == "table"
+    rows = []
   end
 
   # process each line
@@ -109,7 +132,7 @@ def conv(tab1, map1, tab2, map2, mode, dump)
         puts sep, "| col | %-*.*s |" % [max, max, 'data'], sep
         len1.times do |pos|
           val = cols[pos]
-          val[max-3..] = '...' if val.size > max
+          val[max-3..-1] = '...' if val.size > max
           puts "| %3d | %-*.*s | " % [pos + 1, max, max, val]
         end
         puts sep
@@ -171,21 +194,31 @@ def conv(tab1, map1, tab2, map2, mode, dump)
       cols or exit
     end
 
-    # output insert statement
-    if mode == "pipes"
+    # generate output
+    if mode == "pipes" || mode == "table"
       ours.map! {|e| e == 'NULL' ? '' : e !~ /\A['"]/ ? e : e[1..-2].gsub("|","~").gsub("''", "'")}
+    end
+    if mode == "pipes"
       puts ours * "|"
+    elsif mode == "table"
+      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}"}
+    table cols, rows
+  end
 end
 
 # ==[ invoke the cli ]==
 
 argv = -1
 ARGV.size.times do
-  if ARGV[argv += 1] == "-p"
+  if ARGV[argv += 1] == "-x"
     begin
       require plugin = ARGV[argv += 1]
     rescue LoadError
@@ -195,15 +228,11 @@ ARGV.size.times do
   end
 end
 
-if ARGV.delete "-r"
-  mode = "replace"
-elsif ARGV.delete "--pipes"
-  mode = "pipes"
-end
-
-if ARGV.delete "-s"
-  mode = "show"
-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
@@ -219,30 +248,14 @@ if ARGV.size > 0 and !File.exists?(ARGV.first)
 end
 
 tab1 or die [
-  "Usage: #{File.basename $0}",
-  "[-p <plugin1.rb> [-p <plugin2.rb>]...]",
-  "[--pipes] (to output pipe separated values instead of SQL",
-  "[-r] (to use 'replace into' instead of 'insert into')",
-  "[-s] (to show column indexes and values for the first row)",
-  "<src_table>(:[sel1,sel2,...])",
-  "[dst_table][:][col1,col2,...] file"
-] * ' '
+  "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"
 
 conv tab1, map1, tab2 || tab1, map2, mode, ARGF
-
-__END__
-
-# show opt parsing
-p [:tab1, tab1]
-p [:map1, map1]
-p [:tab2, tab2]
-p [:map2, map2]
-p [:argv, ARGV]
-exit
-
-# values for testing
-tab1 = 'adonis_schema'
-map1 = nil
-tab2 = nil
-map2 = nil
-ARGV.push 'db1.sql'

data/sqlconv.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "sqlconv"
-  s.version     = "0.9.2"
+  s.version     = "1.0"
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     = "Handy utility to massage MySQL dump files"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlconv
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: '1.0'
 platform: ruby
 authors:
 - Steve Shreeve