slyce 1.2.7 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec75a29f832be5cce086420a326344089addb6804c8c881b0608560797f8f5c
-  data.tar.gz: 2f24983ed709549e1ef18f10e80a5417e8bd7c890f43e725abbcbe18c656232e
+  metadata.gz: 2ba003aec5b58e63630c2b5fc40437ecfc841e8b2c2239fea6fba2cc785687d8
+  data.tar.gz: 3713c8ea0c95383fad5151012553a4f22fba837925d19839bcef5abadba1b2d6
 SHA512:
-  metadata.gz: c746ea7eeb63859b7318f9245028f530b973b997ca1de1220a2346d363307756e8ca6d879f4155719da49dd2420220e54ef34bdf225ea39dade507a49030400d
-  data.tar.gz: 213560784f729604ce2cea20dc57b51c45775cfc8c9be273842cb0818448f9792764516dcb2ff00fc435c2de9b8f0ceccfd9153bcd7899a8043969dc21c689bb
+  metadata.gz: e93706e9acd8ce49b35d1c47c19cffb388ab3e77dbe1cdeff9f1e817c3b89d5b854edbafb1422951d82b4a395c63882cf6f267c4bff772597a830ea13cc98c42
+  data.tar.gz: cec5303f23cd5e5370c349e566f1afed2d5a7f3a6b094aede4ba7c851aeaf2ef76f58adfe1148660b3e852bfea4923ade8dab40ae73e9c656560f55a210f05d6

data/bin/slyce

@@ -11,7 +11,7 @@ dbas = nil
 tabl = nil
 
 OptionParser.new.instance_eval do
-  @version = "1.2.7"
+  @version = "1.3.1"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"
@@ -23,9 +23,10 @@ OptionParser.new.instance_eval do
   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 "-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 <col1,col2,...>", "Comma separated list of columns 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)
@@ -43,7 +44,7 @@ show = opts[:rows    ]
 want = opts[:extract].to_s.downcase.split(",")
 
 dbas ||= ARGV.shift or abort "no database given"
-tabl ||= ARGV.shift or abort "no table 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"
 
@@ -75,6 +76,7 @@ end
 
 # ==[ Let 'er rip! ]==
 
+# get database connection
 if dbas.include?("/")
   dbas = $' if dbas =~ %r|^mysql://| # drop mysql:// prefix, if present
   auth, dbas = dbas.split("/", 2)
@@ -95,7 +97,18 @@ else
 end
 
 conn = Mysql2::Client.new(**conf, as: :array)
-resu = conn.query("select * from `#{tabl}` limit 0")
+
+# get table names
+if tabl.nil? || opts[:tables]
+  resu = conn.sql("show tables")
+  tbls = resu.to_a.flatten
+  want = (want.empty? || opts[:tables]) ? tbls : want.select {|e| tbls.include?(e) }
+  puts want
+  exit
+end
+
+# get column names
+resu = conn.sql("select * from `#{tabl}` limit 0")
 cols = resu.fields
 want = want.empty? ? cols : want.select {|e| cols.include?(e) }
 
@@ -121,7 +134,7 @@ if xprt
 
   seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
 
-  Censive.writer(sep: seps) do |csv|
+  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 }
@@ -131,6 +144,11 @@ 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/bin/slyced

@@ -11,7 +11,7 @@ dbas = nil
 tabl = nil
 
 OptionParser.new.instance_eval do
-  @version = "1.2.7"
+  @version = "1.3.1"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"
@@ -25,7 +25,7 @@ OptionParser.new.instance_eval do
   on "-s", "--suppress"               , "Suppress header when exporting delimited files"
   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"
+  on "-x", "--extract <a,b,c...>"     , "Comma separated list of columns to extract"
 
   self
 end.parse!(into: opts={}) rescue abort($!.message)
@@ -107,7 +107,7 @@ if xprt
 
   seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
 
-  Censive.writer(sep: seps) do |csv|
+  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 }

data/slyce.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n") - %w[.gitignore]
   s.executables = `cd bin && git ls-files .`.split("\n")
   s.add_runtime_dependency "any_ascii", "~> 0.3.2"
-  s.add_runtime_dependency "censive", "~> 1.0.3"
+  s.add_runtime_dependency "censive", "~> 1.1.0"
   s.add_runtime_dependency "duckdb", "~> 0.8.0"
   s.add_runtime_dependency "extralite-bundle", "~> 1.25"
   s.add_runtime_dependency "mysql2", "~> 0.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slyce
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.1
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: any_ascii
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: duckdb
   requirement: !ruby/object:Gem::Requirement