不启用 WITH AS 时去除多余的 SELECT * FROM(...) 包装

TommyLemon · TommyLemon · commit 5f94a6338384 · 2023-04-28T01:50:47.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -3990,7 +3990,8 @@ else if (isPresto() || isTrino()) {
 	 * @throws Exception
 	 */
 	private String withAsExpreSubqueryString(SQLConfig cfg, Subquery subquery) throws Exception {
-		List<String> list = isWithAsEnable() ? getWithAsExprSqlList() : null;
+		boolean isWithAsEnable = isWithAsEnable();
+		List<String> list = isWithAsEnable ? getWithAsExprSqlList() : null;
 		if (cfg.getMethod() != RequestMethod.POST && list == null) {
 			clearWithAsExprListIfNeed();
 		}
@@ -4018,7 +4019,7 @@ private String withAsExpreSubqueryString(SQLConfig cfg, Subquery subquery) throw
 		} else {
 			withAsExpreSql = cfg.getSQL(isPrepared());
 			// mysql 才存在这个问题, 主表和子表是一张表
-			if (isMySQL() && StringUtil.equals(getTable(), subquery.getFrom())) {
+			if (isWithAsEnable && isMySQL() && StringUtil.equals(getTable(), subquery.getFrom())) {
 				withAsExpreSql = " SELECT * FROM (" + withAsExpreSql + ") AS " + quote + subquery.getKey() + quote;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -3990,7 +3990,8 @@ else if (isPresto() \|\| isTrino()) {`
`3990`	`3990`	`* @throws Exception`
`3991`	`3991`	`*/`
`3992`	`3992`	`private String withAsExpreSubqueryString(SQLConfig cfg, Subquery subquery) throws Exception {`
`3993`		`- List<String> list = isWithAsEnable() ? getWithAsExprSqlList() : null;`
	`3993`	`+ boolean isWithAsEnable = isWithAsEnable();`
	`3994`	`+ List<String> list = isWithAsEnable ? getWithAsExprSqlList() : null;`
`3994`	`3995`	`if (cfg.getMethod() != RequestMethod.POST && list == null) {`
`3995`	`3996`	`clearWithAsExprListIfNeed();`
`3996`	`3997`	`}`
`@@ -4018,7 +4019,7 @@ private String withAsExpreSubqueryString(SQLConfig cfg, Subquery subquery) throw`
`4018`	`4019`	`} else {`
`4019`	`4020`	`withAsExpreSql = cfg.getSQL(isPrepared());`
`4020`	`4021`	`// mysql 才存在这个问题, 主表和子表是一张表`
`4021`		`- if (isMySQL() && StringUtil.equals(getTable(), subquery.getFrom())) {`
	`4022`	`+ if (isWithAsEnable && isMySQL() && StringUtil.equals(getTable(), subquery.getFrom())) {`
`4022`	`4023`	`withAsExpreSql = " SELECT * FROM (" + withAsExpreSql + ") AS " + quote + subquery.getKey() + quote;`
`4023`	`4024`	`}`
`4024`	`4025`	`}`