improve sql server parser

2023-03-04 19:17:16 +00:00 · 2013-01-12 19:07:34 +08:00
parent 42005992c0
commit e20247c503
22 changed files with 500 additions and 43 deletions
@@ -26,13 +26,13 @@ public class SQLServerSelectQueryBlock extends SQLSelectQueryBlock {
     */
    private static final long serialVersionUID = 1L;

-    private Top               top;
+    private SQLServerTop               top;

-    public Top getTop() {
+    public SQLServerTop getTop() {
        return top;
    }

-    public void setTop(Top top) {
+    public void setTop(SQLServerTop top) {
        this.top = top;
    }

@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.sqlserver.ast;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor;

-public class Top extends SQLServerObjectImpl {
+public class SQLServerTop extends SQLServerObjectImpl {

    /**
     * 
@@ -18,24 +18,33 @@ package com.alibaba.druid.sql.dialect.sqlserver.ast.stmt;
 import com.alibaba.druid.sql.ast.statement.SQLTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerStatement;
+import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
 import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;

 public class SQLServerUpdateStatement extends SQLUpdateStatement implements SQLServerStatement {
-    private static final long serialVersionUID = 1L;
-    
-    private SQLTableSource from;

+    private static final long serialVersionUID = 1L;
+
+    private SQLServerTop      top;
+    private SQLTableSource    from;
    
+    public SQLServerTop getTop() {
+        return top;
+    }
+    
+    public void setTop(SQLServerTop top) {
+        this.top = top;
+    }
+
    public SQLTableSource getFrom() {
        return from;
    }

-    
    public void setFrom(SQLTableSource from) {
        this.from = from;
    }
-    
+
    @Override
    protected void accept0(SQLASTVisitor visitor) {
        this.accept0((SQLServerASTVisitor) visitor);
@@ -44,6 +53,7 @@ public class SQLServerUpdateStatement extends SQLUpdateStatement implements SQLS
    @Override
    public void accept0(SQLServerASTVisitor visitor) {
        if (visitor.visit(this)) {
+            acceptChild(visitor, top);
            acceptChild(visitor, tableSource);
            acceptChild(visitor, items);
            acceptChild(visitor, from);
@@ -51,5 +61,5 @@ public class SQLServerUpdateStatement extends SQLUpdateStatement implements SQLS
        }
        visitor.endVisit(this);
    }
-    
+
 }
@@ -18,6 +18,7 @@ package com.alibaba.druid.sql.dialect.sqlserver.parser;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLName;
 import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
+import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.expr.SQLServerObjectReferenceExpr;
 import com.alibaba.druid.sql.parser.Lexer;
 import com.alibaba.druid.sql.parser.SQLExprParser;
@@ -106,4 +107,27 @@ public class SQLServerExprParser extends SQLExprParser {

        return false;
    }
+    
+    public SQLServerTop parseTop() {
+        if (lexer.token() == Token.TOP) {
+            SQLServerTop top = new SQLServerTop();
+            lexer.nextToken();
+            
+            boolean paren = false;
+            if (lexer.token() == Token.LPAREN) {
+                paren = true;
+                lexer.nextToken();
+            }
+            
+            top.setExpr(primary());
+            
+            if (paren) {
+                accept(Token.RPAREN);
+            }
+            
+            return top;
+        }
+        
+        return null;
+    }
 }
@@ -16,6 +16,7 @@
 package com.alibaba.druid.sql.dialect.sqlserver.parser;

 import static com.alibaba.druid.sql.parser.LayoutCharacters.EOI;
+import static com.alibaba.druid.sql.parser.Token.IDENTIFIER;

 import java.util.HashMap;
 import java.util.Map;
@@ -142,4 +143,35 @@ public class SQLServerLexer extends Lexer {
            return;
        }
    }
+    
+    protected void scanLBracket() {
+        mark = pos;
+
+        if (buf == null) {
+            buf = new char[32];
+        }
+
+        for (;;) {
+            if (isEOF()) {
+                lexError("unclosed.str.lit");
+                return;
+            }
+
+            ch = charAt(++pos);
+
+            if (ch == ']') {
+                scanChar();
+                token = IDENTIFIER;
+                break;
+            }
+
+            if (bufPos == buf.length) {
+                putChar(ch);
+            } else {
+                buf[bufPos++] = ch;
+            }
+        }
+
+        stringVal = subString(mark, bufPos + 2);
+    }
 }
@@ -16,11 +16,13 @@
 package com.alibaba.druid.sql.dialect.sqlserver.parser;

 import com.alibaba.druid.sql.ast.SQLSetQuantifier;
+import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLSelect;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
+import com.alibaba.druid.sql.ast.statement.SQLTableSource;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelect;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.Top;
+import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
 import com.alibaba.druid.sql.parser.SQLExprParser;
 import com.alibaba.druid.sql.parser.SQLSelectParser;
 import com.alibaba.druid.sql.parser.Token;
@@ -74,7 +76,7 @@ public class SQLServerSelectParser extends SQLSelectParser {
            }

            if (lexer.token() == Token.TOP) {
-                Top top = new Top();
+                SQLServerTop top = new SQLServerTop();
                lexer.nextToken();
                top.setExpr(createExprParser().primary());
                queryBlock.setTop(top);
@@ -82,6 +84,13 @@ public class SQLServerSelectParser extends SQLSelectParser {

            parseSelectList(queryBlock);
        }
+        
+        if (lexer.token() == Token.INTO) {
+            lexer.nextToken();
+            
+            SQLTableSource into = this.parseTableSource();
+            queryBlock.setInto((SQLExprTableSource) into);
+        }

        parseFrom(queryBlock);

@@ -24,6 +24,7 @@ import com.alibaba.druid.sql.ast.statement.SQLInsertInto;
 import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
 import com.alibaba.druid.sql.ast.statement.SQLTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
+import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerUpdateStatement;
 import com.alibaba.druid.sql.parser.Lexer;
@@ -36,7 +37,7 @@ public class SQLServerStatementParser extends SQLStatementParser {
    public SQLServerStatementParser(String sql){
        super(new SQLServerExprParser(sql));
    }
-    
+
    public SQLSelectParser createSQLSelectParser() {
        return new SQLServerSelectParser(this.exprParser);
    }
@@ -44,7 +45,7 @@ public class SQLServerStatementParser extends SQLStatementParser {
    public SQLServerStatementParser(Lexer lexer){
        super(new SQLServerExprParser(lexer));
    }
-    
+
    public boolean parseStatementListDialect(List<SQLStatement> statementList) {
        if (lexer.token() == Token.WITH) {
            SQLStatement stmt = parseSelect();
@@ -54,7 +55,7 @@ public class SQLServerStatementParser extends SQLStatementParser {

        return false;
    }
-    
+
    public SQLStatement parseInsert() {
        SQLServerInsertStatement insertStatement = new SQLServerInsertStatement();

@@ -68,7 +69,7 @@ public class SQLServerStatementParser extends SQLStatementParser {

    protected void parseInsert0(SQLInsertInto insert, boolean acceptSubQuery) {
        SQLServerInsertStatement insertStatement = (SQLServerInsertStatement) insert;
-        
+
        if (lexer.token() == Token.INTO) {
            lexer.nextToken();

@@ -115,29 +116,32 @@ public class SQLServerStatementParser extends SQLStatementParser {
            insertStatement.setQuery(queryExpr.getSubQuery());
        }
    }
-    
+
    protected SQLServerUpdateStatement createUpdateStatement() {
        return new SQLServerUpdateStatement();
    }
-    
+
    public SQLUpdateStatement parseUpdateStatement() {
        SQLServerUpdateStatement udpateStatement = createUpdateStatement();

-        if (lexer.token() == Token.UPDATE) {
-            lexer.nextToken();
-
-            SQLTableSource tableSource = this.exprParser.createSelectParser().parseTableSource();
-            udpateStatement.setTableSource(tableSource);
+        accept(Token.UPDATE);
+        
+        SQLServerTop top = this.getExprParser().parseTop();
+        if (top != null) {
+            udpateStatement.setTop(top);
        }

+        SQLTableSource tableSource = this.exprParser.createSelectParser().parseTableSource();
+        udpateStatement.setTableSource(tableSource);
+
        parseUpdateSet(udpateStatement);
-        
+
        if (lexer.token() == Token.FROM) {
            lexer.nextToken();
            SQLTableSource from = this.exprParser.createSelectParser().parseTableSource();
            udpateStatement.setFrom(from);
        }
-        
+
        if (lexer.token() == (Token.WHERE)) {
            lexer.nextToken();
            udpateStatement.setWhere(this.exprParser.expr());
@@ -145,4 +149,8 @@ public class SQLServerStatementParser extends SQLStatementParser {

        return udpateStatement;
    }
+    
+    public SQLServerExprParser getExprParser() {
+        return (SQLServerExprParser) exprParser;
+    }
 }
@@ -16,7 +16,7 @@
 package com.alibaba.druid.sql.dialect.sqlserver.visitor;

 import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.Top;
+import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.expr.SQLServerObjectReferenceExpr;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerUpdateStatement;
@@ -28,9 +28,9 @@ public interface SQLServerASTVisitor extends SQLASTVisitor {

    void endVisit(SQLServerSelectQueryBlock x);

-    boolean visit(Top x);
+    boolean visit(SQLServerTop x);

-    void endVisit(Top x);
+    void endVisit(SQLServerTop x);
    
    boolean visit(SQLServerObjectReferenceExpr x);
    
@@ -16,7 +16,7 @@
 package com.alibaba.druid.sql.dialect.sqlserver.visitor;

 import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.Top;
+import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.expr.SQLServerObjectReferenceExpr;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerUpdateStatement;
@@ -35,12 +35,12 @@ public class SQLServerASTVisitorAdapter extends SQLASTVisitorAdapter implements
    }

    @Override
-    public boolean visit(Top x) {
+    public boolean visit(SQLServerTop x) {
        return true;
    }

    @Override
-    public void endVisit(Top x) {
+    public void endVisit(SQLServerTop x) {

    }
    
@@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.sqlserver.visitor;

 import com.alibaba.druid.sql.ast.SQLSetQuantifier;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.Top;
+import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.expr.SQLServerObjectReferenceExpr;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerUpdateStatement;
@@ -42,9 +42,16 @@ public class SQLServerOutputVisitor extends SQLASTOutputVisitor implements SQLSe

        if (x.getTop() != null) {
            x.getTop().accept(this);
+            print(' ');
        }

        printSelectList(x.getSelectList());
+        
+        if (x.getInto() != null) {
+            println();
+            print("INTO ");
+            x.getInto().accept(this);
+        }

        if (x.getFrom() != null) {
            println();
@@ -73,15 +80,27 @@ public class SQLServerOutputVisitor extends SQLASTOutputVisitor implements SQLSe
    }

    @Override
-    public boolean visit(Top x) {
+    public boolean visit(SQLServerTop x) {
        print("TOP ");
+        
+        boolean paren = false;
+        
+        if (x.getParent() instanceof SQLServerUpdateStatement) {
+            paren = true;
+            print("(");
+        }
+        
        x.getExpr().accept(this);
-        print(" ");
+        
+        if (paren) {
+            print(")");
+        }
+        
        return false;
    }

    @Override
-    public void endVisit(Top x) {
+    public void endVisit(SQLServerTop x) {

    }

@@ -148,6 +167,12 @@ public class SQLServerOutputVisitor extends SQLASTOutputVisitor implements SQLSe
    @Override
    public boolean visit(SQLServerUpdateStatement x) {
        print("UPDATE ");
+        
+        if (x.getTop() != null) {
+            x.getTop().setParent(x);
+            x.getTop().accept(this);
+            print(' ');
+        }

        x.getTableSource().accept(this);

@@ -20,7 +20,7 @@ import java.util.Map;
 import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.Top;
+import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.expr.SQLServerObjectReferenceExpr;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerUpdateStatement;
@@ -47,12 +47,12 @@ public class SQLServerSchemaStatVisitor extends SchemaStatVisitor implements SQL
    }

    @Override
-    public boolean visit(Top x) {
+    public boolean visit(SQLServerTop x) {
        return false;
    }

    @Override
-    public void endVisit(Top x) {
+    public void endVisit(SQLServerTop x) {
        
    }