diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseExportParameterVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseExportParameterVisitor.java new file mode 100644 index 0000000000..cb80fd95c1 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseExportParameterVisitor.java @@ -0,0 +1,122 @@ +/* + * Copyright 1999-2017 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.dialect.clickhouse.visitor; + +import com.alibaba.druid.sql.ast.SQLOrderBy; +import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; +import com.alibaba.druid.sql.ast.expr.SQLInListExpr; +import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; +import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause; +import com.alibaba.druid.sql.ast.statement.SQLSelectItem; +import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor; +import com.alibaba.druid.sql.visitor.ExportParameterVisitor; +import com.alibaba.druid.sql.visitor.ExportParameterVisitorUtils; + +import java.util.ArrayList; +import java.util.List; + +public class ClickhouseExportParameterVisitor extends ClickhouseOutputVisitor implements ExportParameterVisitor { + + /** + * true= if require parameterized sql output + */ + private final boolean requireParameterizedOutput; + + public ClickhouseExportParameterVisitor(final List parameters, final Appendable appender, final boolean wantParameterizedOutput){ + super(appender, true); + this.parameters = parameters; + this.requireParameterizedOutput = wantParameterizedOutput; + } + + public ClickhouseExportParameterVisitor() { + this(new ArrayList()); + } + + public ClickhouseExportParameterVisitor(final List parameters){ + this(parameters,new StringBuilder(),false); + } + + public ClickhouseExportParameterVisitor(final Appendable appender) { + this(new ArrayList(),appender,true); + } + + public List getParameters() { + return parameters; + } + + @Override + public boolean visit(SQLSelectItem x) { + if(requireParameterizedOutput){ + return super.visit(x); + } + return false; + } + + @Override + public boolean visit(SQLOrderBy x) { + if(requireParameterizedOutput){ + return super.visit(x); + } + return false; + } + + @Override + public boolean visit(SQLSelectGroupByClause x) { + if(requireParameterizedOutput){ + return super.visit(x); + } + return false; + } + + @Override + public boolean visit(SQLMethodInvokeExpr x) { + if(requireParameterizedOutput){ + return super.visit(x); + } + ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getArguments()); + + return true; + } + + @Override + public boolean visit(SQLInListExpr x) { + if(requireParameterizedOutput){ + return super.visit(x); + } + ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getTargetList()); + + return true; + } + + @Override + public boolean visit(SQLBetweenExpr x) { + if(requireParameterizedOutput){ + return super.visit(x); + } + ExportParameterVisitorUtils.exportParameter(this.parameters, x); + return true; + } + + public boolean visit(SQLBinaryOpExpr x) { + if(requireParameterizedOutput){ + return super.visit(x); + } + ExportParameterVisitorUtils.exportParameter(this.parameters, x); + return true; + } + +} diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java index 1510f01b61..28ef84203e 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFilter.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java @@ -182,6 +182,12 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { provider = new SQLiteWallProvider(config); break; + case clickhouse: + if (config == null) { + config = new WallConfig(ClickhouseWallProvider.DEFAULT_CONFIG_DIR); + } + provider = new ClickhouseWallProvider(config); + break; default: throw new IllegalStateException("dbType not support : " + dbType + ", url " + dataSource.getUrl()); } diff --git a/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallProvider.java new file mode 100644 index 0000000000..807bf9c43d --- /dev/null +++ b/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallProvider.java @@ -0,0 +1,56 @@ +/* + * Copyright 1999-2017 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.wall.spi; + +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.dialect.clickhouse.parser.ClickhouseStatementParser; +import com.alibaba.druid.sql.dialect.clickhouse.visitor.ClickhouseExportParameterVisitor; +import com.alibaba.druid.sql.parser.SQLParserFeature; +import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.sql.visitor.ExportParameterVisitor; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.WallVisitor; + + +public class ClickhouseWallProvider extends WallProvider { + + public final static String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/clickhouse"; + + public ClickhouseWallProvider(){ + this(new WallConfig(DEFAULT_CONFIG_DIR)); + } + + public ClickhouseWallProvider(WallConfig config){ + super(config, DbType.postgresql); + } + + @Override + public SQLStatementParser createParser(String sql) { + return new ClickhouseStatementParser(sql, SQLParserFeature.EnableSQLBinaryOpExprGroup); + } + + @Override + public WallVisitor createWallVisitor() { + return new ClickhouseWallVisitor(this); + } + + @Override + public ExportParameterVisitor createExportParameterVisitor() { + return new ClickhouseExportParameterVisitor(); + } + +} diff --git a/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallVisitor.java new file mode 100644 index 0000000000..b6816f5eb5 --- /dev/null +++ b/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallVisitor.java @@ -0,0 +1,32 @@ +/* + * Copyright 1999-2017 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.wall.spi; + +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.WallVisitor; + +public class ClickhouseWallVisitor extends WallVisitorBase implements WallVisitor, PGASTVisitor { + public ClickhouseWallVisitor(WallProvider provider){ + super (provider); + } + + @Override + public DbType getDbType() { + return DbType.clickhouse; + } +} diff --git a/src/main/resources/META-INF/druid/wall/clickhouse/deny-function.txt b/src/main/resources/META-INF/druid/wall/clickhouse/deny-function.txt new file mode 100644 index 0000000000..1a010b1c0f --- /dev/null +++ b/src/main/resources/META-INF/druid/wall/clickhouse/deny-function.txt @@ -0,0 +1 @@ +file \ No newline at end of file diff --git a/src/main/resources/META-INF/druid/wall/clickhouse/deny-schema.txt b/src/main/resources/META-INF/druid/wall/clickhouse/deny-schema.txt new file mode 100644 index 0000000000..5b8201173c --- /dev/null +++ b/src/main/resources/META-INF/druid/wall/clickhouse/deny-schema.txt @@ -0,0 +1 @@ +system \ No newline at end of file