sqlpp 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e96af138b105ce5c23190556cfe34c20e7d275da
-  data.tar.gz: 33dc95f6c3d0222cd82b3c2c373c5462c698506f
+  metadata.gz: d5571413a37bafba8fb43af7c8ecbf43f5e0638e
+  data.tar.gz: d33d23f80b2ad5652c59eb6d12eb6b4cabfda9f0
 SHA512:
-  metadata.gz: 8ead60811f2f761ae6da39c124a50dcc3d2cef1eeca80c38a3213fc5d44537ee97276d538996c609b703dd954ceb1bff366bf060e51159505341d51dcbfac707
-  data.tar.gz: c1eb147f0e416a3f04911f208c23e825cf83530b3d83f392a5dac9382e7cba3d2a868c42c77021a2908ff57f04327152f97861c3de72b482842a6ba507dff3c5
+  metadata.gz: 73f76ef17b727d6632a3ab893fad0c222b938e2bee87b92d47bfbdbbfd6e362fe2dfdfcd074ef3112aaf4edf5a9e8e055bdf1f3be05bced91e84c6e46a01de26
+  data.tar.gz: eb2275e0b716d9acb7338ed8f6728161f6a32933bf058b6795c2b31c70c28bf6be4f861d7171f0bb459b36c2f4feabffc67a04e10e7f29c3115dcda74d308c4f

data/lib/sqlpp/ast.rb

@@ -3,7 +3,7 @@ module SQLPP
     class Select < Struct.new(:projections, :froms, :wheres, :groups, :orders, :distinct, :limit, :offset)
     end
 
-    class Expr < Struct.new(:left, :op, :right)
+    class Expr < Struct.new(:left, :op, :right, :not)
     end
 
     class Unary < Struct.new(:op, :expr)
@@ -32,5 +32,11 @@ module SQLPP
 
     class Offset < Struct.new(:expr)
     end
+
+    class Subscript < Struct.new(:left, :right)
+    end
+
+    class TypeCast < Struct.new(:value, :type)
+    end
   end
 end

data/lib/sqlpp/formatter.rb

@@ -85,6 +85,7 @@ module SQLPP
           output << " "
         end
 
+        output << "NOT " if node.not
         output << op << " "
         output << format(node.right)
       end
@@ -164,7 +165,7 @@ module SQLPP
 
       if node.options.any?
         output << " "
-        output << node.options.map { |opt| opt.upcase }.join(", ")
+        output << node.options.map { |opt| opt.upcase }.join(" ")
       end
 
       output
@@ -182,6 +183,17 @@ module SQLPP
       string
     end
 
+    def _format_Subscript(node)
+      output = ""
+      output << format(node.left)
+      output << "[" << format(node.right) << "]"
+      output
+    end
+
+    def _format_TypeCast(node)
+      format(node.value) << '::' << format(node.type)
+    end
+
     def _indent
       " " * (@indent || 0)
     end

data/lib/sqlpp/parser.rb

@@ -65,10 +65,14 @@ require 'sqlpp/ast'
 #
 # op := 'AND' | 'OR' | 'IS' | 'IS NOT'
 #
-# expr2 := expr3
-#        | expr3 'BETWEEN' expr3 AND expr3
-#        | expr3 'IN' '(' list ')'
-#        | expr3 bop expr3
+# expr2 := expr3 optional_op
+#
+# optional_op := ''
+#              | 'NOT' optional_op
+#              | 'BETWEEN' expr3 AND expr3
+#              | 'NOT IN' '(' list ')'
+#              | 'IN' '(' list ')'
+#              | bop expr3
 #
 # bop := '<' | '<=' | '<>' | '=' | '>=' | '>'
 #
@@ -86,6 +90,8 @@ require 'sqlpp/ast'
 #        | id '(' args ')'
 #        | 'CASE' case_stmt 'END'
 #        | '(' expr1 ')'
+#        | expr4 '[' expr1 ']'
+#        | expr4 '::' expr4
 #
 # list := expr1
 #       | expr1 ',' list
@@ -338,6 +344,9 @@ module SQLPP
       left = _parse_expr3
       _eat :space
 
+      not_kw = _eat(:key, :not)
+      _eat :space if not_kw
+
       if (op = _eat(:key, :between))
         op = op.text
 
@@ -368,7 +377,9 @@ module SQLPP
       end
 
       if right
-        AST::Expr.new(left, op, right)
+        AST::Expr.new(left, op, right, not_kw != nil)
+      elsif not_kw
+        raise UnexpectedToken, "got #{not_kw.inspect}"
       else
         left
       end
@@ -385,6 +396,23 @@ module SQLPP
         atom = _parse_atom
         _eat :space
 
+        if _eat(:punct, "[")
+          subscript = _parse_expr1
+          _eat :space
+          _expect(:punct, "]")
+          _eat :space
+
+          atom = AST::Subscript.new(atom, subscript)
+        end
+
+        if _eat(:punct, "::")
+          _eat :space
+          type = _parse_atom
+          _eat :space
+
+          atom = AST::TypeCast.new(atom, type)
+        end
+
         if (op = _eat(:punct, /[-+*\/]/))
           _eat :space
           AST::Expr.new(atom, op.text, _parse_expr3)
@@ -398,7 +426,7 @@ module SQLPP
       if (lit = _eat(:lit))
         AST::Atom.new(:lit, lit.text)
 
-      elsif (key = _eat(:key, :case))
+      elsif _eat(:key, :case)
         _parse_case
 
       elsif _eat(:punct, "(")
@@ -470,6 +498,7 @@ module SQLPP
     def _parse_list
       _eat :space
       args = []
+      return args if _peek(:punct, ')')
 
       loop do
         args << _parse_expr1

data/lib/sqlpp/tokenizer.rb

@@ -85,9 +85,9 @@ module SQLPP
         Token.new(:lit, num, pos)
       elsif (id = @scanner.scan(/\w+/))
         Token.new(:id, id, pos)
-      elsif (punct = @scanner.scan(/<=|<>|!=|>=/))
+      elsif (punct = @scanner.scan(/<=|<>|!=|>=|::/))
         Token.new(:punct, punct, pos)
-      elsif (punct = @scanner.scan(/[<>=\(\).*,\/+\-]/))
+      elsif (punct = @scanner.scan(/[<>=\(\).*,\/+\-\[\]]/))
         Token.new(:punct, punct, pos)
       elsif (delim = @scanner.scan(/["`]/))
         contents = _scan_to_delim(delim, pos)

data/lib/sqlpp/version.rb

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

data/test/formatter_test.rb

@@ -85,6 +85,31 @@ LIMIT 10 OFFSET 5
     SQL
   end
 
+  def test_format_NOT_expr
+    ast = _parser("select * from foo where x not in (5, 6)").parse
+    assert_equal <<-SQL, _format(ast)
+SELECT *
+FROM foo
+WHERE x NOT IN (5, 6)
+    SQL
+  end
+
+  def test_format_subscript_in_expr
+    ast = _parser("select (array_agg(x))[0] from foo").parse
+    assert_equal <<-SQL, _format(ast)
+SELECT (array_agg(x))[0]
+FROM foo
+    SQL
+  end
+
+  def test_format_double_colon_typecast
+    ast = _parser("select 'month'::interval from foo").parse
+    assert_equal <<-SQL, _format(ast)
+SELECT 'month'::interval
+FROM foo
+    SQL
+  end
+
   def _parser(string)
     SQLPP::Parser.new(string)
   end

data/test/parser_test.rb

@@ -309,6 +309,41 @@ class ParserTest < Minitest::Test
     assert_equal "5", s.offset.expr.left
   end
 
+  def test_accepts_not_in_syntax
+    s = _parser("select * from x where x.id not in (5)").parse_select
+    assert s.wheres.not
+  end
+
+  def test_accepts_array_subscript_in_expression
+    expr = _parser("a[5]").parse_expression
+    assert_instance_of SQLPP::AST::Subscript, expr
+    assert_instance_of SQLPP::AST::Atom, expr.left
+    assert_instance_of SQLPP::AST::Atom, expr.right
+    assert_equal :attr, expr.left.type
+    assert_equal "a", expr.left.left
+    assert_equal :lit, expr.right.type
+    assert_equal "5", expr.right.left
+  end
+
+  def test_accepts_double_colon_as_typecast
+    expr = _parser("'month'::INTERVAL").parse_expression
+    assert_instance_of SQLPP::AST::TypeCast, expr
+    assert_instance_of SQLPP::AST::Atom, expr.value
+    assert_instance_of SQLPP::AST::Atom, expr.type
+    assert_equal :lit, expr.value.type
+    assert_equal "'month'", expr.value.left
+    assert_equal :attr, expr.type.type
+    assert_equal "INTERVAL", expr.type.left
+  end
+
+  def test_accept_empty_parameter_list
+    expr = _parser("NOW()").parse_expression
+    assert_instance_of SQLPP::AST::Atom, expr
+    assert_equal :func, expr.type
+    assert_equal "NOW", expr.left
+    assert_equal 0, expr.right.count
+  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.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jamis Buck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake