slyce 1.3.5 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1611ad48c69cfc3485861a330287d6afb01e7822d060175cc8d312d92327b49b
-  data.tar.gz: fba5942e20444188dc70d721bae61d4d7ef6d7de933735f5f2b7a8c7d25335b8
+  metadata.gz: 6e6b0abe59bae61e2f6883c497a4aea1496cfb34bc6aaa3e98de9736c8571562
+  data.tar.gz: 52e62601f71421927d88fddfa1aaab680c292a0bd6ff62c419d52dbd7db5fd2e
 SHA512:
-  metadata.gz: 881a62062b6cc066dc0cb4e06a9d399e18c760db70517564d6c72e32424ac610823819b5d4201d29ea3275b8414981e43e3b205107a470198049b0a2f7b5d8ff
-  data.tar.gz: 363c50d513e9ee5ee829300550aad0d6f3fb98b5fafa0bcaa9733900028a714392e1052db8aa2af004ae3ca8bbc32925288c063374ab14683967002decae18e2
+  metadata.gz: 15d3b6b2c9924c7d12e5b5665d699c717253b4cd85fcbb717694d86bf16d824b6a7de2f16d5990d06a3bc1e4b6fffde75019d13eacc3ab612a0eeb74a2fbf6aa
+  data.tar.gz: cb60a335ea7143ac375eb9e9c61a3477b88976127e9af90c6f544e9dbbaecc3efdd609dfd8b22be084a049829110af6b8c2b4a9173b0495a275f5bbe5e8ab7e8

data/README.md

@@ -2,6 +2,10 @@
 
 Ruby utility to show summary statistics or export data from MySQL, SQLite, or DuckDB.
 
+## TODO
+
+* Unify each each executable to have as close to the same features as possible
+
 ## Usage
 
 ```

data/bin/slyce

@@ -7,11 +7,36 @@ require "optparse"
 
 trap("INT" ) { abort "\n" }
 
-dbas = nil
-tabl = nil
+# ==[ Helpers ]==
+
+class Mysql2::Client
+  alias_method :sql, :query
+
+  def sql!(stmt, *args, **opts, &block)
+    puts "\n==[ SQL statement ]==\n\n", stmt.strip, ";"
+    sql(stmt, *args, **opts, &block)
+  end
+end
+
+def display(name, data, show, uniq, tots)
+  seen = data.inject(0) {|seen, coun| seen += coun[0] }
+  rows = [data.size, seen].min
+  wide = tots.to_s.size
+  fill = " " * wide
+  line = "=" * name.size
+
+  puts "\n#{fill} #{name}\n#{fill} #{line}\n"
+  data.each {|cnt, val| puts "%*d %s" % [wide, cnt, val || "NULL"] }
+  puts "#{fill} -----\n"
+  puts "%*d shown (top %d)" % [wide, seen, rows] if     show && rows > 1
+  puts "%*d total (all %d)" % [wide, tots, uniq] if     uniq > 1
+  puts "%*d total"          % [wide, tots      ] unless uniq > 1
+end
+
+# ==[ Options ]==
 
 OptionParser.new.instance_eval do
-  @version = "1.3.5"
+  @version = "1.5.1"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"
@@ -21,9 +46,9 @@ OptionParser.new.instance_eval do
   on "-c", "--columns"                , "Display column names and quit"
   on "-d", "--dump"                   , "Dump database schema and quit"
   on "-h", "--help"                   , "Show help and command usage" do Kernel.abort to_s; end
+  on "-H", "--headerless"             , "Do not show headers when exporting delimited files"
   on "-n", "--natural"                , "Sort naturally, not numerically"
-  on "-r", "--rows <count>"           , "Rows of data to show", Integer
-  on "-s", "--suppress"               , "Suppress header when exporting delimited files"
+  on "-s", "--show <count>"           , "Show this many values", Integer
   on "-t", "--tables"                 , "Display table names and quit"
   on "-v", "--version"                , "Show version number" do Kernel.abort "#{program_name} #{@version}"; end
   on "-w", "--where <cond>"           , "Where clause (eg - 'age>50 and state='AZ')"
@@ -32,50 +57,27 @@ OptionParser.new.instance_eval do
   self
 end.parse!(into: opts={}) rescue abort($!.message)
 
+dbas = nil
+tabl = nil
+
 xcsv = opts[:csv]
 xpsv = opts[:psv]
 xtsv = opts[:tsv]
 xprt = xcsv || xpsv || xtsv and require "censive"
 
-asky = opts[:ascii   ] and require "any_ascii"
-dump = opts[:dump]
-want = opts[:extract ].to_s.downcase.split(",")
-natu = opts[:natural ]
-show = opts[:rows    ]
-hide = opts[:suppress]
-filt = opts[:where   ] and filt = "\nwhere\n  #{filt}"
+asky = opts[:ascii     ] and require "any_ascii"
+dump = opts[:dump      ]
+want = opts[:extract   ].to_s.downcase.split(",")
+natu = opts[:natural   ]
+show = opts[:show      ]
+hide = opts[:headerless]
+filt = opts[:where     ] and filt = "\nwhere\n  #{filt}"
 
 dbas ||= ARGV.shift or abort "no database given"
 tabl ||= ARGV.shift or opts[:tables] or !want.empty? or abort "no table given"
 
 [xcsv, xpsv, xtsv].compact.size > 1 and abort "only one of csv, psv, or tsv allowed"
 
-# ==[ Helpers ]==
-
-class Mysql2::Client
-  alias_method :sql, :query
-
-  def sql!(stmt, *args, **opts, &block)
-    puts "\n==[ SQL statement ]==\n\n", stmt.strip, ";"
-    sql(stmt, *args, **opts, &block)
-  end
-end
-
-def display(name, data, show, uniq, tots)
-  seen = data.inject(0) {|seen, coun| seen += coun[0] }
-  rows = [data.size, seen].min
-  wide = tots.to_s.size
-  fill = " " * wide
-  line = "=" * name.size
-
-  puts "\n#{fill} #{name}\n#{fill} #{line}\n"
-  data.each {|cnt, val| puts "%*d %s" % [wide, cnt, val || "NULL"] }
-  puts "#{fill} -----\n"
-  puts "%*d shown (top %d)" % [wide, seen, rows] if     show && rows > 1
-  puts "%*d total (all %d)" % [wide, tots, uniq] if     uniq > 1
-  puts "%*d total"          % [wide, tots      ] unless uniq > 1
-end
-
 # ==[ Let 'er rip! ]==
 
 # get database connection
@@ -84,14 +86,13 @@ if !dbas.include?("/")
 else
   dbas = $' if dbas =~ %r|^mysql://| # drop mysql:// prefix, if present
   auth, dbas = dbas.split("/", 2)
-  if auth =~ /^(?:(\w+)(?::([^@]+))?@)?(?:([^:]+)?(?::(\d+))?)$/
-    user, pass, host, port = $1, $2, $3, $4 # user:pass@host:port
+  if auth =~ /^(?:(\w+)(?::([^@]+))?@?)?(?:([^:]+)?(?::(\d+))?)$/
     conf = {
       database: dbas,
       username: $1,
       password: $2,
-      host:     $3,
-      port:     $4,
+      host:     $3 || "127.0.0.1",
+      port:     $4 || "3306",
     }.compact
   else
     abort "invalid database value #{dbas.inspect}"
@@ -100,6 +101,7 @@ end
 
 # connect to database and get server version
 conn = Mysql2::Client.new(**conf, as: :array)
+conn.sql("set session sql_mode='ansi'") # ANSI double-quotes
 ver5 = conn.server_info[:version] =~ /^5/
 
 # dump database schema or show table names
@@ -113,11 +115,11 @@ if tabl.nil? || opts[:tables] || opts[:dump]
   # dump database schema
   if opts[:dump]
     pict = "%Y-%m-%dT%H:%M:%S%z"
-    puts "-- Dump of `#{dbas}` database on #{Time.now.strftime(pict)}\n\n"
+    puts "-- Dump of \"#{dbas}\" database on #{Time.now.strftime(pict)}\n\n"
     puts "set foreign_key_checks=0;\n\n" unless want.empty?
     tail = []
     want.each do |name|
-      text = conn.sql("show create table `#{name}`").to_a.flatten[1] + ";\n\n"
+      text = conn.sql("show create table \"#{name}\"").to_a.flatten[1] + ";\n\n"
       if text =~ /^create table/i
         puts text
       elsif text.gsub!(/^(create ).*?(?=view)/i, '\1')
@@ -135,7 +137,7 @@ if tabl.nil? || opts[:tables] || opts[:dump]
 end
 
 # get column names
-resu = conn.sql("select * from `#{tabl}` limit 0")
+resu = conn.sql("select * from \"#{tabl}\" limit 0")
 cols = resu.fields
 want = want.empty? ? cols : want.select {|e| cols.include?(e) }
 
@@ -150,20 +152,23 @@ end
 
 # handle exports
 if xprt
-  list = want.map {|item| "`#{item}`" }.join(", ")
-  stmt = show ? "limit #{show}" : ""
-  data = conn.sql(<<~"" + stmt).to_a
+  list = want.map {|item| %{"#{item}"} }.join(", ")
+  limt = show ? "limit #{show}" : ""
+  data = conn.sql(<<~"".rstrip).to_a
     select
       #{list}
     from
-      `#{tabl}`#{filt}
+      "#{tabl}"
+    #{filt}
+    #{limt}
 
   seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
 
   Censive.write(sep: seps) do |csv|
     csv << want unless hide
     data.each do |row|
-      csv << row.map {|e| asky ? AnyAscii.transliterate(e.to_s) : e.to_s }
+    # csv << row.map {|e| asky ? AnyAscii.transliterate(e.to_s) : e.to_s }
+      csv << row.map {|e| asky ? AnyAscii.transliterate(e.to_s) : e.nil? ? nil : e.to_s }
     end
   end
 
@@ -172,34 +177,36 @@ end
 
 want.each do |name|
   sort = natu ? "" : "cnt desc,"
+  limt = show ? "limit #{show}" : ""
   like =(ver5 ? <<~"" : <<~"").gsub(/(.)^/m, '\1  ').rstrip
-    -if((`#{name}` rlike '^[-+]?((0|([1-9][0-9]*)(\\\\.[0-9]*)?)|((0|([1-9][0-9]*))\\\\.[0-9]+))$'), `#{name}` + 0, null) desc,
-    -if((`#{name}` rlike '^0[0-9]+$'), length(`#{name}`), null) desc,
-    -if((`#{name}` rlike '^[0-9]'), length(concat("1", `#{name}`) + 0), null) desc,
+    -if(("#{name}" rlike '^[-+]?((0|([1-9][0-9]*)(\\\\.[0-9]*)?)|((0|([1-9][0-9]*))\\\\.[0-9]+))$'), "#{name}" + 0, null) desc,
+    -if(("#{name}" rlike '^0[0-9]+$'), length("#{name}"), null) desc,
+    -if(("#{name}" rlike '^[0-9]'), length(concat('1', "#{name}") + 0), null) desc,
 
-    -if(regexp_like(`#{name}`, '^[-+]?((0|([1-9]\\\\d*)(\\\\.\\\\d*)?)|((0|([1-9]\\\\d*))\\\\.\\\\d+))$'), `#{name}` + 0, null) desc,
-    -if(regexp_like(`#{name}`, '^0\\\\d+$'), length(`#{name}`), null) desc,
-    -if(regexp_like(`#{name}`, '^\\\\d'), regexp_instr(`#{name}`, '[^\\\\d]'), null) desc,
+    -if(regexp_like("#{name}", '^[-+]?((0|([1-9]\\\\d*)(\\\\.\\\\d*)?)|((0|([1-9]\\\\d*))\\\\.\\\\d+))$'), "#{name}" + 0, null) desc,
+    -if(regexp_like("#{name}", '^0\\\\d+$'), length("#{name}"), null) desc,
+    -if(regexp_like("#{name}", '^\\\\d'), regexp_instr("#{name}", '[^\\\\d]'), null) desc,
 
   data = conn.sql(<<~"".rstrip).to_a
     select
       count(*) as cnt,
-      `#{name}` as val
+      "#{name}" as val
     from
-      `#{tabl}`#{filt}
+      "#{tabl}"#{filt}
     group by
       val
     order by #{sort}
       #{like}
-      `#{name}` is null, `#{name}`
-    #{show ? "limit #{show}" : ""}
+      "#{name}" is null, "#{name}"
+    #{limt}
 
   uniq, tots = conn.sql(<<~"".rstrip).to_a[0]
     select
-      count(distinct(ifnull(`#{name}`,0))),
-      count(ifnull(`#{name}`,0))
+      count(distinct(ifnull("#{name}",0))),
+      count(ifnull("#{name}",0))
     from
-      `#{tabl}`#{filt}
+      "#{tabl}"
+    #{filt}
 
   display(name, data, show, uniq, tots)
 end

data/bin/slyce3

@@ -6,7 +6,7 @@
 #
 # For example, on Apple Silicon with macOS with an M1 you can use:
 #
-#   wget https://github.com/nalgeon/sqlean/releases/download/0.19.3/sqlean-macos-arm64.zip
+#   wget https://github.com/nalgeon/sqlean/releases/download/0.21.8/sqlean-macos-arm64.zip
 #   unzip sqlean-macos-arm64.zip regexp.dylib
 
 STDOUT.sync = true
@@ -16,43 +16,14 @@ require "optparse"
 
 trap("INT" ) { abort "\n" }
 
-dbas = nil
-tabl = nil
-
-OptionParser.new.instance_eval do
-  @banner  = "usage: #{program_name} [options] <database> <table>"
-
-  on "-c", "--columns"                , "Display column names and quit"
-  on "-h", "--help"                   , "Show help and command usage" do Kernel.abort to_s; end
-  on "-n", "--natural"                , "Sort naturally, not numerically"
-  on "-r", "--regexp <path>"          , "Path to the sqlean/regexp extension"
-  on "-s", "--show <count>"           , "Show this many values", Integer
-  on "-v", "--version"                , "Show version number" do Kernel.abort "#{program_name} #{VERSION}"; end
-  on "-w", "--where <cond>"           , "Where clause (eg - 'age>50 and state='AZ')"
-  on "-x", "--extract <col1,col2,...>", "Comma separated list of columns to extract"
-
-  self
-end.parse!(into: opts={}) rescue abort($!.message)
-
-filt = opts[:where] and filt = "where\n  #{filt}"
-natu = opts[:natural]
-regx = opts[:regexp] || Dir["{.,sqlean}/regexp.{dll,dylib,so}"].first
-show = opts[:show]
-want = opts[:extract].to_s.downcase.split(",")
-
-dbas ||= ARGV.shift or abort "no database given"
-tabl ||= ARGV.shift or abort "no table given"
-
-regx &&  File.exist?(regx) or abort "no regexp extension found#{regx ? " at '#{regx}'" : ''}"
-
 # ==[ Helpers ]==
 
 class Extralite::Database
   alias_method :sql, :query_ary
 
-  def sql!(stmt, *args, **, &)
+  def sql!(stmt, *args, **opts, &block)
     puts "\n==[ SQL statement ]==\n\n", stmt.strip, ";"
-    sql(stmt, *args, **, &)
+    sql(stmt, *args, **opts, &block)
   end
 end
 
@@ -61,22 +32,88 @@ def display(name, data, show, uniq, tots)
   rows = [data.size, seen].min
   wide = tots.to_s.size
   fill = " " * wide
+  over = "\n#{fill} "
   line = "=" * name.size
 
   puts "\n#{fill} #{name}\n#{fill} #{line}\n"
-  data.each {|cnt, val| puts "%*d %s" % [wide, cnt, val || "NULL"] }
+# data.each {|cnt, val| puts "%*d %s" % [wide, cnt, val || "NULL"] }
+  data.each do |cnt, val| # TODO: only enable this with an option? (it's rarely useful)
+    puts "%*d %s" % [wide, cnt, val&.gsub("\n", over) || "NULL"]
+  end
   puts "#{fill} -----\n"
-  puts "%*d shown (top %d)" % [wide, seen, rows] if show and rows > 1
+  puts "%*d shown (top %d)" % [wide, seen, rows] if     show && rows > 1
   puts "%*d total (all %d)" % [wide, tots, uniq] if     uniq > 1
   puts "%*d total"          % [wide, tots      ] unless uniq > 1
 end
 
