vsql_parser 0.2 → 0.3

data/lib/vsql_parser.treetop

@@ -3,7 +3,7 @@ grammar VSql
   rule query
     space*
     select_statement
-    (space from_statement (space join_statement)*
+    (space from_statement
       (space where_statement)?
       (space group_by_statement)?
       (space having_statement)?
@@ -121,13 +121,17 @@ grammar VSql
   end
 
   rule primitive_literal
-    interval_literal / numeric_literal / string_literal / date_literal
+    interval_literal / numeric_literal / string_literal / date_literal / ts_literal
   end
 
   rule interval_literal
     'interval' space "'" [\w ]+ "'"
   end
 
+  rule ts_literal
+    '{ts' space+ "'" [^\'\}]+ "'}"
+  end
+
   rule date_literal
     '{d' space+ "'" [^\'\}]+ "'}"
   end
@@ -151,7 +155,7 @@ grammar VSql
   end
 
   rule operator
-    [+\-/=\|><!]+
+    [+\-\*/=\|><!]+
     /
     ('is not' / 'is' / 'like' / 'between' / 'and' / 'or') &space
   end
@@ -188,7 +192,7 @@ grammar VSql
   end
 
   rule from_statement
-    'from' space+ from_expression (expression_separator from_expression)* <FromStatement>
+    'from' space+ from_expression (space join_statement / expression_separator from_expression)* <FromStatement>
   end
 
   rule from_expression

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vsql_parser
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000Z
+date: 2013-11-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &70201796873120 !ruby/object:Gem::Requirement
+  requirement: &70108659858580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70201796873120
+  version_requirements: *70108659858580
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70201796872740 !ruby/object:Gem::Requirement
+  requirement: &70108659858200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201796872740
+  version_requirements: *70108659858200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70201796872140 !ruby/object:Gem::Requirement
+  requirement: &70108659857620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70201796872140
+  version_requirements: *70108659857620
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70201796871700 !ruby/object:Gem::Requirement
+  requirement: &70108659857200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201796871700
+  version_requirements: *70108659857200
 description: Provides treetop grammar for Vertica SQL. (Most likely works with Postgres
   SQL as well)
 email: