* CROSS JOIN 允许没有 JOIN ON 引用赋值关联条件；默认禁用 JOIN ON 复杂关联方式

TommyLemon · TommyLemon · commit 38c19975ea67 · 2022-03-14T00:07:07.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -1494,7 +1494,7 @@ else if (join != null){
 			}
 
 			Set<Entry<String, Object>> refSet = refObj.entrySet();
-			if (refSet.isEmpty()) {
+			if (refSet.isEmpty() && "*".equals(joinType) == false) {
 				throw new IllegalArgumentException(JSONRequest.KEY_JOIN + ":value 中 value 的 alias 值 " + alias + " 不合法！"
 						+ "必须为 &/Table0,</Table1/key1,@/Table1:alias2/key2,... 或 { '&/Table0':{}, '</Table1/key1':{},... } 这种格式！"
 						+ "且 Table:alias 的 alias 必须满足英文单词变量名格式！");
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -4084,10 +4084,10 @@ else if (isClickHouse()) {
 	}
 
 	protected void onJoinNotRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {
-//		throw new UnsupportedOperationException("JOIN 已禁用 '!' 非逻辑连接符 ！性能很差、需求极少，如要取消禁用可在后端重写相关方法！");
+		throw new UnsupportedOperationException("JOIN 已禁用 '!' 非逻辑连接符 ！性能很差、需求极少，如要取消禁用可在后端重写相关方法！");
 	}
 	protected void onJoinComplextRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {
-//		throw new UnsupportedOperationException("JOIN 已禁用 $, ~, {}, <>, >, <, >=, <= 等复杂关联 ！性能很差、需求极少，默认只允许等价关联，如要取消禁用可在后端重写相关方法！");
+		throw new UnsupportedOperationException("JOIN 已禁用 $, ~, {}, <>, >, <, >=, <= 等复杂关联 ！性能很差、需求极少，默认只允许 = 等价关联，如要取消禁用可在后端重写相关方法！");
 	}
 	protected void onGetCrossJoinString(Join j) throws UnsupportedOperationException {
 		throw new UnsupportedOperationException("已禁用 * CROSS JOIN ！性能很差、需求极少，如要取消禁用可在后端重写相关方法！");

Original file line number	Diff line number	Diff line change
`@@ -1494,7 +1494,7 @@ else if (join != null){`
`1494`	`1494`	`}`
`1495`	`1495`
`1496`	`1496`	`Set<Entry<String, Object>> refSet = refObj.entrySet();`
`1497`		`- if (refSet.isEmpty()) {`
	`1497`	`+ if (refSet.isEmpty() && "*".equals(joinType) == false) {`
`1498`	`1498`	`throw new IllegalArgumentException(JSONRequest.KEY_JOIN + ":value 中 value 的 alias 值 " + alias + " 不合法！"`
`1499`	`1499`	`+ "必须为 &/Table0,</Table1/key1,@/Table1:alias2/key2,... 或 { '&/Table0':{}, '</Table1/key1':{},... } 这种格式！"`
`1500`	`1500`	`+ "且 Table:alias 的 alias 必须满足英文单词变量名格式！");`
Original file line number	Diff line number	Diff line change
`@@ -4084,10 +4084,10 @@ else if (isClickHouse()) {`
`4084`	`4084`	`}`
`4085`	`4085`
`4086`	`4086`	`protected void onJoinNotRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {`
`4087`		`-// throw new UnsupportedOperationException("JOIN 已禁用 '!' 非逻辑连接符！性能很差、需求极少，如要取消禁用可在后端重写相关方法！");`
	`4087`	`+ throw new UnsupportedOperationException("JOIN 已禁用 '!' 非逻辑连接符！性能很差、需求极少，如要取消禁用可在后端重写相关方法！");`
`4088`	`4088`	`}`
`4089`	`4089`	`protected void onJoinComplextRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {`
`4090`		`-// throw new UnsupportedOperationException("JOIN 已禁用 $, ~, {}, <>, >, <, >=, <= 等复杂关联！性能很差、需求极少，默认只允许等价关联，如要取消禁用可在后端重写相关方法！");`
	`4090`	`+ throw new UnsupportedOperationException("JOIN 已禁用 $, ~, {}, <>, >, <, >=, <= 等复杂关联！性能很差、需求极少，默认只允许 = 等价关联，如要取消禁用可在后端重写相关方法！");`
`4091`	`4091`	`}`
`4092`	`4092`	`protected void onGetCrossJoinString(Join j) throws UnsupportedOperationException {`
`4093`	`4093`	`throw new UnsupportedOperationException("已禁用 * CROSS JOIN ！性能很差、需求极少，如要取消禁用可在后端重写相关方法！");`