Merge branch 'master' into support_oceanbase_dbtype

This commit is contained in:
Hongwei Yi
2020-04-06 21:44:21 +08:00
committed by GitHub
17 changed files with 369 additions and 253 deletions
@@ -891,7 +891,9 @@ public class SQLUtils {
if (MySqlUtils.isKeyword(normalizeName)) {
return name;
}
} else if (JdbcUtils.isPgsqlDbType(dbType)) {
} else if (JdbcUtils.isPgsqlDbType(dbType)
|| JdbcConstants.ENTERPRISEDB.equals(dbType)
|| JdbcConstants.POLARDB.equals(dbType)) {
if (PGUtils.isKeyword(normalizeName)) {
return name;
}
@@ -1585,11 +1585,7 @@ public class SQLExprParser extends SQLParser {
throw new ParserException("error, " + lexer.info());
}
if (lexer.token == Token.LITERAL_ALIAS) {
name = new SQLPropertyExpr(name, lexer.stringVal());
} else {
name = new SQLPropertyExpr(name, lexer.stringVal());
}
name = new SQLPropertyExpr(name, lexer.stringVal());
lexer.nextToken();
name = nameRest(name);
}
@@ -85,6 +85,8 @@ public class SQLParserUtils {
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
|| JdbcUtils.ENTERPRISEDB.equals(dbType)
|| JdbcUtils.POLARDB.equals(dbType)) {
return new PGSQLStatementParser(sql);
}
@@ -124,7 +126,9 @@ public class SQLParserUtils {
return new MySqlExprParser(sql);
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)
|| JdbcUtils.POLARDB.equals(dbType)) {
return new PGExprParser(sql);
}
@@ -156,7 +160,9 @@ public class SQLParserUtils {
return new MySqlLexer(sql);
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)
|| JdbcUtils.POLARDB.equals(dbType)) {
return new PGLexer(sql);
}
@@ -1,212 +1,222 @@
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.sql.visitor;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLDateExpr;
import com.alibaba.druid.sql.ast.expr.SQLHexExpr;
import com.alibaba.druid.sql.ast.expr.SQLListExpr;
import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr;
import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.dialect.db2.visitor.DB2ExportParameterVisitor;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlExportParameterVisitor;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleExportParameterVisitor;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGExportParameterVisitor;
import com.alibaba.druid.sql.dialect.sqlserver.visitor.MSSQLServerExportParameterVisitor;
import com.alibaba.druid.util.JdbcUtils;
public final class ExportParameterVisitorUtils {
//private for util class not need new instance
private ExportParameterVisitorUtils() {
super();
}
public static ExportParameterVisitor createExportParameterVisitor(final Appendable out ,final String dbType) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlExportParameterVisitor(out);
}
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleExportParameterVisitor(out);
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGExportParameterVisitor(out);
}
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new MSSQLServerExportParameterVisitor(out);
}
if (JdbcUtils.DB2.equals(dbType)) {
return new DB2ExportParameterVisitor(out);
}
if (JdbcUtils.MARIADB.equals(dbType)) {
return new MySqlExportParameterVisitor(out);
}
if (JdbcUtils.H2.equals(dbType)) {
return new MySqlExportParameterVisitor(out);
}
return new ExportParameterizedOutputVisitor(out);
}
public static boolean exportParamterAndAccept(final List<Object> parameters, List<SQLExpr> list) {
for (int i = 0, size = list.size(); i < size; ++i) {
SQLExpr param = list.get(i);
SQLExpr result = exportParameter(parameters, param);
if (result != param) {
list.set(i, result);
}
}
return false;
}
public static SQLExpr exportParameter(final List<Object> parameters, final SQLExpr param) {
Object value = null;
boolean replace = false;
if (param instanceof SQLCharExpr) {
value = ((SQLCharExpr) param).getText();
replace = true;
} else if (param instanceof SQLBooleanExpr) {
value = ((SQLBooleanExpr) param).getBooleanValue();
replace = true;
} else if (param instanceof SQLNumericLiteralExpr) {
value = ((SQLNumericLiteralExpr) param).getNumber();
replace = true;
} else if (param instanceof SQLHexExpr) {
value = ((SQLHexExpr) param).toBytes();
replace = true;
} else if (param instanceof SQLTimestampExpr || param instanceof SQLDateExpr) {
value = ((SQLTimestampExpr) param).getValue();
replace = true;
} else if (param instanceof SQLListExpr) {
SQLListExpr list = ((SQLListExpr) param);
List<Object> listValues = new ArrayList<Object>();
for (int i = 0; i < list.getItems().size(); i++) {
SQLExpr listItem = list.getItems().get(i);
if (listItem instanceof SQLCharExpr) {
Object listValue = ((SQLCharExpr) listItem).getText();
listValues.add(listValue);
} else if (listItem instanceof SQLBooleanExpr) {
Object listValue = ((SQLBooleanExpr) listItem).getBooleanValue();
listValues.add(listValue);
} else if (listItem instanceof SQLNumericLiteralExpr) {
Object listValue = ((SQLNumericLiteralExpr) listItem).getNumber();
listValues.add(listValue);
} else if (param instanceof SQLHexExpr) {
Object listValue = ((SQLHexExpr) listItem).toBytes();
listValues.add(listValue);
}
}
if (listValues.size() == list.getItems().size()) {
value = listValues;
replace = true;
}
}
if (replace) {
SQLObject parent = param.getParent();
if (parent != null) {
List<SQLObject> mergedList = null;
if (parent instanceof SQLBinaryOpExpr) {
mergedList = ((SQLBinaryOpExpr) parent).getMergedList();
}
if (mergedList != null) {
List<Object> mergedListParams = new ArrayList<Object>(mergedList.size() + 1);
for (int i = 0; i < mergedList.size(); ++i) {
SQLObject item = mergedList.get(i);
if (item instanceof SQLBinaryOpExpr) {
SQLBinaryOpExpr binaryOpItem = (SQLBinaryOpExpr) item;
exportParameter(mergedListParams, binaryOpItem.getRight());
}
}
if (mergedListParams.size() > 0) {
mergedListParams.add(0, value);
value = mergedListParams;
}
}
}
parameters.add(value);
return new SQLVariantRefExpr("?");
}
return param;
}
public static void exportParameter(final List<Object> parameters, SQLBinaryOpExpr x) {
if (x.getLeft() instanceof SQLLiteralExpr
&& x.getRight() instanceof SQLLiteralExpr
&& x.getOperator().isRelational()) {
return;
}
{
SQLExpr leftResult = ExportParameterVisitorUtils.exportParameter(parameters, x.getLeft());
if (leftResult != x.getLeft()) {
x.setLeft(leftResult);
}
}
{
SQLExpr rightResult = exportParameter(parameters, x.getRight());
if (rightResult != x.getRight()) {
x.setRight(rightResult);
}
}
}
public static void exportParameter(final List<Object> parameters, SQLBetweenExpr x) {
{
SQLExpr result = exportParameter(parameters, x.getBeginExpr());
if (result != x.getBeginExpr()) {
x.setBeginExpr(result);
}
}
{
SQLExpr result = exportParameter(parameters, x.getEndExpr());
if (result != x.getBeginExpr()) {
x.setEndExpr(result);
}
}
}
}
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.sql.visitor;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLDateExpr;
import com.alibaba.druid.sql.ast.expr.SQLHexExpr;
import com.alibaba.druid.sql.ast.expr.SQLListExpr;
import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr;
import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.dialect.db2.visitor.DB2ExportParameterVisitor;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlExportParameterVisitor;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleExportParameterVisitor;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGExportParameterVisitor;
import com.alibaba.druid.sql.dialect.sqlserver.visitor.MSSQLServerExportParameterVisitor;
import com.alibaba.druid.util.JdbcUtils;
public final class ExportParameterVisitorUtils {
//private for util class not need new instance
private ExportParameterVisitorUtils() {
super();
}
public static ExportParameterVisitor createExportParameterVisitor(final Appendable out ,final String dbType) {
if (JdbcUtils.isMysqlDbType(dbType)) {
return new MySqlExportParameterVisitor(out);
}
if (JdbcUtils.isOracleDbType(dbType)) {
return new OracleExportParameterVisitor(out);
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
return new PGExportParameterVisitor(out);
}
if (JdbcUtils.isSqlserverDbType(dbType)) {
return new MSSQLServerExportParameterVisitor(out);
}
if (JdbcUtils.DB2.equals(dbType)) {
return new DB2ExportParameterVisitor(out);
}
if (JdbcUtils.MARIADB.equals(dbType)) {
return new MySqlExportParameterVisitor(out);
}
if (JdbcUtils.H2.equals(dbType)) {
return new MySqlExportParameterVisitor(out);
}
if (JdbcUtils.POSTGRESQL.equals(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)
|| JdbcUtils.POLARDB.equals(dbType)) {
return new PGExportParameterVisitor(out);
}
if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
return new MSSQLServerExportParameterVisitor(out);
}
return new ExportParameterizedOutputVisitor(out);
}
public static boolean exportParamterAndAccept(final List<Object> parameters, List<SQLExpr> list) {
for (int i = 0, size = list.size(); i < size; ++i) {
SQLExpr param = list.get(i);
SQLExpr result = exportParameter(parameters, param);
if (result != param) {
list.set(i, result);
}
}
return false;
}
public static SQLExpr exportParameter(final List<Object> parameters, final SQLExpr param) {
Object value = null;
boolean replace = false;
if (param instanceof SQLCharExpr) {
value = ((SQLCharExpr) param).getText();
replace = true;
} else if (param instanceof SQLBooleanExpr) {
value = ((SQLBooleanExpr) param).getBooleanValue();
replace = true;
} else if (param instanceof SQLNumericLiteralExpr) {
value = ((SQLNumericLiteralExpr) param).getNumber();
replace = true;
} else if (param instanceof SQLHexExpr) {
value = ((SQLHexExpr) param).toBytes();
replace = true;
} else if (param instanceof SQLTimestampExpr || param instanceof SQLDateExpr) {
value = ((SQLTimestampExpr) param).getValue();
replace = true;
} else if (param instanceof SQLListExpr) {
SQLListExpr list = ((SQLListExpr) param);
List<Object> listValues = new ArrayList<Object>();
for (int i = 0; i < list.getItems().size(); i++) {
SQLExpr listItem = list.getItems().get(i);
if (listItem instanceof SQLCharExpr) {
Object listValue = ((SQLCharExpr) listItem).getText();
listValues.add(listValue);
} else if (listItem instanceof SQLBooleanExpr) {
Object listValue = ((SQLBooleanExpr) listItem).getBooleanValue();
listValues.add(listValue);
} else if (listItem instanceof SQLNumericLiteralExpr) {
Object listValue = ((SQLNumericLiteralExpr) listItem).getNumber();
listValues.add(listValue);
} else if (param instanceof SQLHexExpr) {
Object listValue = ((SQLHexExpr) listItem).toBytes();
listValues.add(listValue);
}
}
if (listValues.size() == list.getItems().size()) {
value = listValues;
replace = true;
}
}
if (replace) {
SQLObject parent = param.getParent();
if (parent != null) {
List<SQLObject> mergedList = null;
if (parent instanceof SQLBinaryOpExpr) {
mergedList = ((SQLBinaryOpExpr) parent).getMergedList();
}
if (mergedList != null) {
List<Object> mergedListParams = new ArrayList<Object>(mergedList.size() + 1);
for (int i = 0; i < mergedList.size(); ++i) {
SQLObject item = mergedList.get(i);
if (item instanceof SQLBinaryOpExpr) {
SQLBinaryOpExpr binaryOpItem = (SQLBinaryOpExpr) item;
exportParameter(mergedListParams, binaryOpItem.getRight());
}
}
if (mergedListParams.size() > 0) {
mergedListParams.add(0, value);
value = mergedListParams;
}
}
}
parameters.add(value);
return new SQLVariantRefExpr("?");
}
return param;
}
public static void exportParameter(final List<Object> parameters, SQLBinaryOpExpr x) {
if (x.getLeft() instanceof SQLLiteralExpr
&& x.getRight() instanceof SQLLiteralExpr
&& x.getOperator().isRelational()) {
return;
}
{
SQLExpr leftResult = ExportParameterVisitorUtils.exportParameter(parameters, x.getLeft());
if (leftResult != x.getLeft()) {
x.setLeft(leftResult);
}
}
{
SQLExpr rightResult = exportParameter(parameters, x.getRight());
if (rightResult != x.getRight()) {
x.setRight(rightResult);
}
}
}
public static void exportParameter(final List<Object> parameters, SQLBetweenExpr x) {
{
SQLExpr result = exportParameter(parameters, x.getBeginExpr());
if (result != x.getBeginExpr()) {
x.setBeginExpr(result);
}
}
{
SQLExpr result = exportParameter(parameters, x.getEndExpr());
if (result != x.getBeginExpr()) {
x.setEndExpr(result);
}
}
}
}
@@ -273,7 +273,10 @@ public class ParameterizedOutputVisitorUtils {
return new MySqlOutputVisitor(out, true);
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)
|| JdbcUtils.POLARDB.equals(dbType)) {
return new PGOutputVisitor(out, true);
}
@@ -2552,7 +2552,6 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
boolean newLine = item instanceof SQLForeignKeyConstraint //
|| item instanceof SQLPrimaryKey //
|| item instanceof SQLColumnCheck //
|| item instanceof SQLColumnCheck //
|| item.getName() != null;
if (newLine) {
this.indentCount++;
@@ -168,7 +168,9 @@ public class SQLEvalVisitorUtils {
return new OracleEvalVisitor();
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)
|| JdbcConstants.ENTERPRISEDB.equals(dbType)
|| JdbcConstants.POLARDB.equals(dbType)) {
return new PGEvalVisitor();
}