sqlconv 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 953b48afedc6e52ef6430f3d1bc1b66d6d652dfdc33c494b5950a961f157b6ec
-  data.tar.gz: 6d6d791ba8c0611245143d0198a9ef8a2be00f84e2b5faf1d01c16a3426826e3
+  metadata.gz: dad0487cbd81b9dd742216fcbf77cff8cdbe0409599faf1719c52a6eab74429d
+  data.tar.gz: 6472f28fe595994f837c861d2aaa45974fa7327e9473fcf0aaeab1cb424d5713
 SHA512:
-  metadata.gz: 9a9cfa9b993be6d3ffbeadd9deef4e6c5af05933a1d680e0e4975a335530d11029066f7b26cd76d7e2466bc809d16a15f98164fc60664ec86dab67f423d0184f
-  data.tar.gz: 2cbe842f8898108c0b627151f6ae5014df61b5d6ea5f3d31300f11067563739bd96520cfec746d670e4951a7d0e7ee38ba55c7aed99a110e1deec4048d8d02c7
+  metadata.gz: fa417046fe5c9c5ca098cfade1b042a59d418f7f27e076726d7c6f56a2ac82ae6b66a7a7d2885a6061b6f249636452d673bd352b2ace8085b17dedb3b5ff5d37
+  data.tar.gz: db52a84b235ecda37b54604013922ab68cd53dd702fe62d0888a411714f3ad3db78fa5db18ffef1f0cdd8c0a8583161fd9eee1fb6441e7a0d1905f58fa010420

data/bin/sqlconv

@@ -46,16 +46,15 @@ Selector = Struct.new(:want, :func, :text, :zero, :thru, :reps, :from, :till)
 # convert user request into selectors
 def grok(want)
   (want || "1-").strip.split(/\s*,\s*/).map do |item|
-    item =~ %r!^
-      (?:(\d+)\*)?(?:              # $1: repeat
-        (?:([a-zA-Z]\w*)(\()?)?(?: # $2: function, $3: optional paren
-        (?:(['"])(.*?)\4)? |       # $4: quote, $5: literal
-        (0) |                      # $6: zero
-        ((?>[1-9]\d*))?            # $7: from
-          ((?<=\d)-|-(?=\d))?      # $8: thru
-          ((?>[1-9]\d*))?          # $9: till
-        )\)?
-      )$
+    item =~ %r!^(?:(\d+)\*)?(?:(?:( # $1: repeat
+      (?:\d+(?=\())|[a-zA-Z]\w*)    # $2: function name
+      (\()?)?(?:                    # $3: optional paren
+      (?:(['"])(.*?)\4)? |          # $4: quote, $5: literal
+      (0) |                         # $6: zero
+      ((?>[1-9]\d*))?               # $7: from
+        ((?<=\d)-|-(?=\d))?         # $8: thru
+        ((?>[1-9]\d*))?             # $9: till
+      )\)?)$
     !iox or raise "invalid selector item '#{item}'"
     Selector.new(*$~.values_at(0, 2, 5, 6, 8), *$~.values_at(1, 7, 9).map {|e| e&.to_i })
   end or raise "invalid selector '#{want}'"
@@ -81,6 +80,20 @@ def table(cols, rows)
   puts line, "#{seen} rows displayed", ""
 end
 
+def escape(str)
+  str =~ /\A(\d+|null)\z/i ? $1 : %|'#{str.gsub("'", "\\\\'")}'|
+end
+
+def unescape(str, nulls=false)
+  str =~ /\A['"]/ and return str[1..-2].gsub("|","~").gsub("''", "'")
+  str == 'NULL'   and return '' unless nulls
+  str
+end
+
+def unescape!(str)
+  unescape(str, true)
+end
+
 # convert the insert statements
 def conv(tab1, map1, tab2, map2, mode, dump)
   data = StringScanner.new("")
@@ -105,10 +118,12 @@ def conv(tab1, map1, tab2, map2, mode, dump)
   into or die "unable to find insert statements for the '#{tab1}' table"
 
   # if needed, output pipes header
-  if mode == "pipes" && map2
-    puts map2.gsub(',','|')
+  if mode == "pipes"
+    puts map2.gsub(',','|') if map2
+    lean = true
   elsif mode == "table"
     rows = []
+    lean = true
   end
 
   # process each line
@@ -118,6 +133,7 @@ def conv(tab1, map1, tab2, map2, mode, dump)
     if data.scan_str("(") or data.scan_str(into + "(")
       cols = data.scan_while(/('.*?(?<!\\)'|(?>[^',()]+)|,)/, 2)
       cols.empty? and die "bad sql parse: '#{line}'"
+      cols.map! {|item| unescape(item)} if lean
       data.scan(/\)[;,]\s*/)
     else
       break
@@ -139,7 +155,7 @@ def conv(tab1, map1, tab2, map2, mode, dump)
         exit
       end
       need.each do |item|
-        item.text &&= ["'", item.text.gsub("'", "\\\\'"), "'"].join
+        item.text &&= escape(item.text) unless lean
         if (len2 = [item.from, item.till, 0].compact.max) > len1
           warn "selector '#{item.want}' referenced source column #{len2}, but only #{len1} are defined"
           cols &&= nil
@@ -159,7 +175,12 @@ def conv(tab1, map1, tab2, map2, mode, dump)
           case item.func
           when "rand"     then ours.push("'random number here!'")
           when "n","null" then ours.push("null")
-          when "z"        then ours.push((val = cols[item.from-1]) == "NULL" ? 0 : val)
+          when "z"        then ours.push((val = cols[item.from     -1]) == "NULL" ? 0  : val)
+          when /^(\d+)$/
+            val = cols[item.func.to_i - 1]
+            val = unescape(val) unless lean
+            val = val[0, item.from]
+            ours.push(val)
           else
             defined?(item.func) == "method" or die "undefined function '#{item.func}'"
             ours.push *(send item.func, *Array[cols[item.from-1]])
@@ -195,9 +216,6 @@ def conv(tab1, map1, tab2, map2, mode, dump)
     end
 
     # 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"

data/sqlconv.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "sqlconv"
-  s.version     = "1.0"
+  s.version     = "1.1"
   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.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-28 00:00:00.000000000 Z
+date: 2019-09-29 00:00:00.000000000 Z
 dependencies: []
 description: Allows mapping columns from a source to a destination table
 email: steve.shreeve@gmail.com