Server:子查询range的all和any全改为大写的ALL和ANY；解决=,IN等只能是1个字段的子查询嵌套JOIN会因为超过一个字段报错

TommyLemon · TommyLemon · commit 79cd739efeea · 2019-01-19T17:42:59.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/StringUtil.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/StringUtil.java
@@ -837,6 +837,29 @@ public static String toLowerCase(String s, boolean trim) {
 		return s.toLowerCase();
 	}
 
+	public static String concat(String left, String right) {
+		return concat(left, right, null);
+	}
+	public static String concat(String left, String right, String split) {
+		return concat(left, right, split, true);
+	}
+	public static String concat(String left, String right, boolean trim) {
+		return concat(left, right, null, trim);
+	}
+	public static String concat(String left, String right, String split, boolean trim) {
+		if (isEmpty(left, trim)) {
+			return right;
+		}
+		if (isEmpty(right, trim)) {
+			return left;
+		}
+
+		if (split == null) {
+			split = ",";
+		}
+		return left + split + right;
+	}
+
 	//校正（自动补全等）字符串>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 }
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java
@@ -334,8 +334,8 @@ public boolean onParse(@NotNull String key, @NotNull Object value) throws Except
 				
 				JSONObject subquery = (JSONObject) value;
 				String range = subquery.getString("range");
-				if (range != null && "any".equals(range) == false && "all".equals(range) == false) {
-					throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ range:value } 中 value 只能为 [any, all] 中的一个！");
+				if (range != null && "ANY".equals(range) == false && "ALL".equals(range) == false) {
+					throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ range:value } 中 value 只能为 [ANY, ALL] 中的一个！");
 				}
 
 				
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
@@ -476,6 +476,10 @@ public AbstractSQLConfig setColumn(List<String> column) {
 	}
 	@JSONField(serialize = false)
 	public String getColumnString() throws Exception {
+		return getColumnString(false);
+	}
+	@JSONField(serialize = false)
+	public String getColumnString(boolean inSQLJoin) throws Exception {
 		switch (getMethod()) {
 		case HEAD:
 		case HEADS: //StringUtil.isEmpty(column, true) || column.contains(",") 时SQL.count(column)会return "*"
@@ -506,17 +510,23 @@ public String getColumnString() throws Exception {
 			boolean isQuery = RequestMethod.isQueryMethod(method);
 			String joinColumn = "";
 			if (isQuery && joinList != null) {
-				SQLConfig c;
+				SQLConfig cfg;
+				String c;
 				boolean first = true;
 				for (Join j : joinList) {
 					if (j.isAppJoin()) {
 						continue;
 					}
 
-					c = j.getJoinConfig();
-					c.setAlias(c.getTable());
-					joinColumn += (first ? "" : ", ") + ((AbstractSQLConfig) c).getColumnString();
+					cfg = j.getJoinConfig();
+					cfg.setAlias(cfg.getTable());
+
+					c = ((AbstractSQLConfig) cfg).getColumnString(true);
+					if (StringUtil.isEmpty(c, true) == false) {
+						joinColumn += (first ? "" : ", ") + c;
+					}
 
+					inSQLJoin = true;
 					first = false;
 				}
 			}
@@ -527,7 +537,11 @@ public String getColumnString() throws Exception {
 
 			String[] keys = column == null ? null : column.toArray(new String[]{}); //StringUtil.split(c, ";");
 			if (keys == null || keys.length <= 0) {
-				return isKeyPrefix() == false ? "*" : (tableAlias + ".*" + (StringUtil.isEmpty(joinColumn, true) ? "" : ", " + joinColumn));
+				
+				boolean noColumn = column != null && inSQLJoin;
+				String mc = isKeyPrefix() == false ? (noColumn ? "" : "*") : (noColumn ? "" : tableAlias + ".*");
+				
+				return StringUtil.concat(mc, joinColumn, ", ", true);
 			}
 
 
@@ -2114,7 +2128,7 @@ else if (whereList != null && whereList.contains(key)) {
 		}
 
 		config.setFrom(from);
-		config.setColumn(cs);
+		config.setColumn(column == null ? null : cs); //解决总是 config.column != null，总是不能得到 *
 		config.setWhere(tableWhere);					
 
 		config.setId(id);

Original file line number	Diff line number	Diff line change
`@@ -334,8 +334,8 @@ public boolean onParse(@NotNull String key, @NotNull Object value) throws Except`
`334`	`334`
`335`	`335`	`JSONObject subquery = (JSONObject) value;`
`336`	`336`	`String range = subquery.getString("range");`
`337`		`- if (range != null && "any".equals(range) == false && "all".equals(range) == false) {`
`338`		`- throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ range:value } 中 value 只能为 [any, all] 中的一个！");`
	`337`	`+ if (range != null && "ANY".equals(range) == false && "ALL".equals(range) == false) {`
	`338`	`+ throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ range:value } 中 value 只能为 [ANY, ALL] 中的一个！");`
`339`	`339`	`}`
`340`	`340`
`341`	`341`