slyce 1.3.3 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d9ddd3a6d353a87ede364090e7b534adeb9f0f7c2bc64c374db8dcf9e181d9
-  data.tar.gz: 2b22b3ee7f996cda2c5770af031fc8fa65db652d54b70bd16bcea03247ce9d3d
+  metadata.gz: 1611ad48c69cfc3485861a330287d6afb01e7822d060175cc8d312d92327b49b
+  data.tar.gz: fba5942e20444188dc70d721bae61d4d7ef6d7de933735f5f2b7a8c7d25335b8
 SHA512:
-  metadata.gz: d91171715f18698c3ced8c1f7a0a7eca87d28766a2b99e7272950760cc21f3cc6eab626f57f45d5adbd2e6b33590c04e56f6d55a8427241ecc31ff45d7506d74
-  data.tar.gz: 3ea0f1d215bb9bb0a4c6cc70b7e579e61a7e7167950f83ec48e27bbb88f987df571da4b0bf31ee772ef3214768fa0b2df43f0d20af6dd80effa809a462a7846c
+  metadata.gz: 881a62062b6cc066dc0cb4e06a9d399e18c760db70517564d6c72e32424ac610823819b5d4201d29ea3275b8414981e43e3b205107a470198049b0a2f7b5d8ff
+  data.tar.gz: 363c50d513e9ee5ee829300550aad0d6f3fb98b5fafa0bcaa9733900028a714392e1052db8aa2af004ae3ca8bbc32925288c063374ab14683967002decae18e2

data/bin/slyce

@@ -11,7 +11,7 @@ dbas = nil
 tabl = nil
 
 OptionParser.new.instance_eval do
-  @version = "1.3.3"
+  @version = "1.3.5"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"
@@ -43,7 +43,7 @@ want = opts[:extract ].to_s.downcase.split(",")
 natu = opts[:natural ]
 show = opts[:rows    ]
 hide = opts[:suppress]
-filt = opts[:where   ] and filt = "where\n  #{filt}"
+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"
@@ -98,7 +98,9 @@ else
   end
 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]
@@ -154,8 +156,7 @@ if xprt
     select
       #{list}
     from
-      `#{tabl}`
-    #{filt}
+      `#{tabl}`#{filt}
 
   seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
 
@@ -169,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

data/bin/slyced

@@ -11,7 +11,7 @@ dbas = nil
 tabl = nil
 
 OptionParser.new.instance_eval do
-  @version = "1.3.1"
+  @version = "1.3.5"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"

data/slyce.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.executables = `cd bin && git ls-files .`.split("\n")
   s.add_runtime_dependency "any_ascii", "~> 0.3.2"
   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 "duckdb", "~> 0.8.1"
+  s.add_runtime_dependency "extralite-bundle", "~> 2.1"
   s.add_runtime_dependency "mysql2", "~> 0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slyce
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.5
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: any_ascii
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: extralite-bundle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: Ruby utility to show data statistics for MySQL databases