Server:完成 @from@:{} 对应的 FROM 类型子查询

TommyLemon · TommyLemon · commit 39a905bb0701 · 2019-01-06T22:47:08.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java
@@ -352,10 +352,11 @@ public boolean onParse(@NotNull String key, @NotNull Object value) throws Except
 				SQLConfig cfg = arrObj == null ? null : (SQLConfig) arrObj.get(AbstractParser.KEY_CONFIG);
 				
 				Subquery s = new Subquery();
-				s.setPath(parentPath);
+				s.setPath(path);
 				s.setOriginKey(key);
 				s.setOriginValue(subquery);
 
+				s.setFrom(from);
 				s.setRange(range);
 				s.setKey(replaceKey);
 				s.setConfig(cfg);
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java
@@ -17,6 +17,7 @@
 import static zuo.biao.apijson.JSONObject.KEY_COLUMN;
 import static zuo.biao.apijson.JSONObject.KEY_COMBINE;
 import static zuo.biao.apijson.JSONObject.KEY_DATABASE;
+import static zuo.biao.apijson.JSONObject.KEY_FROM;
 import static zuo.biao.apijson.JSONObject.KEY_GROUP;
 import static zuo.biao.apijson.JSONObject.KEY_HAVING;
 import static zuo.biao.apijson.JSONObject.KEY_ID;
@@ -96,6 +97,7 @@ public abstract class AbstractSQLConfig implements SQLConfig {
 	private String group; //分组方式的字符串数组，','分隔
 	private String having; //聚合函数的字符串数组，','分隔
 	private String order; //排序方式的字符串数组，','分隔
+	private Subquery from; //子查询临时表
 	private List<String> column; //表内字段名(或函数名，仅查询操作可用)的字符串数组，','分隔
 	private List<List<Object>> values; //对应表内字段的值的字符串数组，','分隔
 	private Map<String, Object> content; //Request内容，key:value形式，column = content.keySet()，values = content.values()
@@ -110,7 +112,6 @@ public abstract class AbstractSQLConfig implements SQLConfig {
 	private int query; //JSONRequest.query
 	private int type; //ObjectParser.type
 	private List<Join> joinList; //连表 配置列表
-	private List<Subquery> subqueryList; //子查询 配置列表
 	//array item >>>>>>>>>>
 	private boolean test; //测试
 	private boolean cacheStatic; //静态缓存
@@ -454,6 +455,15 @@ public String getOrderString() {
 	}
 
 
+	@Override
+	public Subquery getFrom() {
+		return from;
+	}
+	@Override
+	public AbstractSQLConfig setFrom(Subquery from) {
+		this.from = from;
+		return this;
+	}
 
 	@Override
 	public List<String> getColumn() {
@@ -745,18 +755,6 @@ public boolean hasJoin() {
 		return joinList != null && joinList.isEmpty() == false;
 	}
 	
-	@Override
-	public List<Subquery> getSubqueryList() {
-		return subqueryList;
-	}
-	@Override
-	public void setSubqueryList(List<Subquery> subqueryList) {
-		this.subqueryList = subqueryList;
-	}
-	@Override
-	public boolean hasSubquery() {
-		return subqueryList != null && subqueryList.isEmpty() == false;
-	}
 
 	@Override
 	public boolean isTest() {
@@ -1688,6 +1686,11 @@ public static String getSQL(AbstractSQLConfig config) throws Exception {
 	private static String getConditionString(String column, String table, AbstractSQLConfig config) throws Exception {
 		String where = config.getWhereString(true);
 
+		Subquery from = config.getFrom();
+		if (from != null) {
+			table = config.getSubqueryString(from) + " AS " + config.getKey(from.getFrom()) + " "; //TODO Comment:c 转为  AS `Comment:c`
+		}
+		
 		String condition = table + config.getJoinString() + where + (
 				RequestMethod.isGetMethod(config.getMethod(), true) == false ?
 						"" : config.getGroupString() + config.getHavingString() + config.getOrderString()
@@ -1866,6 +1869,7 @@ else if (id instanceof String) {
 		String database = request.getString(KEY_DATABASE);
 		String schema = request.getString(KEY_SCHEMA);
 		String combine = request.getString(KEY_COMBINE);
+		Subquery from = (Subquery) request.get(KEY_FROM);
 		String column = request.getString(KEY_COLUMN);
 		String group = request.getString(KEY_GROUP);
 		String having = request.getString(KEY_HAVING);
@@ -1879,6 +1883,7 @@ else if (id instanceof String) {
 		request.remove(KEY_DATABASE);
 		request.remove(KEY_SCHEMA);
 		request.remove(KEY_COMBINE);
+		request.remove(KEY_FROM);
 		request.remove(KEY_COLUMN);
 		request.remove(KEY_GROUP);
 		request.remove(KEY_HAVING);
@@ -2055,6 +2060,7 @@ else if (whereList != null && whereList.contains(key)) {
 			}
 		}
 
+		config.setFrom(from);
 		config.setColumn(cs);
 		config.setWhere(tableWhere);					
 
@@ -2079,6 +2085,7 @@ else if (whereList != null && whereList.contains(key)) {
 		request.put(KEY_DATABASE, database);
 		request.put(KEY_SCHEMA, schema);
 		request.put(KEY_COMBINE, combine);
+		request.put(KEY_FROM, from);
 		request.put(KEY_COLUMN, column);
 		request.put(KEY_GROUP, group);
 		request.put(KEY_HAVING, having);
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/SQLConfig.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/SQLConfig.java
@@ -125,6 +125,9 @@ public interface SQLConfig {
 	String getOrder();
 	SQLConfig setOrder(String order);
 
+	Subquery getFrom();
+	SQLConfig setFrom(Subquery from);
+	
 	List<String> getColumn();
 	SQLConfig setColumn(List<String> column);
 
@@ -195,12 +198,6 @@ public interface SQLConfig {
 	boolean hasJoin();
 	
 	
-	List<Subquery> getSubqueryList();
-
-	void setSubqueryList(List<Subquery> subqueryList);
-
-	boolean hasSubquery();
-	
 	String getSubqueryString(Subquery subquery) throws Exception;
 
 }
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/Subquery.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/Subquery.java
@@ -25,6 +25,7 @@ public class Subquery {
 	private String originKey;
 	private JSONObject originValue;
 
+	private String from; // any, all
 	private String range; // any, all
 	private String key; //id
 	private SQLConfig config;
@@ -48,6 +49,13 @@ public JSONObject getOriginValue() {
 	public void setOriginValue(JSONObject originValue) {
 		this.originValue = originValue;
 	}
+	
+	public String getFrom() {
+		return from;
+	}
+	public void setFrom(String from) {
+		this.from = from;
+	}
 	public String getRange() {
 		return range;
 	}
