sql-parser-vlad 0.0.3 → 0.0.4

data/lib/sql-parser/parser.rex

@@ -77,6 +77,8 @@ rule
             DESC          { [:DESC, text] }
             CURRENT_USER  { [:CURRENT_USER, text] }
             VALUES        { [:VALUES, text] }
+            LIMIT         { [:LIMIT, text] }
+            OFFSET        { [:OFFSET, text] }
 
 # tokens
             E             { [:E, text] }

data/lib/sql-parser/parser.rex.rb

@@ -198,6 +198,12 @@ class SQLParser::Parser < Racc::Parser
       when (text = @ss.scan(/VALUES/i))
          action { [:VALUES, text] }
 
+      when (text = @ss.scan(/LIMIT/i))
+         action { [:LIMIT, text] }
+
+      when (text = @ss.scan(/OFFSET/i))
+         action { [:OFFSET, text] }
+
       when (text = @ss.scan(/E/i))
          action { [:E, text] }
 

data/lib/sql-parser/sql_visitor.rb

@@ -60,7 +60,8 @@ module SQLParser
         o.from_clause,
         o.where_clause,
         o.group_by_clause,
-        o.having_clause
+        o.having_clause,
+        o.limit_clause
       ].compact.collect { |e| visit(e) }.join(' ')
     end
 
@@ -92,6 +93,14 @@ module SQLParser
       "WHERE #{visit(o.search_condition)}"
     end
 
+    def visit_LimitClause(o)
+      if o.offset.nil?
+        "LIMIT #{o.limit}"
+      else
+        "LIMIT #{o.limit} OFFSET #{o.offset}"
+      end
+    end
+
     def visit_On(o)
       "ON #{visit(o.search_condition)}"
     end

data/lib/sql-parser/statement.rb

@@ -111,17 +111,19 @@ module SQLParser
 
     class TableExpression < Node
 
-      def initialize(from_clause, where_clause = nil, group_by_clause = nil, having_clause = nil)
+      def initialize(from_clause, where_clause = nil, group_by_clause = nil, having_clause = nil, limit_clause = nil)
         @from_clause = from_clause
         @where_clause = where_clause
         @group_by_clause = group_by_clause
         @having_clause = having_clause
+        @limit_clause = limit_clause
       end
 
       attr_reader :from_clause
       attr_reader :where_clause
       attr_reader :group_by_clause
       attr_reader :having_clause
+      attr_reader :limit_clause
 
     end
 
@@ -191,6 +193,16 @@ module SQLParser
 
     end
 
+    class LimitClause < Node
+
+      def initialize(limit, offset)
+        @limit = limit
+        @offset = offset
+      end
+
+      attr_reader :limit, :offset
+    end
+
     class On < Node
 
       def initialize(search_condition)

data/lib/sql-parser/version.rb

@@ -1,5 +1,5 @@
 module SQLParser
 
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sql-parser-vlad
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dray Lacy