update clickhouse gettable

qiujunlin · qiujunlin · commit 6981010a5e24 · 2021-08-05T22:12:13.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -519,7 +519,7 @@ public static boolean isClickHouse(String db) {
 
 	@Override
 	public String getQuote() {
-		return isMySQL() ? "`" : ( isClickHouse()? "" : "\"");
+		return isMySQL()||isClickHouse() ? "`" : "\"";
 	}
 
 	@Override
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
@@ -287,11 +287,14 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
 						// bugfix-修复非常规数据库字段，获取表名失败导致输出异常
 						if (isExplain == false && hasJoin && viceColumnStart > length) {
 							List<String> column = config.getColumn();
-
+							String sqlTable = rsmd.getTableName(i);
+							if (config.isClickHouse()&&(sqlTable.startsWith("`")||sqlTable.startsWith("\""))){
+								sqlTable = sqlTable.substring(1,sqlTable.length()-1);
+							}
 							if (column != null && column.isEmpty() == false) {
 								viceColumnStart = column.size() + 1;
 							}
-							else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
+							else if (config.getSQLTable().equalsIgnoreCase(sqlTable) == false) {
 								viceColumnStart = i;
 							}
 						}

Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ public static boolean isClickHouse(String db) {`
`519`	`519`
`520`	`520`	`@Override`
`521`	`521`	`public String getQuote() {`
`522`		- return isMySQL() ? "`" : ( isClickHouse()? "" : "\"");
	`522`	+ return isMySQL()\|\|isClickHouse() ? "`" : "\"";
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -287,11 +287,14 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws`
`287`	`287`	`// bugfix-修复非常规数据库字段，获取表名失败导致输出异常`
`288`	`288`	`if (isExplain == false && hasJoin && viceColumnStart > length) {`
`289`	`289`	`List<String> column = config.getColumn();`
`290`		`-`
	`290`	`+ String sqlTable = rsmd.getTableName(i);`
	`291`	+ if (config.isClickHouse()&&(sqlTable.startsWith("`")\|\|sqlTable.startsWith("\""))){
	`292`	`+ sqlTable = sqlTable.substring(1,sqlTable.length()-1);`
	`293`	`+ }`
`291`	`294`	`if (column != null && column.isEmpty() == false) {`
`292`	`295`	`viceColumnStart = column.size() + 1;`
`293`	`296`	`}`
`294`		`- else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {`
	`297`	`+ else if (config.getSQLTable().equalsIgnoreCase(sqlTable) == false) {`
`295`	`298`	`viceColumnStart = i;`
`296`	`299`	`}`
`297`	`300`	`}`