sqlpp 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1107aeb0686b607cae85119da28fb50ce493d9d2
-  data.tar.gz: 590fdc355e514201a0b8d7e0cb3aee3e1a42afc6
+  metadata.gz: e96af138b105ce5c23190556cfe34c20e7d275da
+  data.tar.gz: 33dc95f6c3d0222cd82b3c2c373c5462c698506f
 SHA512:
-  metadata.gz: 6b9e6569b08495e7157a1e0293b92fa589c9edc5905c77a45a9a4081f1d3d2270239091a6a4cb1f269da78592c4e7ba86dc066933435c894a8a67083c1ff777e
-  data.tar.gz: aa73a36f3a87f2102019345a1c1ecb99cdbefc011fbd7aa0684474f057c123e9026e546abb38706b1a4a6644e414c1779f446187b1f4fd34ada010006c9f28c4
+  metadata.gz: 8ead60811f2f761ae6da39c124a50dcc3d2cef1eeca80c38a3213fc5d44537ee97276d538996c609b703dd954ceb1bff366bf060e51159505341d51dcbfac707
+  data.tar.gz: c1eb147f0e416a3f04911f208c23e825cf83530b3d83f392a5dac9382e7cba3d2a868c42c77021a2908ff57f04327152f97861c3de72b482842a6ba507dff3c5

data/lib/sqlpp/ast.rb

@@ -1,6 +1,6 @@
 module SQLPP
   module AST
-    class Select < Struct.new(:projections, :froms, :wheres, :groups, :orders)
+    class Select < Struct.new(:projections, :froms, :wheres, :groups, :orders, :distinct, :limit, :offset)
     end
 
     class Expr < Struct.new(:left, :op, :right)
@@ -26,5 +26,11 @@ module SQLPP
 
     class SortKey < Struct.new(:key, :options)
     end
+
+    class Limit < Struct.new(:expr)
+    end
+
+    class Offset < Struct.new(:expr)
+    end
   end
 end

data/lib/sqlpp/formatter.rb

@@ -23,6 +23,7 @@ module SQLPP
       end
 
       output << (select = "#{_indent}SELECT ")
+      output << "DISTINCT " if node.distinct
       link = ","
       link << ((@projections == :wrap) ? "\n#{" " * select.length}" : " ")
       output << node.projections.map { |c| format(c) }.join(link)
@@ -54,6 +55,19 @@ module SQLPP
         output << "\n"
       end
 
+      if node.limit || node.offset
+        output << _indent
+
+        if node.limit
+          output << format(node.limit)
+          output << " " if node.offset
+        end
+
+        output << format(node.offset) if node.offset
+
+        output << "\n"
+      end
+
       @indent -= 2
       @indent = nil if @indent < 0
 
@@ -156,6 +170,14 @@ module SQLPP
       output
     end
 
+    def _format_Limit(node)
+      "LIMIT #{format(node.expr)}"
+    end
+
+    def _format_Offset(node)
+      "OFFSET #{format(node.expr)}"
+    end
+
     def _format_String(string)
       string
     end

data/lib/sqlpp/parser.rb

@@ -1,11 +1,16 @@
 require 'sqlpp/ast'
 
-# select := 'SELECT'
+# select := 'SELECT' optional_distinct
 #             optional_projections
 #             optional_froms
 #             optional_wheres
 #             optional_groups
 #             optional_orders
+#             optional_limit
+#             optional_offset
+#
+# optional_distinct := ''
+#                    | 'DISTINCT'
 #
 # optional_projections := ''
 #                       | list
@@ -22,6 +27,12 @@ require 'sqlpp/ast'
 # optional_orders := ''
 #                  | 'ORDER' 'BY' sort_keys
 #
+# optional_limit := ''
+#                 | 'LIMIT' expr4
+#
+# optional_offset := ''
+#                  | 'OFFSET' expr4
+#
 # sort_keys := sort_key
 #            | sort_key ',' sort_keys
 #
@@ -67,7 +78,7 @@ require 'sqlpp/ast'
 #
 # op2 := '+' | '-' | '*' | '/'
 #
-# unary := '+' | '-' | 'NOT'
+# unary := '+' | '-' | 'NOT' | 'DISTINCT'
 #
 # expr4 := lit
 #        | id
@@ -133,6 +144,10 @@ module SQLPP
       select = AST::Select.new
 
       _eat :space
+      if _eat(:key, :distinct)
+        select.distinct = true
+        _eat :space
+      end
 
       if !_peek(:key, /^(from|where)$/) && !_peek(:eof)
         list = []
@@ -212,6 +227,22 @@ module SQLPP
         select.orders = list
       end
 
