slyce 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d593f1fb756c6af9643dfa496027cb39cd85451f351d3dd2541cbfa340b1c7b3
-  data.tar.gz: 13753300c5bbebb1b40998bc1cb1c9397b0a2c9ab2691fb9a21f0de1252c3b68
+  metadata.gz: 9e63de054e38ac6dd6b847b8aec37b750955c285c710bf8cc713c61c3e309b78
+  data.tar.gz: 6a1222e3f162739c198eb83084a6b73688a6acface1d094477884da68f797e6c
 SHA512:
-  metadata.gz: d11b2bad746f523480a8bdcc8659f64e381e63803cabfe4311741f3fe7f40129bfcd65dc1374ef77842c3f4bb2896d4280c2eb4697e1ff66a8c6f04f45d78657
-  data.tar.gz: 8da310dc995ca7b73439081666e9e6c62bc56fb9be8e06f8076976ee624923058a2f867f8a326a13c0e76c99391677d670f70cc482117fcc71b634812e5780d2
+  metadata.gz: 176b6aa4493b0e10a0a122d414e2924fe764b18016076b1bb0ecf95127cc4927fc8fc946e878232ab5e4e634a054e095f36fa0467bae6381ee7197c12b8e64a2
+  data.tar.gz: 24732fe38c896f45b6322594af7c55ed3c55e863029ba65146157bf4196e009c032d5d94e8dc68aacdfd19040fbec15b6979516ef1421b4924c7c887708c393c

data/bin/slyce

@@ -11,7 +11,7 @@ dbas = nil
 tabl = nil
 
 OptionParser.new.instance_eval do
-  @version = "1.3.2"
+  @version = "1.3.4"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"
@@ -19,7 +19,7 @@ OptionParser.new.instance_eval do
   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", "--dump"                   , "Display table schema 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 "-n", "--natural"                , "Sort naturally, not numerically"
   on "-r", "--rows <count>"           , "Rows of data to show", Integer
@@ -27,7 +27,7 @@ OptionParser.new.instance_eval do
   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')"
-  on "-x", "--extract <a,b,c...>"     , "Comma separated list of columns (or tables) to extract"
+  on "-x", "--extract <a,b,c...>"     , "Comma separated list of columns or tables to extract"
 
   self
 end.parse!(into: opts={}) rescue abort($!.message)
@@ -38,11 +38,12 @@ 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]
+dump = opts[:dump]
+want = opts[:extract ].to_s.downcase.split(",")
 natu = opts[:natural ]
 show = opts[:rows    ]
-want = opts[:extract].to_s.downcase.split(",")
+hide = opts[:suppress]
+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"
@@ -78,7 +79,9 @@ end
 # ==[ Let 'er rip! ]==
 
 # get database connection
-if dbas.include?("/")
+if !dbas.include?("/")
+  conf = { database: dbas }
+else
   dbas = $' if dbas =~ %r|^mysql://| # drop mysql:// prefix, if present
   auth, dbas = dbas.split("/", 2)
   if auth =~ /^(?:(\w+)(?::([^@]+))?@)?(?:([^:]+)?(?::(\d+))?)$/
@@ -93,20 +96,21 @@ if dbas.include?("/")
   else
     abort "invalid database value #{dbas.inspect}"
   end
-else
-  conf = { database: dbas }
 end
 
+# connect to database and get server version
 conn = Mysql2::Client.new(**conf, as: :array)
+ver5 = conn.server_info[:version] =~ /^5/
+
+# dump database schema or show table names
+if tabl.nil? || opts[:tables] || opts[:dump]
 
-# get table names
-if tabl.nil? || opts[:dump] || opts[:tables]
+  # get table names
   resu = conn.sql("show tables")
   tbls = resu.to_a.flatten
-  want = (want.empty? || opts[:tables]) ? tbls : want.select {|e| tbls.include?(e) }
-
-  #!# FIXME: this code is a mess... cleanup soon
+  want = (want.empty? || opts[:tables] || opts[:dump]) ? tbls : want.select {|e| tbls.include?(e) }
 
+  # 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"
@@ -125,6 +129,7 @@ if tabl.nil? || opts[:dump] || opts[:tables]
     exit
   end
 
+  # show table names
   puts want
   exit
 end
@@ -151,8 +156,7 @@ if xprt
     select
       #{list}
     from
-      `#{tabl}`
-    #{filt}
+      `#{tabl}`#{filt}
 
   seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
 
@@ -166,36 +170,36 @@ if xprt
   exit
 end
 
-# MySQL 5.7 compatible version (still need to find replacement for regexp_instr)
-# -if((`#{name}` rlike '^[-+]?((0|([1-9]\\\\d*)(\\\\.\\\\d*)?)|((0|([1-9]\\\\d*))\\\\.\\\\d+))$'), `#{name}` + 0, null) desc,
-# -if((`#{name}` rlike '^0\\\\d+$'), length(`#{name}`), null) desc,
-# -if((`#{name}` rlike '^\\\\d'), regexp_instr(`#{name}`, '[^\\\\d]'), null) desc,
-
 want.each do |name|
   sort = natu ? "" : "cnt desc,"
-  stmt = show ? "limit #{show}" : ""
-  data = conn.sql(<<~"" + stmt).to_a
+  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(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
     from
-      `#{tabl}`
-    #{filt}
+      `#{tabl}`#{filt}
     group by
       val
     order by #{sort}
-      -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,
+      #{like}
       `#{name}` is null, `#{name}`
+    #{show ? "limit #{show}" : ""}
 
-  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))
     from
-      `#{tabl}`
-    #{filt}
+      `#{tabl}`#{filt}
 
   display(name, data, show, uniq, tots)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slyce
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: any_ascii