improved sql format output

2023-03-04 19:17:16 +00:00 · 2015-07-11 14:27:29 +08:00
parent 60b7139911
commit b36374f7bf
26 changed files with 612 additions and 35 deletions
@@ -1179,6 +1179,10 @@ public class SQLExprParser extends SQLParser {
    public SQLExpr andRest(SQLExpr expr) {
        for (;;) {
            if (lexer.token() == Token.AND || lexer.token() == Token.AMPAMP) {
+                if (lexer.isKeepComments() && lexer.hasComment()) {
+                    expr.addAfterComment(lexer.commentVal());
+                }
+                
                lexer.nextToken();
                SQLExpr rightExp = relational();

@@ -1682,7 +1686,12 @@ public class SQLExprParser extends SQLParser {
            item.setValue(new SQLIdentifierExpr(lexer.stringVal()));
            lexer.nextToken();
        } else {
-            item.setValue(expr());
+            if (lexer.token() == Token.ALL) {
+                item.setValue(new SQLIdentifierExpr(lexer.stringVal()));
+                lexer.nextToken();
+            } else {
+                item.setValue(expr());
+            }
        }
        
        return item;