sqlpp 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d6f928aab73c2d65cf5eefc714dfac7f441641
-  data.tar.gz: df2f51ed9d6aef74270f7dfb64322154d94dc0b3
+  metadata.gz: 6d62b8130206d11428dd96ac48cf586e41cfe9e1
+  data.tar.gz: 7b6e86ff2aed7c3245191b01a8054b8f4999634d
 SHA512:
-  metadata.gz: dda5183a4e28c854494b164f6a725a2e35f788c1def25f256693f557cb9cdf2a95f49915d8ceb2d6c4a3491b81634f1253c30989cd913047b90597f42e39366a
-  data.tar.gz: 980e4630ec6de08556260f31ac361366b14a250f3ee8af89d77cbbc96c734e2a4d3426d3e0e283feb9f1e3f690d2d2e71898e6fb1e17545c142c45efd24cb6c1
+  metadata.gz: 5e0116eb2ab2a16df63333e01959c71016d2f7ef93811ff3cbfe34f41058fbe96e2d196ff9b8765fc905cae61aa48902df4416ee7c1c6373fa901b83bd26b5d1
+  data.tar.gz: 73fb8adc6a50638cac01e08d1419bebe200cc7f85e16cddd77e1abf4d931c0e92d3dd9e012da8e56d96415ba62c2367053e1d4ec1e5168b52036bfe724250d43

data/README.md

@@ -11,12 +11,24 @@ sql = "..."
 ast = SQLPP::Parser.parse(sql)
 
 puts SQLPP::Formatter.new.format(ast)
+
+# or, to wrap projection lists...
+puts SQLPP::Formatter.new(projections: :wrap).format(ast)
 ```
 
 Or, you can use the included `bin/sqlpp` script to format SQL via STDIN:
 
 ```sh
-$ sqlpp < query.sql
+$ sqlpp -h
+SQLPP (SQL Pretty Printer)
+
+Usage: sqlpp -h -? -wp < SQL
+
+ -h or -?: this list of options
+ -wp: wrap the projection lists
+
+$ sqlpp -wp < query.sql
+...
 ```
 
 ## Output

data/bin/sqlpp

@@ -4,5 +4,18 @@ require 'sqlpp'
 
 sql = STDIN.read
 
+if ARGV.grep(/^-[h?]$/).any?
+  puts "SQLPP (SQL Pretty Printer)"
+  puts
+  puts "Usage: #{$0} -h -? -wp < SQL"
+  puts
+  puts " -h or -?: this list of options"
+  puts " -wp: wrap the projection lists"
+  puts
+  exit
+end
+
+projections = ARGV.include?("-wp") ? :wrap : nil
+
 ast = SQLPP::Parser.parse(sql)
-puts SQLPP::Formatter.new.format(ast)
+puts SQLPP::Formatter.new(projections: projections).format(ast)

data/lib/sqlpp/formatter.rb

@@ -1,8 +1,10 @@
 module SQLPP
   class Formatter
-    def initialize
+    def initialize(projections: nil)
       @indent = nil
       @state = nil
+
+      @projections = projections
     end
 
     def format(node)
@@ -20,8 +22,10 @@ module SQLPP
         output << "\n"
       end
 
-      output << "#{_indent}SELECT "
-      output << node.projections.map { |c| format(c) }.join(", ")
+      output << (select = "#{_indent}SELECT ")
+      link = ","
+      link << ((@projections == :wrap) ? "\n#{" " * select.length}" : " ")
+      output << node.projections.map { |c| format(c) }.join(link)
       output << "\n"
 
       if node.froms

data/lib/sqlpp/tokenizer.rb

@@ -86,9 +86,9 @@ module SQLPP
         Token.new(:punct, punct, pos)
       elsif (punct = @scanner.scan(/[<>=\(\).*,\/+\-]/))
         Token.new(:punct, punct, pos)
-      elsif @scanner.scan(/"/)
-        contents = _scan_to_delim('"', pos)
-        Token.new(:id, "\"#{contents}\"", pos)
+      elsif (delim = @scanner.scan(/["`]/))
+        contents = _scan_to_delim(delim, pos)
+        Token.new(:id, "#{delim}#{contents}#{delim}", pos)
       elsif @scanner.scan(/'/)
         contents = _scan_to_delim("'", pos)
         Token.new(:lit, "'#{contents}'", pos)
@@ -100,14 +100,17 @@ module SQLPP
     end
 
     def _scan_to_delim(delim, pos)
+      escape, if_peek = case delim
+        when '"', '`' then ["\\", nil]
+        when "'" then ["'", "'"]
+      end
+
       string = ""
       loop do
         ch = @scanner.getch
 
-        if delim == '"' && ch == "\\"
+        if ch == escape && (if_peek.nil? || @scanner.peek(1) == if_peek)
           ch << @scanner.getch
-        elsif delim == "'" && ch == "'"
-          ch << @scanner.getch if @scanner.peek(1) == "'"
         end
 
         case ch

data/lib/sqlpp/version.rb

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

data/test/formatter_test.rb

@@ -31,11 +31,22 @@ ORDER BY z ASC
 SQL
   end
 
+  def test_format_wrap_projections
+    ast = _parser("select a, b, c, d from foo").parse
+    assert_equal <<-SQL, _format(ast, projections: :wrap)
+SELECT a,
+       b,
+       c,
+       d
+FROM foo
+    SQL
+  end
+
   def _parser(string)
     SQLPP::Parser.new(string)
   end
 
-  def _format(ast)
-    SQLPP::Formatter.new.format(ast)
+  def _format(ast, options={})
+    SQLPP::Formatter.new(options).format(ast)
   end
 end

data/test/tokenizer_test.rb

@@ -41,7 +41,7 @@ class TokenizerTest < Minitest::Test
   end
 
   def test_it_should_recognize_identifiers
-    _setup_tokenizer "word word123 \"quoted word\" \"with \\\"escape\\\" word\""
+    _setup_tokenizer "word word123 \"quoted word\" \"with \\\"escape\\\" word\" `mysql word` `mysql \\`escape\\` word`"
 
     assert_token _next, type: :id, text: "word"
     _skip :space
@@ -50,6 +50,10 @@ class TokenizerTest < Minitest::Test
     assert_token _next, type: :id, text: '"quoted word"'
     _skip :space
     assert_token _next, type: :id, text: '"with \"escape\" word"'
+    _skip :space
+    assert_token _next, type: :id, text: '`mysql word`'
+    _skip :space
+    assert_token _next, type: :id, text: '`mysql \`escape\` word`'
   end
 
   def test_it_should_recognize_number_literals

metadata

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