优化 where 和 JOIN 解析代码

Author: TommyLemon

APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java

@@ -2585,132 +2585,8 @@ else if (StringUtil.isNotEmpty(andWhere, true)) { // andWhere 必须放后面
 setPreparedValueList(prepreadValues);
 }
 
-if (joinList != null) {
-
-String newWs = "";
-String ws = whereString;
-
-List<Object> newPvl = new ArrayList<>();
-List<Object> pvl = new ArrayList<>(getPreparedValueList());
-
-SQLConfig jc;
-String js;
-
-boolean changed = false;
-//各种 JOIN 没办法统一用 & | ！连接，只能按优先级，和 @combine 一样?
-for (Join j : joinList) {
-String jt = j.getJoinType();
-
-switch (jt) {
-case "*": // CROSS JOIN
-case "@": // APP JOIN
-case "<": // LEFT JOIN
-case ">": // RIGHT JOIN
-break;
-
-case "&": // INNER JOIN: A & B 
-case "": // FULL JOIN: A | B 
-case "|": // FULL JOIN: A | B 
-case "!": // OUTER JOIN: ! (A | B)
-case "^": // SIDE JOIN: ! (A & B)
-case "(": // ANTI JOIN: A & ! B
-case ")": // FOREIGN JOIN: B & ! A
-jc = j.getJoinConfig();
-boolean isMain = jc.isMain();
-jc.setMain(false).setPrepared(isPrepared()).setPreparedValueList(new ArrayList<Object>());
-js = jc.getWhereString(false);
-jc.setMain(isMain);
-
-boolean isOuterJoin = "!".equals(jt);
-boolean isSideJoin = "^".equals(jt);
-boolean isAntiJoin = "(".equals(jt);
-boolean isForeignJoin = ")".equals(jt);
-boolean isWsEmpty = StringUtil.isEmpty(ws, true);
-
-if (isWsEmpty) {
-if (isOuterJoin) { // ! OUTER JOIN: ! (A | B)
-throw new NotExistException("no result for ! OUTER JOIN( ! (A | B) ) when A or B is empty!");
-}
-if (isForeignJoin) { // ) FOREIGN JOIN: B & ! A
-throw new NotExistException("no result for ) FOREIGN JOIN( B & ! A ) when A is empty!");
-}
-}
-
-if (StringUtil.isEmpty(js, true)) {
-if (isOuterJoin) { // ! OUTER JOIN: ! (A | B)
-throw new NotExistException("no result for ! OUTER JOIN( ! (A | B) ) when A or B is empty!");
-}
-if (isAntiJoin) { // ( ANTI JOIN: A & ! B
-throw new NotExistException("no result for ( ANTI JOIN( A & ! B ) when B is empty!");
-}
-
-if (isWsEmpty) {
-if (isSideJoin) {
-throw new NotExistException("no result for ^ SIDE JOIN( ! (A & B) ) when both A and B are empty!");
-}
-}
-else {
-if (isSideJoin || isForeignJoin) {
-newWs += " ( " + getCondition(true, ws) + " ) ";
-
-newPvl.addAll(pvl);
-newPvl.addAll(jc.getPreparedValueList());
-changed = true;
-}
-}
-
-continue;
-}
-
-if (StringUtil.isEmpty(newWs, true) == false) {
-newWs += AND;
-}
-
-if (isAntiJoin) { // ( ANTI JOIN: A & ! B 
-newWs += " ( " + ( isWsEmpty ? "" : ws + AND ) + NOT + " ( " + js + " ) " + " ) ";
-}
-else if (isForeignJoin) { // ) FOREIGN JOIN: (! A) & B // preparedValueList.add 不好反过来 B & ! A
-newWs += " ( " + NOT + " ( " + ws + " ) ) " + AND + " ( " + js + " ) ";
-}
-else if (isSideJoin) { // ^ SIDE JOIN: ! (A & B)
-//MySQL 因为 NULL 值处理问题，(A & ! B) | (B & ! A) 与 ! (A & B) 返回结果不一样，后者往往更多
-newWs += " ( " + getCondition(
-true, 
-( isWsEmpty ? "" : ws + AND ) + " ( " + js + " ) "
-) + " ) ";
-}
-else { // & INNER JOIN: A & B; | FULL JOIN: A | B; OUTER JOIN: ! (A | B)
-int logic = Logic.getType(jt);
-newWs += " ( "
-+ getCondition(
-Logic.isNot(logic), 
-ws
-+ ( isWsEmpty ? "" : (Logic.isAnd(logic) ? AND : OR) )
-+ " ( " + js + " ) "
-)
-+ " ) ";
-}
-
-newPvl.addAll(pvl);
-newPvl.addAll(jc.getPreparedValueList());
-
-changed = true;
-break;
-default:
-throw new UnsupportedOperationException(
-"join:value 中 value 里的 " + jt + "/" + j.getPath()
-+ "错误！不支持 " + jt + " 等 [ @ APP, < LEFT, > RIGHT, * CROSS"
-+ ", & INNER, | FULL, ! OUTER, ^ SIDE, ( ANTI, ) FOREIGN ] 之外的 JOIN 类型 !"
-);
-}
-}
-
-if (changed) {
-whereString = newWs;
-setPreparedValueList(newPvl);
-}
-}
-
+whereString = concatJoinWhereString(whereString);
+
 String result = StringUtil.isEmpty(whereString, true) ? "" : (hasPrefix ? " WHERE " : "") + whereString;
 
 if (result.isEmpty() && RequestMethod.isQueryMethod(method) == false) {
@@ -2721,7 +2597,6 @@ else if (isSideJoin) { // ^ SIDE JOIN: ! (A & B)
 }
 
 
-
 public String getWhereString(boolean hasPrefix, RequestMethod method, Map<String, Object> where, Map<String, List<String>> combine, List<Join> joinList, boolean verifyName) throws Exception {
 Set<Entry<String, List<String>>> combineSet = combine == null ? null : combine.entrySet();
 if (combineSet == null || combineSet.isEmpty()) {
@@ -2776,15 +2651,28 @@ else if ("!".equals(ce.getKey())) {
 whereString += (isCombineFirst ? "" : AND) + (Logic.isNot(logic) ? NOT : "") + " ( " + cs + " ) ";
 isCombineFirst = false;
 }
+
+whereString = concatJoinWhereString(whereString);
 
+String s = StringUtil.isEmpty(whereString, true) ? "" : (hasPrefix ? " WHERE " : "") + whereString;
 
+if (s.isEmpty() && RequestMethod.isQueryMethod(method) == false) {
+throw new UnsupportedOperationException("写操作请求必须带条件！！！");
+}
+
+return s;
+}
+
+
+protected String concatJoinWhereString(String whereString) throws Exception {
+List<Join> joinList = getJoinList();
 if (joinList != null) {
 
 String newWs = "";
 String ws = whereString;
 
 List<Object> newPvl = new ArrayList<>();
-List<Object> pvl = new ArrayList<>(preparedValueList);
+List<Object> pvl = new ArrayList<>(getPreparedValueList());
 
 SQLConfig jc;
 String js;
@@ -2873,7 +2761,7 @@ else if (isSideJoin) { // ^ SIDE JOIN: ! (A & B)
 ) + " ) ";
 }
 else { // & INNER JOIN: A & B; | FULL JOIN: A | B; OUTER JOIN: ! (A | B)
-logic = Logic.getType(jt);
+int logic = Logic.getType(jt);
 newWs += " ( "
 + getCondition(
 Logic.isNot(logic), 
@@ -2900,19 +2788,14 @@ else if (isSideJoin) { // ^ SIDE JOIN: ! (A & B)
 
 if (changed) {
 whereString = newWs;
-preparedValueList = newPvl;
+setPreparedValueList(newPvl);
 }
 }
 
-String s = StringUtil.isEmpty(whereString, true) ? "" : (hasPrefix ? " WHERE " : "") + whereString;
-
-if (s.isEmpty() && RequestMethod.isQueryMethod(method) == false) {
-throw new UnsupportedOperationException("写操作请求必须带条件！！！");
-}
-
-return s;
+return whereString;
 }
 
+
 /**
  * @param key
  * @param value