Add oscar parser support

lulu2panpan · Aug 29, 2022 · 64230b8 · 64230b8
1 parent 423cdf0
commit 64230b8
Show file tree

Hide file tree

Showing 24 changed files with 27 additions and 72 deletions.
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/OscarObject.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/OscarObject.java
@@ -19,6 +19,5 @@
 import com.alibaba.druid.sql.dialect.oscar.visitor.OscarASTVisitor;
 
 public interface OscarObject extends SQLObject {
-
     void accept0(OscarASTVisitor visitor);
 }
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/OscarObjectImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/OscarObjectImpl.java
@@ -20,9 +20,7 @@
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public abstract class OscarObjectImpl extends SQLObjectImpl implements OscarObject {
-
     public OscarObjectImpl() {
-
     }
 
     @Override

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/OscarTop.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/OscarTop.java
@@ -20,18 +20,15 @@
 import com.alibaba.druid.sql.dialect.oscar.visitor.OscarASTVisitor;
 
 public class OscarTop extends OscarObjectImpl {
-
     private SQLExpr expr;
     private boolean percent;
     private boolean withTies;
 
     public OscarTop() {
-
     }
 
     @Override
     public void accept0(OscarASTVisitor visitor) {
-
     }
 
     public OscarTop(SQLExpr expr) {
@@ -69,7 +66,6 @@ public void setWithTies(boolean withTies) {
         this.withTies = withTies;
     }
 
-
     public OscarTop clone() {
         OscarTop x = new OscarTop();
         if (expr != null) {

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/expr/OscarExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/expr/OscarExpr.java
@@ -19,5 +19,4 @@
 import com.alibaba.druid.sql.dialect.oscar.ast.OscarObject;
 
 public interface OscarExpr extends SQLExpr, OscarObject {
-
 }
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarAlterSchemaStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarAlterSchemaStatement.java
@@ -23,7 +23,6 @@
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public class OscarAlterSchemaStatement extends SQLStatementImpl implements OscarStatement, SQLAlterStatement {
-
     private SQLIdentifierExpr schemaName;
     private SQLIdentifierExpr newName;
     private SQLIdentifierExpr newOwner;

diff --git a/...va/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarAlterTableAlterColumnSetNotNull.java b/...va/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarAlterTableAlterColumnSetNotNull.java
@@ -15,7 +15,5 @@
  */
 package com.alibaba.druid.sql.dialect.oscar.ast.stmt;
 
-
 public class OscarAlterTableAlterColumnSetNotNull {
-
 }
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarCreateSchemaStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarCreateSchemaStatement.java
@@ -23,7 +23,6 @@
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public class OscarCreateSchemaStatement extends SQLStatementImpl implements OscarStatement, SQLCreateStatement {
-
     private SQLIdentifierExpr schemaName;
     private SQLIdentifierExpr userName;
     private boolean ifNotExists;

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarDeleteStatement.java
@@ -22,7 +22,6 @@
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public class OscarDeleteStatement extends SQLDeleteStatement implements OscarStatement {
-
     private boolean returning;
 
     public OscarDeleteStatement() {

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarDropSchemaStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarDropSchemaStatement.java
@@ -23,7 +23,6 @@
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public class OscarDropSchemaStatement extends SQLStatementImpl implements OscarStatement, SQLDropStatement {
-
     private SQLIdentifierExpr schemaName;
     private boolean ifExists;
     private boolean cascade;

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarFunctionTableSource.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarFunctionTableSource.java
@@ -29,11 +29,9 @@
 import java.util.List;
 
 public class OscarFunctionTableSource extends SQLExprTableSource implements OscarObject {
-
     private final List<SQLParameter> parameters = new ArrayList<SQLParameter>();
 
     public OscarFunctionTableSource() {
-
     }
 
     public OscarFunctionTableSource(SQLExpr expr) {
@@ -59,7 +57,6 @@ public void accept0(OscarASTVisitor visitor) {
 
     @Override
     public PGFunctionTableSource clone() {
-
         PGFunctionTableSource x = new PGFunctionTableSource();
 
         x.setAlias(this.alias);

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarInsertStatement.java
@@ -30,8 +30,6 @@
 import java.util.List;
 
 public class OscarInsertStatement extends SQLInsertStatement implements OscarStatement {
-
-
     private List<ValuesClause> valuesList = new ArrayList<ValuesClause>();
     private SQLExpr returning;
     private boolean defaultValues;
@@ -68,7 +66,6 @@ public void setReturning(SQLExpr returning) {
         this.returning = returning;
     }
 
-
     public ValuesClause getValues() {
         if (valuesList.isEmpty()) {
             return null;

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarSelectQueryBlock.java
@@ -29,7 +29,6 @@
 import java.util.List;
 
 public class OscarSelectQueryBlock extends SQLSelectQueryBlock implements OscarObject {
-
     private List<SQLExpr> distinctOn = new ArrayList<SQLExpr>(2);
 
     private OscarTop top;
@@ -39,7 +38,6 @@ public class OscarSelectQueryBlock extends SQLSelectQueryBlock implements OscarO
     private IntoOptionTemp intoOptionTemp;
     private IntoOptionLocal intoOptionLocal;
 
-
     @Override
     public void accept0(OscarASTVisitor visitor) {
         if (visitor.visit(this)) {
@@ -121,7 +119,6 @@ public void setDistinctOn(List<SQLExpr> distinctOn) {
     }
 
     public static class FetchClause extends OscarObjectImpl {
-
         public static enum Option {
             FIRST, NEXT
         }
@@ -166,14 +163,11 @@ public OscarTop getTop() {
         return top;
     }
 
-
     public void setTop(int rowCount) {
         setTop(new OscarTop(new SQLIntegerExpr(rowCount)));
     }
 
-
     public static class ForClause extends OscarObjectImpl {
-
         public static enum Option {
             UPDATE, SHARE
         }
@@ -223,7 +217,4 @@ public void accept0(OscarASTVisitor visitor) {
             visitor.endVisit(this);
         }
     }
-
-
-
 }
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarSelectStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarSelectStatement.java
@@ -22,7 +22,6 @@
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public class OscarSelectStatement extends SQLSelectStatement implements OscarStatement {
-
     public OscarSelectStatement() {
         super(DbType.oscar);
     }

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarShowStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarShowStatement.java
@@ -22,7 +22,6 @@
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public class OscarShowStatement extends SQLStatementImpl implements OscarStatement, SQLShowStatement {
-
     private SQLExpr expr;
 
     public SQLExpr getExpr() {

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarStatement.java
@@ -19,5 +19,4 @@
 import com.alibaba.druid.sql.dialect.oscar.ast.OscarObject;
 
 public interface OscarStatement extends SQLStatement, OscarObject {
-
 }
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarUpdateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/ast/stmt/OscarUpdateStatement.java
@@ -22,7 +22,6 @@
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public class OscarUpdateStatement extends SQLUpdateStatement implements OscarStatement {
-
     private boolean only;
 
     public OscarUpdateStatement() {

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/parser/OscarCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/parser/OscarCreateTableParser.java
@@ -6,7 +6,6 @@
 import com.alibaba.druid.sql.parser.*;
 
 public class OscarCreateTableParser extends SQLCreateTableParser {
-
     public OscarCreateTableParser(Lexer lexer) {
         super(new OscarExprParser(lexer));
     }

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/parser/OscarExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/parser/OscarExprParser.java
@@ -30,7 +30,6 @@
 import java.util.Arrays;
 
 public class OscarExprParser extends SQLExprParser {
-
     public static final String[] AGGREGATE_FUNCTIONS;
 
     public static final long[] AGGREGATE_FUNCTIONS_CODES;
@@ -65,7 +64,7 @@ public OscarExprParser(Lexer lexer) {
         this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES;
         this.dbType = DbType.oscar;
     }
-    
+
     @Override
     public SQLDataType parseDataType() {
         if (lexer.token() == Token.TYPE) {
@@ -85,7 +84,7 @@ protected SQLDataType parseDataTypeRest(SQLDataType dataType) {
 
         return dataType;
     }
-    
+
     public OscarSelectParser createSelectParser() {
         return new OscarSelectParser(this);
     }
@@ -147,7 +146,7 @@ public SQLExpr primary() {
                             .select());
             return queryExpr;
         }
-        
+
         return super.primary();
     }
 
@@ -237,15 +236,15 @@ public SQLExpr primaryRest(SQLExpr expr) {
         if (lexer.token() == Token.COLONCOLON) {
             lexer.nextToken();
             SQLDataType dataType = this.parseDataType();
-            
+
             PGTypeCastExpr castExpr = new PGTypeCastExpr();
-            
+
             castExpr.setExpr(expr);
             castExpr.setDataType(dataType);
 
             return primaryRest(castExpr);
         }
-        
+
         if (lexer.token() == Token.LBRACKET) {
             SQLArrayExpr array = new SQLArrayExpr();
             array.setExpr(expr);
@@ -254,7 +253,7 @@ public SQLExpr primaryRest(SQLExpr expr) {
             accept(Token.RBRACKET);
             return primaryRest(array);
         }
-        
+
         if (expr.getClass() == SQLIdentifierExpr.class) {
             SQLIdentifierExpr identifierExpr = (SQLIdentifierExpr) expr;
             String ident = identifierExpr.getName();
@@ -295,7 +294,6 @@ public SQLExpr primaryRest(SQLExpr expr) {
                     accept(Token.LITERAL_CHARS);
                 }
 
-
                 return primaryRest(timestamp);
             } else if (FnvHash.Constants.TIMESTAMPTZ == hash) {
                 if (lexer.token() != Token.LITERAL_ALIAS //
@@ -322,26 +320,25 @@ public SQLExpr primaryRest(SQLExpr expr) {
                     accept(Token.LITERAL_CHARS);
                 }
 
-
                 return primaryRest(timestamp);
             } else if (FnvHash.Constants.EXTRACT == hash) {
                 accept(Token.LPAREN);
-                
+
                 PGExtractExpr extract = new PGExtractExpr();
-                
+
                 String fieldName = lexer.stringVal();
                 PGDateField field = PGDateField.valueOf(fieldName.toUpperCase());
                 lexer.nextToken();
-                
+
                 extract.setField(field);
-                
+
                 accept(Token.FROM);
                 SQLExpr source = this.expr();
-                
+
                 extract.setSource(source);
-                
+
                 accept(Token.RPAREN);
-                
+
                 return primaryRest(extract);
             } else if (FnvHash.Constants.POINT == hash) {
                 switch (lexer.token()) {

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/parser/OscarLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/parser/OscarLexer.java
@@ -25,7 +25,6 @@
 import static com.alibaba.druid.sql.parser.Token.LITERAL_CHARS;
 
 public class OscarLexer extends Lexer {
-
     public static final Keywords DEFAULT_OSCAR_KEYWORDS;
 
     static {
@@ -58,10 +57,10 @@ public class OscarLexer extends Lexer {
         map.put("SHARE", Token.SHARE);
         map.put("SHOW", Token.SHOW);
         map.put("START", Token.START);
-        
+
         map.put("USING", Token.USING);
         map.put("WINDOW", Token.WINDOW);
-        
+
         map.put("TRUE", Token.TRUE);
         map.put("FALSE", Token.FALSE);
         map.put("ARRAY", Token.ARRAY);
@@ -93,7 +92,7 @@ public OscarLexer(String input, SQLParserFeature... features) {
             config(feature, true);
         }
     }
-    
+
     protected void scanString() {
         mark = pos;
         boolean hasSpecial = false;
@@ -184,7 +183,7 @@ protected void scanString() {
             stringVal = new String(buf, 0, bufPos);
         }
     }
-    
+
     public void scanSharp() {
         scanChar();
         if (ch == '>') {

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/parser/OscarSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/parser/OscarSelectParser.java
@@ -30,7 +30,6 @@
 import java.util.List;
 
 public class OscarSelectParser extends SQLSelectParser {
-
     public OscarSelectParser(SQLExprParser exprParser) {
         super(exprParser);
     }
@@ -270,7 +269,7 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) {
                 if (alias != null) {
                     functionTableSource.setAlias(alias);
                 }
-                
+
                 lexer.nextToken();
                 parserParameters(functionTableSource.getParameters());
                 accept(Token.RPAREN);

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oscar/visitor/OscarOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oscar/visitor/OscarOutputVisitor.java
@@ -40,7 +40,6 @@
 import java.util.Set;
 
 public class OscarOutputVisitor extends SQLASTOutputVisitor implements OscarASTVisitor, OracleASTVisitor {
-
     public OscarOutputVisitor(Appendable appender) {
         super(appender);
         this.dbType = DbType.oscar;
@@ -120,7 +119,6 @@ public boolean visit(ForClause x) {
         return false;
     }
 
-
     public boolean visit(OscarSelectQueryBlock x) {
         if ((!isParameterized()) && isPrettyFormat() && x.hasBeforeComment()) {
             printlnComments(x.getBeforeCommentsDirect());