+# ==[ Options ]==
+
+OptionParser.new.instance_eval do
+  @version = "1.5.1"
+  @banner  = "usage: #{program_name} [options] <database> <table>"
+
+  on       "--csv"                    , "Output comma separated values"
+  on       "--psv"                    , "Output pipe separated values"
+  on       "--tsv"                    , "Output tab separated values"
+  on "-a", "--ascii"                  , "Convert data to ASCII using AnyAscii"
+  on "-c", "--columns"                , "Display column names and quit"
+  on "-d", "--delete"                 , "Delete the .slyce database first"
+  on "-h", "--help"                   , "Show help and command usage" do Kernel.abort to_s; end
+  on "-H", "--headerless"             , "Do not show headers when exporting delimited files"
+  on "-n", "--natural"                , "Sort naturally, not numerically"
+  on "-r", "--regexp <path>"          , "Path to the sqlean/regexp extension"
+  on "-s", "--show <count>"           , "Show this many values", Integer
+  on "-v", "--version"                , "Show version number" do Kernel.abort "#{program_name} #{@version}"; end
+  on "-w", "--where <cond>"           , "Where clause (eg - 'age>50 and state='AZ')"
+  on "-x", "--extract <a,b,c...>"     , "Comma separated list of columns to extract"
+
+  self
+end.parse!(into: opts={}) rescue abort($!.message)
+
+dbas = nil
+tabl = nil
+
+xcsv = opts[:csv]
+xpsv = opts[:psv]
+xtsv = opts[:tsv]
+xprt = xcsv || xpsv || xtsv and require "censive"
+
+asky = opts[:ascii     ] and require "any_ascii"
+nuke = opts[:delete    ]
+want = opts[:extract   ].to_s.downcase.split(",")
+keep = opts[:keep      ]
+natu = opts[:natural   ]
+regx = opts[:regexp    ] || Dir["{.,sqlean,#{ENV['HOME']}}/regexp.{dll,dylib,so}"].first
+show = opts[:show      ]
+hide = opts[:headerless]
+filt = opts[:where     ] and filt = "\nwhere\n  #{filt}"
+
+# ensure regexp extension is available
+regx && File.exist?(regx) or abort "no regexp extension found#{regx ? " at '#{regx}'" : ''}"
+
+# eager deletion of prior .slyce database
+nuke and `rm -f .slyce`
+
+dbas ||= ARGV.shift or nuke ? exit : abort("no database given")
+
+case dbas
+when /(\.csv)$/, "/dev/stdin", "-"
+  file = $1 ? dbas : "-"
+  dbas = ".slyce"
+  tabl = "csv"
+  head = " |head -1" if opts[:columns]
+  `rm -f "#{dbas}"` if File.exist?(dbas) && !keep
+  `sqlite3 -csv '#{dbas}' ".import '|cat #{file}#{head}' '#{tabl}'"`
+else
+  tabl ||= ARGV.shift or abort "no table given"
+end
+
 # ==[ Let 'er rip! ]==
 
 conn = Extralite::Database.new(dbas)
 resu = conn.load_extension(regx) rescue abort("unable to load regexp extension '#{regx}'")
-cols = conn.columns("select * from `#{tabl}` limit 0").map(&:to_s)
-want = want.empty? ? cols : want & cols
+cols = conn.columns("select * from \"#{tabl}\" limit 0").map(&:to_s)
+want = want.empty? ? cols : Hash[cols.map(&:downcase).zip(cols)].values_at(*want).compact
 
 if opts[:columns]
   puts cols
@@ -87,32 +124,61 @@ if want.empty?
   abort "no columns are selected"
 end
 
+# handle exports
+if xprt
+  list = want.map {|item| %{"#{item}"} }.join(", ")
+  limt = show ? "limit #{show}" : ""
+  data = conn.sql(<<~"".rstrip).to_a
+    select
+      #{list}
+    from
+      "#{tabl}"
+    #{filt}
+    #{limt}
+
+  seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
+
+  Censive.write(sep: seps) do |csv|
+    csv << want unless hide
+    data.each do |row|
+      csv << row.map {|e| asky ? AnyAscii.transliterate(e.to_s) : e.to_s }
+    end
+  end
+
+  exit
+end
+
 want.each do |name|
   sort = natu ? "" : "cnt desc,"
-  stmt = show ? "limit #{show}" : ""
-  data = conn.sql(<<~"" + stmt).to_a
+  limt = show ? "limit #{show}" : ""
+  like = <<~"".gsub(/(.)^/m, '\1  ').rstrip
+    -iif(regexp_like("#{name}", '^[-+]?((0|([1-9]\\d*)(\\.\\d*)?)|((0|([1-9]\\d*))\\.\\d+))$'), "#{name}" + 0, null) desc,
+    -iif(regexp_like("#{name}", '^0\\d+$'), length("#{name}"), null) desc,
+    -iif(regexp_like("#{name}", '^\\d'), length(regexp_substr("#{name}", '^\\d+')), null) desc,
+
+  data = conn.sql(<<~"".rstrip).to_a
     select
       count(*) as cnt,
-      `#{name}` as val
+      "#{name}" as val
     from
-      `#{tabl}`
-    #{filt}
+      "#{tabl}"#{filt}
     group by
       val
     order by #{sort}
