Revert "Server：调整 ^ SIDE JOIN(ANTI JOIN) 的实现为 ! (A & B)，和原来的实现 (A & ! B) | (B & ! A) 查询结果不一致，一般数量更多！"

TommyLemon · TommyLemon · commit bd96636047db · 2020-05-02T02:37:16.000+08:00
This reverts commit 5ebfa8d.
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -1387,31 +1387,36 @@ else if ("!".equals(ce.getKey())) {
 						newWs += AND;
 					}
 
-					if ("^".equals(j.getJoinType())) { // ! (A & B)
-						newWs += " ( " + getCondition(
-								true, 
-								( StringUtil.isEmpty(ws, true) ? "" : ws + AND ) + " ( " + js + " ) "
-						) + " ) ";
+					if ("^".equals(j.getJoinType())) { // (A & ! B) | (B & ! A)
+						newWs += " (   ( " + ws + ( StringUtil.isEmpty(ws, true) ? "" : AND + NOT ) + " ( " + js + " ) ) "
+								+ OR
+								+ " ( " + js + AND + NOT + " ( " + ws + " )  )   ) ";
+
+						newPvl.addAll(pvl);
+						newPvl.addAll(jc.getPreparedValueList());
+						newPvl.addAll(jc.getPreparedValueList());
+						newPvl.addAll(pvl);
 					}
 					else {
 						logic = Logic.getType(j.getJoinType());
 
-						newWs += " ( " + getCondition(
-								Logic.isNot(logic), 
-								( StringUtil.isEmpty(ws, true) ? "" : ws + (Logic.isAnd(logic) ? AND : OR) ) + " ( " + js + " ) "
-						) + " ) ";
+						newWs += " ( "
+								+ getCondition(
+										Logic.isNot(logic), 
+										ws
+										+ ( StringUtil.isEmpty(ws, true) ? "" : (Logic.isAnd(logic) ? AND : OR) )
+										+ " ( " + js + " ) "
+										)
+								+ " ) ";
+
+						newPvl.addAll(pvl);
+						newPvl.addAll(jc.getPreparedValueList());
 					}
-					
-					newPvl.addAll(pvl);
-					newPvl.addAll(jc.getPreparedValueList());
 
 					changed = true;
 					break;
 				default:
-					throw new UnsupportedOperationException(
-							"join:value 中 value 里的 " + j.getJoinType() + "/" + j.getPath() + "错误！不支持 " + j.getJoinType()
-							+ " 等 [@ APP, < LEFT, > RIGHT, | FULL, & INNER, ! OUTTER, ^ SIDE, * CROSS] 之外的JOIN类型 !"
-					);
+					throw new UnsupportedOperationException("join:value 中 value 里的 " + j.getJoinType() + "/" + j.getPath() + "错误！不支持 " + j.getJoinType() + " 等 [@ APP, < LEFT, > RIGHT, | FULL, & INNER, ! OUTTER, ^ SIDE, * CROSS] 之外的JOIN类型 !");
 				}
 			}
 
