anbt-sql-formatter 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4680b59adee7c6d2e6bcb649d73b095d3bbcd3d102f8517d50acefc89dfe089
-  data.tar.gz: dac35873e1d94941ec19156d2738fe75c1b0e156e2357cc1a10e263157c253c6
+  metadata.gz: 06d3d110d976d89ae531994e7a2e504028deb41c7e0576ad977445dd12a40e97
+  data.tar.gz: 07754a3a2b3169853345b4ead8f2290f0b4279bd913359b637c2e2d87994cb80
 SHA512:
-  metadata.gz: 52692fbb602a719f52a13077bd72b7a4c8d065ba484c6fbd141f928ad3987364dd3517c6fd7d66f9283acee8ecf8fd7033d2df467ffe6a5e0aa4f9e401b7cc6d
-  data.tar.gz: dcc161a7b754fd3937dfa8c799950aba2ea88a1db9990f38fb4e51ff6cb69e6c07ce619bd4843dba358e93f31d3787ba231ca076fbbdcd0216b224628f802b18
+  metadata.gz: 760fa7076565da7636d4dd0659a7ac7f6651e61e50860b7b61cb1fdeac45a0d7836a0c3a3b832bc32b4eb8bcd939eff2e37135b0508822f028f72c4a5753ecd6
+  data.tar.gz: 3deda4f2457c216382e8c64d9343af513e60d762af57ab39f047a3b282756833ea7542b45d309375fa34f17ef4a5421ac57aee08c1c7439c94d6dcefed7c03cc

data/CHANGELOG.md

@@ -1,8 +1,33 @@
+# 0.1.0 (2018-12-16)
+
+## Breaking changes
+
+- Support `"{schema}"."{table}"` notation.
+  - Tokenize as a single name token. This affects formatter output:
+
+```
+echo 'select a from b.c, "d"."e"' | bin/anbt-sql-formatter
+
+(before)
+SELECT
+        a
+    FROM
+        b.c
+        ,"d" . "e"
+
+(after)
+SELECT
+        a
+    FROM
+        b.c
+        ,"d"."e"
+```
+
 # 0.0.7 (2018-08-11)
 
 No breaking changes.
 
-## Feattues
+## Features
 
 - New configuration parameter `Rule#in_values_num`
   for controlling number of values in IN clause per line.

data/{readme.ja.txt → README.ja.rdoc}

@@ -1,6 +1,6 @@
 = anbt-sql-formatter
 
-(C) 2010 sonota <yosiot8753@gmail.com>
+(C) 2010-2018 sonota88 <yosiot8753@gmail.com>
 
 
 == 概要
@@ -95,7 +95,7 @@ sonota:: Ruby へ移植
 
 == テスト
 
- $ ruby setup.rb test
+ $ ./test.sh
 
 
 == その他

data/{readme.txt → README.rdoc}

@@ -1,6 +1,6 @@
 = anbt-sql-formatter
 
-(C) 2010 sonota (yosiot8753@gmail.com)
+(C) 2010-2018 sonota88 (yosiot8753@gmail.com)
 
 
 == Description
@@ -55,4 +55,4 @@ Following are Authors of BlancoSqlFormatter(original Java version).
 
 == Test
 
- $ ruby setup.rb test
+ $ ./test.sh

data/lib/anbt-sql-formatter/coarse-tokenizer.rb

@@ -64,7 +64,9 @@ These are exclusive:
         ## end double quote
          
         length = $1.size
-        if /\A("")/ =~ str ## escaped double quote
+        if /\A(".")/ =~ str ## schema.table
+          shift_to_buf(3)
+        elsif /\A("")/ =~ str ## escaped double quote
           shift_to_buf(2)
         else
           shift_token(length, :quote_double, :plain, :end)

data/lib/anbt-sql-formatter/version.rb

@@ -1,7 +1,7 @@
 module Anbt
   module Sql
     module Formatter
-      VERSION = "0.0.7"
+      VERSION = "0.1.0"
     end
   end
 end

data/sample.sql

@@ -118,3 +118,7 @@ foobar(a)
 foobar(a,b)
 ;
 
+--------------------------------
+-- {schema}.{table}, {table}.{column}
+select t1.a, `t2`.`b`, "t3"."c"
+from schema.t1, `schema`.`t2`, "schema"."t3"

data/test.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -o errexit
+
+(
+  cd test
+  for file in $(ls test_*.rb); do
+    ruby $file
+  done
+)

data/test/test_parser.rb

@@ -303,6 +303,36 @@ class TestAnbtSqlParser < Test::Unit::TestCase
       )))
     )
 
+    ########
+    assert_equals(
+      msg + "double-quoted schema and table",
+      strip_indent(
+        <<-EOB
+        name ("admin"."test")
+        EOB
+      ),
+      _format( @parser.parse( strip_indent(
+        <<-EOB
+        "admin"."test"
+        EOB
+      )))
+    )
+
+    ########
+    assert_equals(
+      msg + "minus + non-number",
+      strip_indent(
+        <<-EOB
+        name ("admin"."test")
+        EOB
+      ),
+      _format( @parser.parse( strip_indent(
+        <<-EOB
+        "admin"."test"
+        EOB
+      )))
+    )
+
     ########
     assert_equals(
       msg + "minus + non-number",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anbt-sql-formatter
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - sonota88
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies: []
 description: A tool for SQL formatting written in Ruby. Ruby port of Blanco SQL Formatter.
 email:
@@ -21,6 +21,8 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
+- README.ja.rdoc
+- README.rdoc
 - Rakefile
 - anbt-sql-formatter.gemspec
 - bin/anbt-sql-formatter
@@ -37,10 +39,9 @@ files:
 - lib/anbt-sql-formatter/version.rb
 - misc/anbt-sql-formatter-customize-example
 - misc/anbt-sql-formatter-for-sakura-editor.js
-- readme.ja.txt
-- readme.txt
 - sample.sql
 - setup.rb
+- test.sh
 - test/helper.rb
 - test/test_coarse-tokenizer.rb
 - test/test_formatter.rb