-      -iif(regexp_like(`#{name}`, '^[-+]?((0|([1-9]\\d*)(\\.\\d*)?)|((0|([1-9]\\d*))\\.\\d+))$'), `#{name}` + 0, null) desc,
-      -iif(regexp_like(`#{name}`, '^0\\d+$'), length(`#{name}`), null) desc,
-      -iif(regexp_like(`#{name}`, '^\\d'), length(regexp_substr(`#{name}`, '^\\d+')), null) desc,
-      `#{name}` is null, `#{name}`
+      #{like}
+      "#{name}" is null, "#{name}"
     collate nocase
+    #{limt}
 
-  uniq, tots = conn.sql(<<~"").to_a[0]
+  uniq, tots = conn.sql(<<~"".rstrip).to_a[0]
     select
-      count(distinct(ifnull(`#{name}`,0))),
-      count(ifnull(`#{name}`,0))
+      count(distinct(ifnull("#{name}",0))),
+      count(ifnull("#{name}",0))
     from
-      `#{tabl}`
+      "#{tabl}"
     #{filt}
 
   display(name, data, show, uniq, tots)
 end
+
+`rm -f "#{dbas}"` if file && !keep

data/bin/slyced

@@ -7,11 +7,38 @@ require "optparse"
 
 trap("INT" ) { abort "\n" }
 
-dbas = nil
-tabl = nil
+# ==[ Helpers ]==
+
+DuckDB::Result.use_chunk_each = true
+
+class DuckDB::Connection
+  alias_method :sql, :query
+
+  def sql!(stmt, *args, **opts, &block)
+    puts "\n==[ SQL statement ]==\n\n", stmt.strip, ";"
+    sql(stmt, *args, **opts, &block)
+  end
+end
+
+def display(name, data, show, uniq, tots)
+  seen = data.inject(0) {|seen, coun| seen += coun[0] }
+  rows = [data.size, seen].min
+  wide = tots.to_s.size
+  fill = " " * wide
+  line = "=" * name.size
+
+  puts "\n#{fill} #{name}\n#{fill} #{line}\n"
+  data.each {|cnt, val| puts "%*d %s" % [wide, cnt, val || "NULL"] }
+  puts "#{fill} -----\n"
+  puts "%*d shown (top %d)" % [wide, seen, rows] if     show && rows > 1
+  puts "%*d total (all %d)" % [wide, tots, uniq] if     uniq > 1
+  puts "%*d total"          % [wide, tots      ] unless uniq > 1
+end
+
+# ==[ Options ]==
 
 OptionParser.new.instance_eval do
-  @version = "1.3.5"
+  @version = "1.5.1"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"
@@ -20,9 +47,9 @@ OptionParser.new.instance_eval do
   on "-a", "--ascii"                  , "Convert data to ASCII using AnyAscii"
   on "-c", "--columns"                , "Display column names and quit"
   on "-h", "--help"                   , "Show help and command usage" do Kernel.abort to_s; end
+  on "-H", "--headerless"             , "Do not show headers when exporting delimited files"
   on "-n", "--natural"                , "Sort naturally, not numerically"
-  on "-r", "--rows <count>"           , "Rows of data to show", Integer
-  on "-s", "--suppress"               , "Suppress header when exporting delimited files"
+  on "-s", "--show <count>"           , "Show this many values", Integer
   on "-v", "--version"                , "Show version number" do Kernel.abort "#{program_name} #{@version}"; end
   on "-w", "--where <cond>"           , "Where clause (eg - 'age>50 and state='AZ')"
   on "-x", "--extract <a,b,c...>"     , "Comma separated list of columns to extract"
@@ -30,53 +57,30 @@ OptionParser.new.instance_eval do
   self
 end.parse!(into: opts={}) rescue abort($!.message)
 
+dbas = nil
+tabl = nil
+
 xcsv = opts[:csv]
 xpsv = opts[:psv]
 xtsv = opts[:tsv]
 xprt = xcsv || xpsv || xtsv and require "censive"
 