+      if _eat(:key, :limit)
+        _eat :space
+        atom = _parse_atom
+        _eat :space
+
+        select.limit = AST::Limit.new(atom)
+      end
+
+      if _eat(:key, :offset)
+        _eat :space
+        atom = _parse_atom
+        _eat :space
+
+        select.offset = AST::Offset.new(atom)
+      end
+
       select
     end
 
@@ -346,7 +377,7 @@ module SQLPP
     def _parse_expr3
       _eat :space
 
-      if (op = (_eat(:punct, /[-+]/) || _eat(:key, :not)))
+      if (op = (_eat(:punct, /[-+]/) || _eat(:key, /^(not|distinct)$/)))
         _eat :space
         AST::Unary.new(op.text, _parse_expr3)
 

data/lib/sqlpp/tokenizer.rb

@@ -18,6 +18,7 @@ module SQLPP
       case
       cross
       desc
+      distinct
       else
       end
       first
@@ -33,9 +34,11 @@ module SQLPP
       last
       left
       like
+      limit
       not
       null
       nulls
+      offset
       on
       or
       order

data/lib/sqlpp/version.rb

@@ -1,8 +1,8 @@
 module SQLPP
   module Version
     MAJOR = 1
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join(".")
   end

data/test/formatter_test.rb

@@ -42,6 +42,49 @@ FROM foo
     SQL
   end
 
+  def test_format_select_distinct
+    ast = _parser("select distinct a, b, c, d from foo").parse
+    assert_equal <<-SQL, _format(ast)
+SELECT DISTINCT a, b, c, d
+FROM foo
+    SQL
+  end
+
+  def test_format_count_distinct
+    ast = _parser("select count(distinct id) from foo").parse
+    assert_equal <<-SQL, _format(ast)
+SELECT count(DISTINCT id)
+FROM foo
+    SQL
+  end
+
+  def test_format_limit
+    ast = _parser("select * from foo limit 5").parse
+    assert_equal <<-SQL, _format(ast)
+SELECT *
+FROM foo
+LIMIT 5
+    SQL
+  end
+
+  def test_format_offset
+    ast = _parser("select * from foo offset 5").parse
+    assert_equal <<-SQL, _format(ast)
+SELECT *
+FROM foo
+OFFSET 5
+    SQL
+  end
+
+  def test_format_limit_and_offset
+    ast = _parser("select * from foo limit 10 offset 5").parse
+    assert_equal <<-SQL, _format(ast)
+SELECT *
+FROM foo
+LIMIT 10 OFFSET 5
+    SQL
+  end
+
   def _parser(string)
     SQLPP::Parser.new(string)
   end

data/test/parser_test.rb

@@ -179,6 +179,19 @@ class ParserTest < Minitest::Test
     end
   end
 
+  def test_it_should_parse_distinct_expression
+    expr = _parser("count(distinct id)").parse_expression
+    assert_instance_of SQLPP::AST::Atom, expr
+    assert_equal :func, expr.type
+    assert_equal 1, expr.right.count
+
+    assert_instance_of SQLPP::AST::Unary, expr.right[0]
+    assert_equal :distinct, expr.right[0].op
+    assert_instance_of SQLPP::AST::Atom, expr.right[0].expr
+    assert_equal :attr, expr.right[0].expr.type
+    assert_equal "id", expr.right[0].expr.left
+  end
+
   def test_from_should_recognize_single_attr
     from = _parser("x").parse_from
     assert_instance_of SQLPP::AST::Atom, from
@@ -269,11 +282,33 @@ class ParserTest < Minitest::Test
     assert_equal [:desc, "nulls last"], s.orders[1].options
   end
 
+  def test_accepts_select_distinct
+    s = _parser("select distinct * from x").parse_select
+    assert_instance_of SQLPP::AST::Select, s
+    assert_equal s.distinct, true
+  end
+
   def test_parse_should_recognize_select
     s = _parser("select * from x").parse
     assert_instance_of SQLPP::AST::Select, s
   end
 
+  def test_accepts_select_with_limit
+    s = _parser("select * from x limit 5").parse_select
+    assert_instance_of SQLPP::AST::Limit, s.limit
+    assert_instance_of SQLPP::AST::Atom, s.limit.expr
+    assert_equal :lit, s.limit.expr.type
+    assert_equal "5", s.limit.expr.left
+  end
+
+  def test_accepts_select_with_offset
+    s = _parser("select * from x offset 5").parse_select
+    assert_instance_of SQLPP::AST::Offset, s.offset
+    assert_instance_of SQLPP::AST::Atom, s.offset.expr
+    assert_equal :lit, s.offset.expr.type
+    assert_equal "5", s.offset.expr.left
+  end
+
   def _parser(string)
     SQLPP::Parser.new(string)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlpp
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jamis Buck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake