sqliterate 0.1.2 → 0.1.3

data/lib/sqliterate/grammar/expression.treetop

@@ -43,13 +43,19 @@ module SQLiterate
     rule set_predicate_expression
       exists_expression
       /
-      e:test_expression space set_predicate_operator space
-      '(' space query_expression space ')'
+      e:test_expression space set_predicate_operator space set_constructor
       <Node::SetPredicateExpression>
       /
       test_expression
     end
 
+    rule set_constructor
+      '(' space e:query_expression space ')'
+      /
+      '(' space e:expressions_list space ')'
+      <Node::SetConstructor>
+    end
+
     rule exists_expression
       exists_kw space '(' space query_expression space ')'
       <Node::ExistsExpression>
@@ -96,13 +102,13 @@ module SQLiterate
     end
 
     rule case_when_section
-      when_kw required_space w:scalar_expression space
-      then_kw required_space t:scalar_expression
+      when_kw space w:scalar_expression space
+      then_kw space t:scalar_expression
       <Node::CaseWhenSection>
     end
 
     rule case_else_section
-      ( else_kw required_space scalar_expression / space )
+      ( else_kw space scalar_expression / space )
       <Node::CaseElseSection>
     end
 
@@ -149,11 +155,11 @@ module SQLiterate
 
     rule ordering_specifier
       ( asc_kw / desc_kw )?
-      ( required_space nulls_kw required_space ( first_kw / last_kw ) )?
+      ( space nulls_kw required_space ( first_kw / last_kw ) )?
     end
 
     rule order_by_clause
-      ( order_by_kw required_space sort_expressions_list / space ) <Node::OrderByClause>
+      ( order_by_kw space sort_expressions_list / space ) <Node::OrderByClause>
     end
 
     rule sort_expressions_list
@@ -210,7 +216,7 @@ module SQLiterate
     end
 
     rule select_query
-      select_kw required_space
+      select_kw space
       distinct_clause space
       select_list space
       table_expression space
@@ -222,7 +228,7 @@ module SQLiterate
 
     rule distinct_clause
       aggregate_specifier (
-        required_space on_kw required_space '(' space expressions_list space ')'
+        required_space on_kw space '(' space expressions_list space ')'
       )?
       /
       space
@@ -256,20 +262,20 @@ module SQLiterate
     end
 
     rule from_clause
-      ( from_kw required_space table_references / space ) <Node::FromClause>
+      ( from_kw space table_references / space ) <Node::FromClause>
     end
 
     rule where_clause
-      ( where_kw required_space scalar_expression / space ) <Node::WhereClause>
+      ( where_kw space scalar_expression / space ) <Node::WhereClause>
     end
 
     rule group_by_clause
-      ( group_by_kw required_space expressions_list space having_clause / space )
+      ( group_by_kw space expressions_list space having_clause / space )
       <Node::GroupByClause>
     end
 
     rule having_clause
-      ( having_kw required_space scalar_expression / space ) <Node::HavingClause>
+      ( having_kw space scalar_expression / space ) <Node::HavingClause>
     end
 
     rule table_references
@@ -323,15 +329,17 @@ module SQLiterate
     end
 
     rule limit_clause
-      limit_kw required_space ( digits / all_kw )
-      /
-      space
+      ( limit_kw required_space all_kw
+        /
+        limit_kw space scalar_expression
+        /
+        space )
+      <Node::LimitClause>
     end
 
     rule offset_clause
-      offset_kw required_space digits
-      /
-      space
+      ( offset_kw space scalar_expression / space )
+      <Node::OffsetClause>
     end
   end
 end

data/lib/sqliterate/grammar/query.treetop

@@ -9,7 +9,7 @@ module SQLiterate
     end
 
     rule with_section
-      (with_kw required_space with_queries / space) <Node::WithSection>
+      (with_kw space with_queries / space) <Node::WithSection>
     end
 
     rule with_queries
@@ -17,7 +17,7 @@ module SQLiterate
     end
 
     rule with_query
-      identifier required_space as_kw required_space '('
+      identifier space as_kw space '('
         space query_expression space
       ')' <Node::WithQuery>
     end

data/lib/sqliterate/node/control/expression.rb

@@ -38,6 +38,12 @@ module SQLiterate
       end
     end
 
+    module SetConstructor
+      def tables
+        e.tables
+      end
+    end
+
     module ExistsExpression
       def tables
         query_expression.tables
@@ -219,7 +225,11 @@ module SQLiterate
 
     module SelectQuery
       def tables
-        select_list.tables + table_expression.tables + order_by_clause.tables
+        select_list.tables + \
+        table_expression.tables + \
+        order_by_clause.tables + \
+        limit_clause.tables + \
+        offset_clause.tables
       end
     end
 
@@ -302,5 +312,17 @@ module SQLiterate
         table_reference.table
       end
     end
+
+    module LimitClause
+      def tables
+        respond_to?(:scalar_expression) ? scalar_expression.tables : []
+      end
+    end
+
+    module OffsetClause
+      def tables
+        respond_to?(:scalar_expression) ? scalar_expression.tables : []
+      end
+    end
   end
 end

data/lib/sqliterate/node/evaluate/expression.rb

@@ -50,7 +50,13 @@ module SQLiterate
 
     module SetPredicateExpression
       def value
-        [:set, e.value, query_expression.value]
+        [:set, e.value, set_constructor.value]
+      end
+    end
+
+    module SetConstructor
+      def value
+        e.value
       end
     end
 

data/lib/sqliterate/version.rb

@@ -1,3 +1,3 @@
 module SQLiterate
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqliterate
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2802900881270778442
+      hash: 3648950469007697292
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2802900881270778442
+      hash: 3648950469007697292
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23