-asky = opts[:ascii   ] and require "any_ascii"
-filt = opts[:where   ] and filt = "where\n  #{filt}"
-hide = opts[:suppress]
-natu = opts[:natural ]
-show = opts[:rows    ]
-want = opts[:extract].to_s.downcase.split(",")
+asky = opts[:ascii     ] and require "any_ascii"
+want = opts[:extract   ].to_s.downcase.split(",")
+natu = opts[:natural   ]
+show = opts[:show      ]
+hide = opts[:headerless]
+filt = opts[:where     ] and filt = "\nwhere\n  #{filt}"
 
 dbas ||= ARGV.shift or abort "no database given"
 tabl ||= ARGV.shift or abort "no table given"
 
 [xcsv, xpsv, xtsv].compact.size > 1 and abort "only one of csv, psv, or tsv allowed"
 
-# ==[ Helpers ]==
-
-class DuckDB::Connection
-  alias_method :sql, :query
-
-  def sql!(stmt, *args, **opts, &block)
-    puts "\n==[ SQL statement ]==\n\n", stmt.strip, ";"
-    sql(stmt, *args, **opts, &block)
-  end
-end
-
-def display(name, data, show, uniq, tots)
-  seen = data.inject(0) {|seen, coun| seen += coun[0] }
-  rows = [data.size, seen].min
-  wide = tots.to_s.size
-  fill = " " * wide
-  line = "=" * name.size
-
-  puts "\n#{fill} #{name}\n#{fill} #{line}\n"
-  data.each {|cnt, val| puts "%*d %s" % [wide, cnt, val || "NULL"] }
-  puts "#{fill} -----\n"
-  puts "%*d shown (top %d)" % [wide, seen, rows] if     show && rows > 1
-  puts "%*d total (all %d)" % [wide, tots, uniq] if     uniq > 1
-  puts "%*d total"          % [wide, tots      ] unless uniq > 1
-end
-
 # ==[ Let 'er rip! ]==
 
 conn = DuckDB::Database.open(dbas).connect
-resu = conn.query(<<~end)
+resu = conn.sql(<<~end)
   select column_name
   from   information_schema.columns
   where  table_name='#{tabl}'
@@ -96,14 +100,15 @@ end
 
 # handle exports
 if xprt
-  list = want.map {|item| "\"#{item}\"" }.join(", ")
-  stmt = show ? "limit #{show}" : ""
-  data = conn.sql(<<~"" + stmt).to_a
+  list = want.map {|item| %{"#{item}"} }.join(", ")
+  limt = show ? "limit #{show}" : ""
+  data = conn.sql(<<~"".rstrip).to_a
     select
       #{list}
     from
       "#{tabl}"
     #{filt}
+    #{limt}
 
   seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
 
@@ -119,23 +124,26 @@ end
 
 want.each do |name|
   sort = natu ? "" : "cnt desc,"
-  stmt = show ? "limit #{show}" : ""
-  data = conn.sql(<<~"" + stmt).to_a
+  limt = show ? "limit #{show}" : ""
+  like = <<~"".gsub(/(.)^/m, '\1  ').rstrip
+    if(regexp_matches("#{name}", '^[-+]?((0|([1-9]\\d*)(\\.\\d*)?)|((0|([1-9]\\d*))\\.\\d+))$'),cast("#{name}" as double),null) nulls last,
+    if(regexp_matches("#{name}", '^0\\d*$'),length("#{name}"),null)                                                             nulls last,
+    if(regexp_matches("#{name}", '^\\d+\\D'),length(regexp_extract("#{name}",'^(\\d+)',1)),null)                                nulls last,
+
+  data = conn.sql(<<~"".rstrip).to_a
     select
       count(*) as cnt,
       "#{name}" as val
     from
-      "#{tabl}"
-    #{filt}
+      "#{tabl}"#{filt}
     group by
       val
     order by #{sort}
-      if(regexp_matches("#{name}", '^[-+]?((0|([1-9]\\d*)(\\.\\d*)?)|((0|([1-9]\\d*))\\.\\d+))$'),cast("#{name}" as double),null) nulls last,
-      if(regexp_matches("#{name}", '^0\\d*$'),length("#{name}"),null)                                                             nulls last,
-      if(regexp_matches("#{name}", '^\\d+\\D'),length(regexp_extract("#{name}",'^(\\d+)',1)),null)                                nulls last,
+      #{like}
       "#{name}" is null, "#{name}"
+    #{limt}
 
-  uniq, tots = conn.sql(<<~"").to_a[0]
+  uniq, tots = conn.sql(<<~"".rstrip).to_a[0]
     select
       count(distinct(ifnull("#{name}",0))),
       count(ifnull("#{name}",0))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slyce
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.5.1
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-15 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: any_ascii
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.16
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Ruby utility to show data statistics for MySQL databases