sdbcli 1.4.9 → 1.5.0

data/bin/sdbcli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '1.4.9'
+Version = '1.5.0'
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.sdbcli_history')
 HISTSIZE = 500
 SELECT_LIMIT = 2500
@@ -75,10 +75,12 @@ end
 def execute(src, show_rows = false)
   ss = StringScanner.new(src.dup)
   buf = ''
+  script = false
 
   until ss.eos?
     if (tok = ss.scan %r{[^-.`'";\\/#]+}) #'
       buf << tok
+      script = true if tok =~ /[|!]/
     elsif (tok = ss.scan /`(?:[^`]|``)*`/)
       buf << tok
     elsif (tok = ss.scan /'(?:[^']|'')*'/) #'
@@ -97,6 +99,7 @@ def execute(src, show_rows = false)
       src.replace(ss.rest)
       query = buf
       buf = ''
+      script = false
 
       if tok == '\G'
         inline = false
@@ -172,12 +175,18 @@ def execute(src, show_rows = false)
         puts str
       end
     elsif (tok = ss.scan /[-.]/)
-      output_error 'You must quote attributes and domain names that contain characters other than letters, numbers, underscores (_), or dollar symbols ($) with the backtick (`)'
-      ss.scan_until(/(?:;|\\G|\Z)/)
-      src.replace(ss.rest)
-      buf = ''
+      if script
+        buf << tok
+      else
+        output_error 'You must quote attributes and domain names that contain characters other than letters, numbers, underscores (_), or dollar symbols ($) with the backtick (`)'
+        ss.scan_until(/(?:;|\\G|\Z)/)
+        src.replace(ss.rest)
+        buf = ''
+        script = false
+      end
     elsif (tok = ss.scan /./)
       buf << tok
+      script = true if tok =~ /[|!]/
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdbcli
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors: