Commit ee851376 authored by wenmo's avatar wenmo

ck返回值优化bug

parent bb7e5833
...@@ -297,7 +297,7 @@ public abstract class AbstractJdbcDriver extends AbstractDriver { ...@@ -297,7 +297,7 @@ public abstract class AbstractJdbcDriver extends AbstractDriver {
try { try {
ClickhouseStatementParser parser = new ClickhouseStatementParser(sql); ClickhouseStatementParser parser = new ClickhouseStatementParser(sql);
SQLStatement sqlStatement = parser.parseStatement(); SQLStatement sqlStatement = parser.parseStatement();
type = sqlStatement.getClass().getName(); type = sqlStatement.getClass().getSimpleName();
if(!(sqlStatement instanceof SQLSelectStatement)){ if(!(sqlStatement instanceof SQLSelectStatement)){
return SqlExplainResult.success(type, sql, ""); return SqlExplainResult.success(type, sql, "");
} }
...@@ -311,11 +311,12 @@ public abstract class AbstractJdbcDriver extends AbstractDriver { ...@@ -311,11 +311,12 @@ public abstract class AbstractJdbcDriver extends AbstractDriver {
error = e.getMessage(); error = e.getMessage();
} finally { } finally {
close(preparedStatement, results); close(preparedStatement, results);
}
if(correct) { if(correct) {
return SqlExplainResult.success(null, sql, null); return SqlExplainResult.success(type, sql, null);
}else { }else {
return SqlExplainResult.fail(sql,error); return SqlExplainResult.fail(sql,error);
} }
} }
}
} }
...@@ -2,7 +2,10 @@ package com.dlink.metadata.driver; ...@@ -2,7 +2,10 @@ package com.dlink.metadata.driver;
import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.dialect.clickhouse.ast.ClickhouseCreateTableStatement;
import com.alibaba.druid.sql.dialect.clickhouse.parser.ClickhouseCreateTableParser;
import com.alibaba.druid.sql.dialect.clickhouse.parser.ClickhouseStatementParser; import com.alibaba.druid.sql.dialect.clickhouse.parser.ClickhouseStatementParser;
import com.alibaba.druid.sql.dialect.clickhouse.visitor.ClickhouseVisitor;
import com.dlink.metadata.convert.ClickHouseTypeConvert; import com.dlink.metadata.convert.ClickHouseTypeConvert;
import com.dlink.metadata.convert.ITypeConvert; import com.dlink.metadata.convert.ITypeConvert;
import com.dlink.metadata.query.ClickHouseQuery; import com.dlink.metadata.query.ClickHouseQuery;
...@@ -71,16 +74,17 @@ public class ClickHouseDriver extends AbstractJdbcDriver { ...@@ -71,16 +74,17 @@ public class ClickHouseDriver extends AbstractJdbcDriver {
while(results.next()){ while(results.next()){
explain.append(getTypeConvert().convertValue(results,"explain", "string")+"\r\n"); explain.append(getTypeConvert().convertValue(results,"explain", "string")+"\r\n");
} }
} catch (SQLException e) { } catch (Exception e) {
correct = false; correct = false;
error = e.getMessage(); error = e.getMessage();
} finally { } finally {
close(preparedStatement, results); close(preparedStatement, results);
}
if(correct) { if(correct) {
return SqlExplainResult.success(type, sql, explain.toString()); return SqlExplainResult.success(type, sql, explain.toString());
}else { }else {
return SqlExplainResult.fail(sql,error); return SqlExplainResult.fail(sql,error);
} }
} }
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment