From 20dedb098c07db9735b43e8c9318eeb7f25b7a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Mon, 7 Jun 2021 00:26:09 +0800 Subject: [PATCH] improved clickhouse support, fix #4294 --- .../clickhouse/visitor/ClickhouseOutputVisitor.java | 13 ++++++++----- .../bvt/sql/clickhouse/ClickHouseResourceTest.java | 4 ++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseOutputVisitor.java index 50e278ae6b..b42e3a553b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseOutputVisitor.java @@ -2,10 +2,7 @@ package com.alibaba.druid.sql.dialect.clickhouse.visitor; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.statement.SQLAssignItem; -import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelect; -import com.alibaba.druid.sql.ast.statement.SQLWithSubqueryClause; +import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.clickhouse.ast.ClickhouseCreateTableStatement; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; @@ -13,7 +10,7 @@ import java.util.List; public class ClickhouseOutputVisitor extends SQLASTOutputVisitor implements ClickhouseVisitor { public ClickhouseOutputVisitor(Appendable appender) { - super(appender); + super(appender, DbType.clickhouse); } public ClickhouseOutputVisitor(Appendable appender, DbType dbType) { @@ -106,4 +103,10 @@ public class ClickhouseOutputVisitor extends SQLASTOutputVisitor implements Clic } return false; } + + public boolean visit(SQLAlterTableAddColumn x) { + print0(ucase ? "ADD COLUMN " : "add column "); + printAndAccept(x.getColumns(), ", "); + return false; + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java index 388f0d6793..5f0236d8f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java @@ -76,6 +76,10 @@ public class ClickHouseResourceTest extends OracleTest { exec_test("bvt/parser/clickhouse-9.txt"); } + public void test_10() throws Exception { + exec_test("bvt/parser/clickhouse-10.txt"); + } + public void exec_test(String resource) throws Exception { System.out.println(resource); InputStream is = null;