presto_sql_parser 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcc623f7e4f77f063485f8eafd7fede9613dda7d12392477d1be5cf6ef998cbb
-  data.tar.gz: 261c0520a92e6f5a85a3035385255e051afc103e57c29a3b31930e74ca811522
+  metadata.gz: 8b741335f41c8bc843227d596cf676fe8dd100416ac711c7fb1f07a2d88d56d4
+  data.tar.gz: e05a50a413fcbfb5a8f766230cca38b365e8dbd9da39dd3318b2f06e8f34aab2
 SHA512:
-  metadata.gz: 73572412ca1bc6b2f467dd5dd7798fda5f8f77e3b4532454da3a879b172cb0523baa1e8be8c1a42c36d561bdfe34ae22826ca6a229dc743b269ec2a2018ef52c
-  data.tar.gz: 1da0c97bcaea5cf0c35172db1b4d98fcb85939a0c958d611b4b048c1a0ecdf5e6bfd7f9790dc74fb055876ea80f3620d7891b7b3d018cc9c9d2daeae71a27fe8
+  metadata.gz: 598c067b8400698a8f98891d1613e3fce210dd74d89caee448c3893dec92b55a7a1a8bdfe59d1e922c0b674168ea5f667a149b9622ac83f230d0fa93fa9b2a6c
+  data.tar.gz: 7875622888caa489ddfc863a5a68fccb26cdf95610ecc46226d35f85ffe08b2aeec3e5460d8f564ef5057bb0a696c2ef5983bfcb1d83441b981ca0ac0edcee76

data/ChangeLog

@@ -0,0 +1,13 @@
+
+2019-08-02 version 0.3.0:
+
+* Added support for PRESTO_SQL_PARSER_JAVA env var
+
+2019-08-02 version 0.2.0:
+
+* Fixed PrestoSqlParser.java_args to work
+
+2019-08-01 version 0.1.0:
+
+* The first release
+

data/README.md

@@ -79,7 +79,7 @@ p statements[1]['tokens']
 ## Options
 
 ```ruby
-PrestoSqlParser.java_cmd = "java"  # java command
+PrestoSqlParser.java_cmd = "java"  # java command (default: PRESTO_SQL_PARSER_JAVA env var or "java")
 PrestoSqlParser.java_args = []     # command-line arguments of java_cmd
 PrestoSqlParser.java_env = {}      # environment variables given to java_cmd
 ```

data/lib/presto_sql_parser.rb

@@ -10,9 +10,15 @@ class PrestoSqlParser
 
   extend ClassMethods
 
-  self.java_cmd = "java"
+  self.java_cmd = ENV['PRESTO_SQL_PARSER_JAVA']
+  if self.java_cmd == nil || self.java_cmd.strip.empty?
+    self.java_cmd = "java"
+  end
+
   self.java_args = []
+
   self.java_env = {}
+
   self.jar_path = File.join(File.dirname(__FILE__), "presto_sql_parser/presto-sql-parser.jar")
 
   class ParseError < StandardError
@@ -34,6 +40,9 @@ class PrestoSqlParser
   end
 
   def parse(sql)
+    unless sql.is_a?(String)
+      raise ArgumentError, "SQL must be a String but got #{sql.class}"
+    end
     request_line = JSON.dump({"sql" => sql})
 
     success = false

data/lib/presto_sql_parser/support_process.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 class PrestoSqlParser
   class SupportProcess
     def initialize(idle_wait: 2, with_tokens:)
@@ -12,13 +14,14 @@ class PrestoSqlParser
     def start!
       return if @pipe
 
-      cmd =
+      cmd = (
         [PrestoSqlParser.java_cmd] +
-        PrestoSqlParser.java_args +
-        ["-jar", PrestoSqlParser.jar_path]
+        PrestoSqlParser.java_args.map {|arg| Shellwords.escape(arg) } +
+        ["-jar", Shellwords.escape(PrestoSqlParser.jar_path)]
+      ).join(' ')
 
       if @with_tokens
-        cmd << "--with-tokens"
+        cmd << " --with-tokens"
       end
 
       @pipe = IO.popen(PrestoSqlParser.java_env, cmd, "r+", external_encoding: 'UTF-8')

data/lib/presto_sql_parser/version.rb

@@ -1,3 +1,3 @@
 class PrestoSqlParser
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: presto_sql_parser
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ChangeLog
 - Gemfile
 - LICENSE
 - README.md