Server: LEFT JOIN 和 RIGHT JOIN 的 表对象内部的 @group, @having, @order 不加到子查询外层，其它 SQL JOIN 的不允许被 join 键值对里的覆盖

TommyLemon · TommyLemon · commit dabbeeb5c0c1 · 2019-04-07T19:41:17.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java
@@ -308,7 +308,6 @@ public String getGroupString(boolean hasPrefix) {
 		//加上子表的 group
 		String joinGroup = "";
 		if (joinList != null) {
-			SQLConfig ecfg;
 			SQLConfig cfg;
 			String c;
 			boolean first = true;
@@ -317,14 +316,7 @@ public String getGroupString(boolean hasPrefix) {
 					continue;
 				}
 
-				ecfg = j.getOutterConfig();
-				if (ecfg != null && ecfg.getGroup() != null) { //优先级更高
-					cfg = ecfg;
-				}
-				else {
-					cfg = j.getJoinConfig();
-				}
-
+				cfg = j.isLeftOrRightJoin() ? j.getOutterConfig() : j.getJoinConfig();
 				cfg.setAlias(cfg.getTable());
 
 				c = ((AbstractSQLConfig) cfg).getGroupString(false);
@@ -376,7 +368,6 @@ public String getHavingString(boolean hasPrefix) {
 		//加上子表的 having
 		String joinHaving = "";
 		if (joinList != null) {
-			SQLConfig ecfg;
 			SQLConfig cfg;
 			String c;
 			boolean first = true;
@@ -385,14 +376,7 @@ public String getHavingString(boolean hasPrefix) {
 					continue;
 				}
 
-				ecfg = j.getOutterConfig();
-				if (ecfg != null && ecfg.getHaving() != null) { //优先级更高
-					cfg = ecfg;
-				}
-				else {
-					cfg = j.getJoinConfig();
-				}
-
+				cfg = j.isLeftOrRightJoin() ? j.getOutterConfig() : j.getJoinConfig();
 				cfg.setAlias(cfg.getTable());
 
 				c = ((AbstractSQLConfig) cfg).getHavingString(false);
@@ -492,7 +476,6 @@ public String getOrderString(boolean hasPrefix) {
 		//加上子表的 order
 		String joinOrder = "";
 		if (joinList != null) {
-			SQLConfig ecfg;
 			SQLConfig cfg;
 			String c;
 			boolean first = true;
@@ -501,14 +484,7 @@ public String getOrderString(boolean hasPrefix) {
 					continue;
 				}
 
-				ecfg = j.getOutterConfig();
-				if (ecfg != null && ecfg.getOrder() != null) { //优先级更高
-					cfg = ecfg;
-				}
-				else {
-					cfg = j.getJoinConfig();
-				}
-
+				cfg = j.isLeftOrRightJoin() ? j.getOutterConfig() : j.getJoinConfig();
 				cfg.setAlias(cfg.getTable());
 
 				c = ((AbstractSQLConfig) cfg).getOrderString(false);
@@ -2384,7 +2360,7 @@ public static AbstractSQLConfig parseJoin(RequestMethod method, AbstractSQLConfi
 
 				joinConfig.setMain(false).setKeyPrefix(true);
 
-				if ("<".equals(j.getJoinType()) || ">".equals(j.getJoinType())) {
+				if (j.isLeftOrRightJoin()) {
 					SQLConfig outterConfig = newSQLConfig(method, name, j.getOutter(), null, callback);
 					outterConfig.setMain(false).setKeyPrefix(true);
 					j.setOutterConfig(outterConfig);
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/Join.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/Join.java
@@ -22,9 +22,9 @@
  * @author Lemon
  */
 public class Join {
-	
+
 	private String path;
-	
+
 	private String originKey;
 	private String originValue;
 
@@ -37,7 +37,7 @@ public class Join {
 	private String targetKey; // userId
 
 	private JSONObject outter;
-	
+
 	private SQLConfig joinConfig;
 	private SQLConfig cacheConfig;
 	private SQLConfig outterConfig;
@@ -61,7 +61,7 @@ public String getOriginValue() {
 	public void setOriginValue(String originValue) {
 		this.originValue = originValue;
 	}
-	
+
 	public String getJoinType() {
 		return joinType;
 	}
@@ -125,23 +125,23 @@ public SQLConfig getCacheConfig() {
 	public void setCacheConfig(SQLConfig cacheConfig) {
 		this.cacheConfig = cacheConfig;
 	}
-	
+
 	public SQLConfig getOutterConfig() {
 		return outterConfig;
 	}
 	public void setOutterConfig(SQLConfig outterConfig) {
 		this.outterConfig = outterConfig;
 	}
 
-	
+
 	public void setKeyAndType(@NotNull String originKey) throws Exception { //id, id@, id{}@, contactIdList<>@ ...
 		if (originKey.endsWith("@")) {
 			originKey = originKey.substring(0, originKey.length() - 1);
 		}
 		else { //TODO 暂时只允许 User.id = Moment.userId 字段关联，不允许 User.id = 82001 这种
 			throw new IllegalArgumentException(joinType + "/.../" + name + "/" + originKey + " 不合法！join:'.../refKey'" + " 中 refKey 必须以 @ 结尾！");
 		}
-		
+
 		if (originKey.endsWith("{}")) {
 			setRelateType("{}");
 			setKey(originKey.substring(0, originKey.length() - 2));
@@ -155,25 +155,32 @@ else if (originKey.endsWith("<>")) {
 			setKey(originKey);
 		}
 	}
-	
-	
-	
+
+
+
 	public boolean isSQLJoin() {
 		return ! isAppJoin();
 	}
-	
+
 	public static boolean isSQLJoin(Join j) {
 		return j != null && j.isSQLJoin();
 	}
-	
+
 	public boolean isAppJoin() {
 		return "@".equals(getJoinType());
 	}
-	
+
 	public static boolean isAppJoin(Join j) {
 		return j != null && j.isAppJoin();
 	}
-	
+
+	public boolean isLeftOrRightJoin() {
+		return "<".equals(getJoinType()) || ">".equals(getJoinType());
+	}
+
+	public static boolean isLeftOrRightJoin(Join j) {
+		return j != null && j.isLeftOrRightJoin();
+	}
 
 
 
