Server:解决 explain 拿到的字段不完整

TommyLemon · TommyLemon · commit 57920dc3c4d0 · 2019-05-03T17:23:15.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractParser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractParser.java
@@ -859,11 +859,14 @@ public JSONArray onArrayParse(JSONObject request, String parentPath, String name
 
 		int len = explain || isSubquery ? 1 : size;
 		JSONObject parent;
-		for (int i = 0; i < len; i++) { //生成len个
+		for (int i = 0; i < len; i++) { //生成len个, config.setType(SQLConfig.TYPE_ITEM) 每次都必要，因为内部会设置成其它值
 			parent = onObjectParse(request, path, "" + i, config.setType(SQLConfig.TYPE_ITEM).setPosition(i), isSubquery);
 			if (parent == null || parent.isEmpty()) {
 				break;
 			}
+			if (explain) {
+				parent.put(JSONRequest.KEY_EXPLAIN, explain);
+			}
 			//key[]:{Table:{}}中key equals Table时 提取Table
 			response.add(getValue(parent, childKeys)); //null有意义
 		}
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java
@@ -181,7 +181,7 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
 
 		ResultSet rs = null;
 
-		boolean noCache = false; // true;
+		boolean noCache = true;
 
 		if (unknowType) {
 			Statement statement = getStatement(config);
@@ -229,7 +229,7 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
 
 			case GET:
 			case GETS:
-//				noCache = config.isExplain() || config.isTest();
+				noCache = config.isExplain() || config.isTest();
 
 				result = noCache ? null : getCacheItem(sql, position, config.getCache());
 				Log.i(TAG, ">>> select  result = getCache('" + sql + "', " + position + ") = " + result);
@@ -282,7 +282,7 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
 				// }
 
 				// bugfix-修复非常规数据库字段，获取表名失败导致输出异常
-				if (hasJoin && viceColumnStart > length) {
+				if (noCache == false && hasJoin && viceColumnStart > length) {
 					List<String> column = config.getColumn();
 
 					if (column != null && column.isEmpty() == false) {
@@ -293,7 +293,7 @@ else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
 					}
 				}
 
-				item = onPutColumn(config, rs, rsmd, index, item, i, hasJoin && i >= viceColumnStart ? childMap : null);
+				item = onPutColumn(config, rs, rsmd, index, item, i, noCache == false && hasJoin && i >= viceColumnStart ? childMap : null);
 			}
 
 			resultList = onPutTable(config, rs, rsmd, resultList, index, item);
@@ -321,7 +321,7 @@ else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
 
 		// @ APP JOIN 查询副表并缓存到 childMap >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-//		if (noCache == false) {
+		if (noCache == false) {
 			//子查询 SELECT Moment.*, Comment.id 中的 Comment 内字段
 			Set<Entry<String, JSONObject>> set = childMap.entrySet();
 
@@ -333,7 +333,7 @@ else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
 			}
 
 			putCache(sql, resultList, config.getCache());
-//		}
+		}
 		Log.i(TAG, ">>> select  putCache('" + sql + "', resultList);  resultList.size() = " + resultList.size());
 
 		long endTime = System.currentTimeMillis();
