diff --git a/.gitignore b/.gitignore index f4b1dd878..a06bbd0a8 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ build/ ### VS Code ### .vscode/ APIJSONORM/bin +*.DS_Store diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml index f656d471b..2d0768fff 100644 --- a/APIJSONORM/pom.xml +++ b/APIJSONORM/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.github.Tencent - APIJSON-spring-boot3 - 6.2.0 + APIJSON + 7.8.0 jar APIJSONORM @@ -14,9 +14,10 @@ UTF-8 UTF-8 - 17 - 17 - 17 + 1.8 + UTF-8 + 1.8 + 1.8 @@ -32,10 +33,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.12.1 - 17 - 17 + 1.8 + 1.8 diff --git a/APIJSONORM/src/main/java/apijson/JSON.java b/APIJSONORM/src/main/java/apijson/JSON.java index 48b80aac4..d7854aae1 100755 --- a/APIJSONORM/src/main/java/apijson/JSON.java +++ b/APIJSONORM/src/main/java/apijson/JSON.java @@ -8,7 +8,6 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.alibaba.fastjson.JSONReader; import java.util.List; @@ -203,7 +202,7 @@ public static String toJSONString(Object obj, SerializerFeature... features) { try { return com.alibaba.fastjson.JSON.toJSONString(obj, features); } catch (Exception e) { - Log.e(TAG, "parseArray catch \n" + e.getMessage()); + Log.e(TAG, "toJSONString catch \n" + e.getMessage()); } return null; } diff --git a/APIJSONORM/src/main/java/apijson/JSONObject.java b/APIJSONORM/src/main/java/apijson/JSONObject.java index 8aa8eac3d..6f4359019 100755 --- a/APIJSONORM/src/main/java/apijson/JSONObject.java +++ b/APIJSONORM/src/main/java/apijson/JSONObject.java @@ -139,8 +139,10 @@ public JSONObject setUserIdIn(List list) { public static final String KEY_ROLE = "@role"; //角色,拥有对某些数据的某些操作的权限 public static final String KEY_DATABASE = "@database"; //数据库类型,默认为MySQL - public static final String KEY_SCHEMA = "@schema"; //数据库,Table在非默认schema内时需要声明 public static final String KEY_DATASOURCE = "@datasource"; //数据源 + public static final String KEY_NAMESPACE = "@namespace"; //命名空间,Table 在非默认 namespace 内时需要声明 + public static final String KEY_CATALOG = "@catalog"; //目录,Table 在非默认 catalog 内时需要声明 + public static final String KEY_SCHEMA = "@schema"; //数据库,Table 在非默认 schema 内时需要声明 public static final String KEY_EXPLAIN = "@explain"; //分析 true/false public static final String KEY_CACHE = "@cache"; //缓存 RAM/ROM/ALL public static final String KEY_COLUMN = "@column"; //查询的Table字段或SQL函数 @@ -169,8 +171,10 @@ public JSONObject setUserIdIn(List list) { TABLE_KEY_LIST = new ArrayList(); TABLE_KEY_LIST.add(KEY_ROLE); TABLE_KEY_LIST.add(KEY_DATABASE); - TABLE_KEY_LIST.add(KEY_SCHEMA); TABLE_KEY_LIST.add(KEY_DATASOURCE); + TABLE_KEY_LIST.add(KEY_NAMESPACE); + TABLE_KEY_LIST.add(KEY_CATALOG); + TABLE_KEY_LIST.add(KEY_SCHEMA); TABLE_KEY_LIST.add(KEY_EXPLAIN); TABLE_KEY_LIST.add(KEY_CACHE); TABLE_KEY_LIST.add(KEY_COLUMN); @@ -253,13 +257,6 @@ public JSONObject setRole(String role) { public JSONObject setDatabase(String database) { return puts(KEY_DATABASE, database); } - /**set schema where table was puts - * @param schema - * @return this - */ - public JSONObject setSchema(String schema) { - return puts(KEY_SCHEMA, schema); - } /**set datasource where table was puts * @param datasource * @return this @@ -267,6 +264,27 @@ public JSONObject setSchema(String schema) { public JSONObject setDatasource(String datasource) { return puts(KEY_DATASOURCE, datasource); } + /**set namespace where table was puts + * @param namespace + * @return this + */ + public JSONObject setNamespace(String namespace) { + return puts(KEY_NAMESPACE, namespace); + } + /**set catalog where table was puts + * @param catalog + * @return this + */ + public JSONObject setCatalog(String catalog) { + return puts(KEY_CATALOG, catalog); + } + /**set schema where table was puts + * @param schema + * @return this + */ + public JSONObject setSchema(String schema) { + return puts(KEY_SCHEMA, schema); + } /**set if return explain informations * @param explain * @return @@ -480,6 +498,31 @@ public JSONObject putsEmpty(String key, boolean isEmpty, boolean trim) { public JSONObject putsLength(String key, String compare) { return puts(key+"{}", SQL.length(key) + compare); } + /** + * @param key + * @param compare <=, > ... + * @param value 1, 5, 3.14, -99 ... + * @return {@link #puts(String, Object)} + */ + public JSONObject putsLength(String key, String compare, Object value) { + return puts(key+"["+(StringUtil.isEmpty(compare) || "=".equals(compare) ? "" : ("!=".equals(compare) ? "!" : compare)), value); + } + /** + * @param key + * @param compare <=0, >5 ... + * @return {@link #puts(String, Object)} + */ + public JSONObject putsJSONLength(String key, String compare) { + return puts(key+"{}", SQL.json_length(key) + compare); + } + /** + * @param key + * @param compare <=0, >5 ... + * @return {@link #puts(String, Object)} + */ + public JSONObject putsJSONLength(String key, String compare, Object value) { + return puts(key + "{" + (StringUtil.isEmpty(compare) || "=".equals(compare) ? "" : ("!=".equals(compare) ? "!" : compare)), value); + } /**设置搜索 * type = SEARCH_TYPE_CONTAIN_FULL diff --git a/APIJSONORM/src/main/java/apijson/JSONRequest.java b/APIJSONORM/src/main/java/apijson/JSONRequest.java index cf64f1875..62d724199 100755 --- a/APIJSONORM/src/main/java/apijson/JSONRequest.java +++ b/APIJSONORM/src/main/java/apijson/JSONRequest.java @@ -152,7 +152,7 @@ public JSONRequest setSubqueryRange(String range) { } /**set from for Subquery - * @param range + * @param from * @return */ public JSONRequest setSubqueryFrom(String from) { diff --git a/APIJSONORM/src/main/java/apijson/JSONResponse.java b/APIJSONORM/src/main/java/apijson/JSONResponse.java index 9f61edadf..21f3fe8f6 100755 --- a/APIJSONORM/src/main/java/apijson/JSONResponse.java +++ b/APIJSONORM/src/main/java/apijson/JSONResponse.java @@ -485,14 +485,14 @@ public static String formatKey(String fullName, boolean formatColon, boolean for if (formatAt) { //关键词只去掉前缀,不格式化单词,例如 @a-b 返回 a-b ,最后不会调用 setter fullName = formatAt(fullName); } - if (formatHyphen) { - fullName = formatHyphen(fullName, firstCase != null); + if (formatHyphen && fullName.contains("-")) { + fullName = formatHyphen(fullName, true); } - if (formatUnderline) { - fullName = formatUnderline(fullName, firstCase != null); + if (formatUnderline && fullName.contains("_")) { + fullName = formatUnderline(fullName, true); } - if (formatDollar) { - fullName = formatDollar(fullName, firstCase != null); + if (formatDollar && fullName.contains("$")) { + fullName = formatDollar(fullName, true); } // 默认不格式化普通 key:value (value 不为 [], {}) 的 key @@ -520,32 +520,100 @@ public static String formatColon(@NotNull String key) { * @param key * @return */ + public static String formatHyphen(@NotNull String key) { + return StringUtil.firstCase(formatHyphen(key, true), false); + } + /**A-b-cd-Efg => ABCdEfg + * @param key + * @param firstCase 首字符的大小写,true-大写,false-小写,null-不处理 + * @return + */ public static String formatHyphen(@NotNull String key, Boolean firstCase) { - return formatDivider(key, "-", firstCase); + return formatHyphen(key, firstCase, false); + } + /**A-b-cd-Efg => ABCdEfg + * @param key + * @param firstCase 首字符的大小写,true-大写,false-小写,null-不处理 + * @param otherCase 非首字符的大小写,true-大写,false-小写,null-不处理 + * @return + */ + public static String formatHyphen(@NotNull String key, Boolean firstCase, Boolean otherCase) { + return formatDivider(key, "-", firstCase, otherCase); } /**A_b_cd_Efg => ABCdEfg * @param key * @return */ + public static String formatUnderline(@NotNull String key) { + return StringUtil.firstCase(formatUnderline(key, true), false); + } + /**A_b_cd_Efg => ABCdEfg + * @param key + * @param firstCase 首字符的大小写,true-大写,false-小写,null-不处理 + * @return + */ public static String formatUnderline(@NotNull String key, Boolean firstCase) { - return formatDivider(key, "_", firstCase); + return formatUnderline(key, firstCase, false); + } + /**A_b_cd_Efg => ABCdEfg + * @param key + * @param firstCase 首字符的大小写,true-大写,false-小写,null-不处理 + * @param otherCase 非首字符的大小写,true-大写,false-小写,null-不处理 + * @return + */ + public static String formatUnderline(@NotNull String key, Boolean firstCase, Boolean otherCase) { + return formatDivider(key, "_", firstCase, otherCase); } /**A$b$cd$Efg => ABCdEfg * @param key * @return */ + public static String formatDollar(@NotNull String key) { + return StringUtil.firstCase(formatDollar(key, true), false); + } + /**A$b$cd$Efg => ABCdEfg + * @param key + * @param firstCase 首字符的大小写,true-大写,false-小写,null-不处理 + * @return + */ public static String formatDollar(@NotNull String key, Boolean firstCase) { - return formatDivider(key, "$", firstCase); + return formatDollar(key, firstCase, false); + } + /**A$b$cd$Efg => ABCdEfg + * @param key + * @param firstCase 首字符的大小写,true-大写,false-小写,null-不处理 + * @param otherCase 非首字符的大小写,true-大写,false-小写,null-不处理 + * @return + */ + public static String formatDollar(@NotNull String key, Boolean firstCase, Boolean otherCase) { + return formatDivider(key, "$", firstCase, otherCase); } /**A.b.cd.Efg => ABCdEfg * @param key * @return */ + public static String formatDot(@NotNull String key) { + return StringUtil.firstCase(formatDot(key, true), false); + } + /**A.b.cd.Efg => ABCdEfg + * @param key + * @param firstCase 首字符的大小写,true-大写,false-小写,null-不处理 + * @return + */ public static String formatDot(@NotNull String key, Boolean firstCase) { - return formatDivider(key, ".", firstCase); + return formatDot(key, firstCase, false); + } + /**A.b.cd.Efg => ABCdEfg + * @param key + * @param firstCase 首字符的大小写,true-大写,false-小写,null-不处理 + * @param otherCase 非首字符的大小写,true-大写,false-小写,null-不处理 + * @return + */ + public static String formatDot(@NotNull String key, Boolean firstCase, Boolean otherCase) { + return formatDivider(key, ".", firstCase, otherCase); } /**A/b/cd/Efg => ABCdEfg @@ -559,16 +627,36 @@ public static String formatDivider(@NotNull String key, Boolean firstCase) { /**去除分割符,返回驼峰格式 * @param key * @param divider - * @param firstCase + * @return + */ + public static String formatDivider(@NotNull String key, @NotNull String divider) { + return StringUtil.firstCase(formatDivider(key, divider, true), false); + } + /**去除分割符,返回驼峰格式 + * @param key + * @param divider + * @param firstCase 首字符的大小写,true-大写,false-小写,null-不处理 * @return */ public static String formatDivider(@NotNull String key, @NotNull String divider, Boolean firstCase) { + return formatDivider(key, divider, firstCase, false); + } + + /**去除分割符,返回驼峰格式 + * @param key + * @param divider + * @param firstCase 首字符的大小写,true-大写,false-小写,null-不处理 + * @param otherCase 非首字符的大小写,true-大写,false-小写,null-不处理 + * @return + */ + public static String formatDivider(@NotNull String key, @NotNull String divider, Boolean firstCase, Boolean otherCase) { String[] parts = StringUtil.split(key, divider); StringBuilder name = new StringBuilder(); for (String part : parts) { - part = part.toLowerCase(); // 始终小写,也方便反过来 ABCdEfg -> A_b_cd_Efg + if (otherCase != null) { + part = otherCase ? part.toUpperCase() : part.toLowerCase(); + } if (firstCase != null) { - // 始终小写, A_b_cd_Efg -> ABCdEfg, firstCase ? part.toLowerCase() : part.toUpperCase(); part = StringUtil.firstCase(part, firstCase); } name.append(part); diff --git a/APIJSONORM/src/main/java/apijson/Log.java b/APIJSONORM/src/main/java/apijson/Log.java index a1fe34257..86c2e61cc 100755 --- a/APIJSONORM/src/main/java/apijson/Log.java +++ b/APIJSONORM/src/main/java/apijson/Log.java @@ -14,7 +14,7 @@ public class Log { public static boolean DEBUG = true; - public static final String VERSION = "6.2.1"; + public static final String VERSION = "7.8.0"; public static final String KEY_SYSTEM_INFO_DIVIDER = "\n---|-----APIJSON SYSTEM INFO-----|---\n"; public static final String OS_NAME; diff --git a/APIJSONORM/src/main/java/apijson/RequestMethod.java b/APIJSONORM/src/main/java/apijson/RequestMethod.java index 410775c1a..875200b7a 100755 --- a/APIJSONORM/src/main/java/apijson/RequestMethod.java +++ b/APIJSONORM/src/main/java/apijson/RequestMethod.java @@ -83,6 +83,14 @@ public static boolean isHeadMethod(RequestMethod method, boolean containPrivate) public static boolean isQueryMethod(RequestMethod method) { return isGetMethod(method, true) || isHeadMethod(method, true); } + + /**是否为更新(增删改)的请求方法 + * @param method + * @return 读操作(GET型或HEAD型) - false, 写操作(POST,PUT,DELETE) - true + */ + public static boolean isUpdateMethod(RequestMethod method) { + return ! isQueryMethod(method); + } /**是否为开放(不限制请求的结构或内容;明文,浏览器能直接访问及查看)的请求方法 * @param method @@ -92,6 +100,14 @@ public static boolean isPublicMethod(RequestMethod method) { return method == null || method == GET || method == HEAD; } + /**是否为私有(限制请求的结构或内容)的请求方法 + * @param method + * @return + */ + public static boolean isPrivateMethod(RequestMethod method) { + return ! isPublicMethod(method); + } + public static String getName(RequestMethod method) { return method == null ? GET.name() : method.name(); } diff --git a/APIJSONORM/src/main/java/apijson/SQL.java b/APIJSONORM/src/main/java/apijson/SQL.java index 391d5db48..6cec79bd2 100755 --- a/APIJSONORM/src/main/java/apijson/SQL.java +++ b/APIJSONORM/src/main/java/apijson/SQL.java @@ -116,6 +116,13 @@ public static String lengthCompare(String s, String compare) { public static String length(String s) { return "length(" + s + ")"; } + /** + * @param s 因为POWER(x,y)等函数含有不只一个key,所以需要客户端添加进去,服务端检测到条件中有'('和')'时就不转换,直接当SQL语句查询 + * @return "json_length(" + s + ")" + */ + public static String json_length(String s) { + return "json_length(" + s + ")"; + } /** * @param s 因为POWER(x,y)等函数含有不只一个key,所以需要客户端添加进去,服务端检测到条件中有'('和')'时就不转换,直接当SQL语句查询 * @return "char_length(" + s + ")" diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java index e64420138..0a35761cb 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java @@ -27,6 +27,7 @@ import static apijson.JSONObject.KEY_COMBINE; import static apijson.JSONObject.KEY_DROP; import static apijson.JSONObject.KEY_TRY; +import static apijson.JSONRequest.KEY_QUERY; import static apijson.RequestMethod.POST; import static apijson.RequestMethod.PUT; import static apijson.orm.SQLConfig.TYPE_ITEM; @@ -122,6 +123,18 @@ public AbstractObjectParser setParentPath(String parentPath) { return this; } + protected JSONObject cache; + @Override + public JSONObject getCache() { + return cache; + } + + @Override + public AbstractObjectParser setCache(JSONObject cache) { + this.cache = cache; + return this; + } + protected int position; public int getPosition() { return position; @@ -242,6 +255,7 @@ public AbstractObjectParser parse(String name, boolean isReuse) throws Exception int index = 0; // hasOtherKeyNotFun = false; + JSONObject viceItem = null; for (Entry entry : set) { if (isBreakParse()) { @@ -276,10 +290,17 @@ public AbstractObjectParser parse(String name, boolean isReuse) throws Exception } else if (value instanceof JSONObject) { // JSONObject,往下一级提取 if (childMap != null) { // 添加到childMap,最后再解析 - childMap.put(key, (JSONObject)value); + childMap.put(key, (JSONObject) value); } else { // 直接解析并替换原来的,[]:{} 内必须直接解析,否则会因为丢掉count等属性,并且total@:"/[]/total"必须在[]:{} 后! - response.put(key, onChildParse(index, key, (JSONObject)value)); + JSON cache = index <= 0 || type != TYPE_ITEM || viceItem == null ? null : viceItem.getJSONObject(key); + JSON result = onChildParse(index, key, (JSONObject) value, cache); + if (index <= 0 && type == TYPE_ITEM) { + JSONObject mainItem = (JSONObject) result; + viceItem = result == null ? null : (JSONObject) mainItem.remove(AbstractSQLExecutor.KEY_VICE_ITEM); + } + + response.put(key, result); index ++; } } @@ -307,22 +328,42 @@ else if (_method == PUT && value instanceof JSONArray && (whereList == null || w } if (isTable) { - if (parser.getGlobalDatabase() != null && sqlRequest.get(JSONRequest.KEY_DATABASE) == null) { - sqlRequest.put(JSONRequest.KEY_DATABASE, parser.getGlobalDatabase()); + // parser.onVerifyRole 已处理 globalRole + + String db = parser.getGlobalDatabase(); + if (db != null) { + sqlRequest.putIfAbsent(JSONRequest.KEY_DATABASE, db); + } + + String ds = parser.getGlobalDatasource(); + if (ds != null) { + sqlRequest.putIfAbsent(JSONRequest.KEY_DATASOURCE, ds); } - if (parser.getGlobalSchema() != null && sqlRequest.get(JSONRequest.KEY_SCHEMA) == null) { - sqlRequest.put(JSONRequest.KEY_SCHEMA, parser.getGlobalSchema()); + + String ns = parser.getGlobalNamespace(); + if (ns != null) { + sqlRequest.putIfAbsent(JSONRequest.KEY_NAMESPACE, ns); } - if (parser.getGlobalDatasource() != null && sqlRequest.get(JSONRequest.KEY_DATASOURCE) == null) { - sqlRequest.put(JSONRequest.KEY_DATASOURCE, parser.getGlobalDatasource()); + + String cl = parser.getGlobalCatalog(); + if (cl != null) { + sqlRequest.putIfAbsent(JSONRequest.KEY_CATALOG, cl); + } + + String sch = parser.getGlobalSchema(); + if (sch != null) { + sqlRequest.putIfAbsent(JSONRequest.KEY_SCHEMA, sch); } if (isSubquery == false) { // 解决 SQL 语法报错,子查询不能 EXPLAIN - if (parser.getGlobalExplain() != null && sqlRequest.get(JSONRequest.KEY_EXPLAIN) == null) { - sqlRequest.put(JSONRequest.KEY_EXPLAIN, parser.getGlobalExplain()); + Boolean exp = parser.getGlobalExplain(); + if (sch != null) { + sqlRequest.putIfAbsent(JSONRequest.KEY_EXPLAIN, exp); } - if (parser.getGlobalCache() != null && sqlRequest.get(JSONRequest.KEY_CACHE) == null) { - sqlRequest.put(JSONRequest.KEY_CACHE, parser.getGlobalCache()); + + String cache = parser.getGlobalCache(); + if (cache != null) { + sqlRequest.putIfAbsent(JSONRequest.KEY_CACHE, cache); } } } @@ -367,7 +408,7 @@ public boolean onParse(@NotNull String key, @NotNull Object value) throws Except + JSONRequest.SUBQUERY_RANGE_ALL + ", " + JSONRequest.SUBQUERY_RANGE_ANY + "] 中的一个!"); } - JSONArray arr = parser.onArrayParse(subquery, path, key, true); + JSONArray arr = parser.onArrayParse(subquery, path, key, true, null); JSONObject obj = arr == null || arr.isEmpty() ? null : arr.getJSONObject(0); if (obj == null) { @@ -436,10 +477,10 @@ else if (value instanceof String) { // //key{}@ getRealKey, 引用赋值路径 if (isTable && (key.startsWith("@") == false || JSONRequest.TABLE_KEY_LIST.contains(key))) { Log.e(TAG, "onParse isTable && (key.startsWith(@) == false" + " || JSONRequest.TABLE_KEY_LIST.contains(key)) >> return null;"); + // FIXME getCache() != null 时 return true,解决 RIGHT/OUTER/FOREIGN JOIN 主表无数据导致副表数据也不返回 return false; // 获取不到就不用再做无效的 query 了。不考虑 Table:{Table:{}} 嵌套 } - Log.d(TAG, "onParse isTable(table) == false >> return true;"); return true; // 舍去,对Table无影响 } @@ -529,18 +570,19 @@ else if (isTable && key.startsWith("@") && JSONRequest.TABLE_KEY_LIST.contains(k * @param index * @param key * @param value + * @param cache * @return * @throws Exception */ @Override - public JSON onChildParse(int index, String key, JSONObject value) throws Exception { + public JSON onChildParse(int index, String key, JSONObject value, JSON cache) throws Exception { boolean isFirst = index <= 0; boolean isMain = isFirst && type == TYPE_ITEM; JSON child; boolean isEmpty; - if (apijson.JSONObject.isArrayKey(key)) {//APIJSON Array + if (apijson.JSONObject.isArrayKey(key)) { // APIJSON Array if (isMain) { throw new IllegalArgumentException(parentPath + "/" + key + ":{} 不合法!" + "数组 []:{} 中第一个 key:{} 必须是主表 TableKey:{} !不能为 arrayKey[]:{} !"); @@ -555,8 +597,26 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti } } - child = parser.onArrayParse(value, path, key, isSubquery); + String query = value.getString(KEY_QUERY); + child = parser.onArrayParse(value, path, key, isSubquery, cache instanceof JSONArray ? (JSONArray) cache : null); isEmpty = child == null || ((JSONArray) child).isEmpty(); + + if ("2".equals(query) || "ALL".equals(query)) { // 不判断 isEmpty,因为分页数据可能只是某页没有 + String totalKey = JSONResponse.formatArrayKey(key) + "Total"; + String infoKey = JSONResponse.formatArrayKey(key) + "Info"; + if ((request.containsKey(totalKey) || request.containsKey(infoKey) + || request.containsKey(totalKey + "@") || request.containsKey(infoKey + "@")) == false) { + // onParse("total@", "/" + key + "/total"); + // onParse(infoKey + "@", "/" + key + "/info"); + // 替换为以下性能更好、对流程干扰最小的方式: + + String keyPath = AbstractParser.getValuePath(type == TYPE_ITEM ? path : parentPath, "/" + key); + String totalPath = keyPath + "/total"; + String infoPath = keyPath + "/info"; + response.put(totalKey, onReferenceParse(totalPath)); + response.put(infoKey, onReferenceParse(infoPath)); + } + } } else { //APIJSON Object boolean isTableKey = JSONRequest.isTableKey(Pair.parseEntry(key, true).getKey()); @@ -575,7 +635,8 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti } } - child = parser.onObjectParse(value, path, key, isMain ? arrayConfig.setType(SQLConfig.TYPE_ITEM_CHILD_0) : null, isSubquery); + child = parser.onObjectParse(value, path, key, isMain ? arrayConfig.setType(SQLConfig.TYPE_ITEM_CHILD_0) : null + , isSubquery, cache instanceof JSONObject ? (JSONObject) cache : null); isEmpty = child == null || ((JSONObject) child).isEmpty(); if (isFirst && isEmpty) { @@ -757,7 +818,7 @@ public void onTableArrayParse(String key, JSONArray valueArray) throws Exception req = parser.parseCorrectRequest(method, childKey, version, "", req, maxUpdateCount, parser); } //parser.getMaxSQLCount() ? 可能恶意调用接口,把数据库拖死 - result = (JSONObject) onChildParse(0, "" + i, req); + result = (JSONObject) onChildParse(0, "" + i, req, null); } catch (Exception e) { if (allowPartialFailed == false) { @@ -1061,7 +1122,7 @@ public void onChildResponse() throws Exception { if (set != null) { int index = 0; for (Entry entry : set) { - Object child = entry == null ? null : onChildParse(index, entry.getKey(), entry.getValue()); + Object child = entry == null ? null : onChildParse(index, entry.getKey(), entry.getValue(), null); if (child == null || (child instanceof JSONObject && ((JSONObject) child).isEmpty()) || (child instanceof JSONArray && ((JSONArray) child).isEmpty()) @@ -1087,8 +1148,11 @@ public Object onReferenceParse(@NotNull String path) { public JSONObject onSQLExecute() throws Exception { int position = getPosition(); - JSONObject result; - if (isArrayMainTable && position > 0) { // 数组主表使用专门的缓存数据 + JSONObject result = getCache(); + if (result != null) { + parser.putQueryResult(path, result); + } + else if (isArrayMainTable && position > 0) { // 数组主表使用专门的缓存数据 result = parser.getArrayMainCacheItem(parentPath.substring(0, parentPath.lastIndexOf("[]") + 2), position); } else { @@ -1115,7 +1179,8 @@ public JSONObject onSQLExecute() throws Exception { JSONObject obj = rawList.get(i); if (obj != null) { - parser.putQueryResult(arrayPath + "/" + i + "/" + name, obj); // 解决获取关联数据时requestObject里不存在需要的关联数据 + // obj.remove(AbstractSQLExecutor.KEY_VICE_ITEM); + parser.putQueryResult(arrayPath + "/" + i + "/" + name, obj); // 解决获取关联数据时requestObject里不存在需要的关联数据 } } diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java index 1a7441086..624830374 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java @@ -12,7 +12,9 @@ import java.io.UnsupportedEncodingException; import java.lang.management.ManagementFactory; import java.net.InetAddress; +import java.net.URLDecoder; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.sql.Connection; import java.sql.SQLException; import java.sql.Savepoint; @@ -68,8 +70,12 @@ public abstract class AbstractParser implements Parser, Par public static boolean IS_PRINT_REQUEST_ENDTIME_LOG = false; - public static int DEFAULT_QUERY_COUNT = 10; + /** + * 分页页码是否从 1 开始,默认为从 0 开始 + */ + public static boolean IS_START_FROM_1 = false; public static int MAX_QUERY_PAGE = 100; + public static int DEFAULT_QUERY_COUNT = 10; public static int MAX_QUERY_COUNT = 100; public static int MAX_UPDATE_COUNT = 10; public static int MAX_SQL_COUNT = 200; @@ -77,15 +83,22 @@ public abstract class AbstractParser implements Parser, Par public static int MAX_ARRAY_COUNT = 5; public static int MAX_QUERY_DEPTH = 5; + public boolean isStartFrom1() { + return IS_START_FROM_1; + } @Override - public int getDefaultQueryCount() { - return DEFAULT_QUERY_COUNT; + public int getMinQueryPage() { + return isStartFrom1() ? 1 : 0; } @Override public int getMaxQueryPage() { return MAX_QUERY_PAGE; } @Override + public int getDefaultQueryCount() { + return DEFAULT_QUERY_COUNT; + } + @Override public int getMaxQueryCount() { return MAX_QUERY_COUNT; } @@ -307,15 +320,7 @@ public AbstractParser setGlobalDatabase(String globalDatabase) { public String getGlobalDatabase() { return globalDatabase; } - protected String globalSchema; - public AbstractParser setGlobalSchema(String globalSchema) { - this.globalSchema = globalSchema; - return this; - } - @Override - public String getGlobalSchema() { - return globalSchema; - } + protected String globalDatasource; @Override public String getGlobalDatasource() { @@ -326,6 +331,36 @@ public AbstractParser setGlobalDatasource(String globalDatasource) { return this; } + protected String globalNamespace; + public AbstractParser setGlobalNamespace(String globalNamespace) { + this.globalNamespace = globalNamespace; + return this; + } + @Override + public String getGlobalNamespace() { + return globalNamespace; + } + + protected String globalCatalog; + public AbstractParser setGlobalCatalog(String globalCatalog) { + this.globalCatalog = globalCatalog; + return this; + } + @Override + public String getGlobalCatalog() { + return globalCatalog; + } + + protected String globalSchema; + public AbstractParser setGlobalSchema(String globalSchema) { + this.globalSchema = globalSchema; + return this; + } + @Override + public String getGlobalSchema() { + return globalSchema; + } + protected Boolean globalExplain; public AbstractParser setGlobalExplain(Boolean globalExplain) { this.globalExplain = globalExplain; @@ -495,19 +530,25 @@ public JSONObject parseResponse(JSONObject request) { } try { - setGlobalFormat(requestObject.getBoolean(JSONRequest.KEY_FORMAT)); setGlobalDatabase(requestObject.getString(JSONRequest.KEY_DATABASE)); - setGlobalSchema(requestObject.getString(JSONRequest.KEY_SCHEMA)); setGlobalDatasource(requestObject.getString(JSONRequest.KEY_DATASOURCE)); + setGlobalNamespace(requestObject.getString(JSONRequest.KEY_NAMESPACE)); + setGlobalCatalog(requestObject.getString(JSONRequest.KEY_CATALOG)); + setGlobalSchema(requestObject.getString(JSONRequest.KEY_SCHEMA)); + setGlobalExplain(requestObject.getBoolean(JSONRequest.KEY_EXPLAIN)); setGlobalCache(requestObject.getString(JSONRequest.KEY_CACHE)); + setGlobalFormat(requestObject.getBoolean(JSONRequest.KEY_FORMAT)); - requestObject.remove(JSONRequest.KEY_FORMAT); requestObject.remove(JSONRequest.KEY_DATABASE); - requestObject.remove(JSONRequest.KEY_SCHEMA); requestObject.remove(JSONRequest.KEY_DATASOURCE); + requestObject.remove(JSONRequest.KEY_NAMESPACE); + requestObject.remove(JSONRequest.KEY_CATALOG); + requestObject.remove(JSONRequest.KEY_SCHEMA); + requestObject.remove(JSONRequest.KEY_EXPLAIN); requestObject.remove(JSONRequest.KEY_CACHE); + requestObject.remove(JSONRequest.KEY_FORMAT); } catch (Exception e) { return extendErrorResult(requestObject, e, requestMethod, getRequestURL(), isRoot); } @@ -518,13 +559,13 @@ public JSONObject parseResponse(JSONObject request) { queryResultMap = new HashMap(); Exception error = null; - sqlExecutor = createSQLExecutor(); + sqlExecutor = getSQLExecutor(); onBegin(); try { queryDepth = 0; executedSQLDuration = 0; - requestObject = onObjectParse(request, null, null, null, false); + requestObject = onObjectParse(request, null, null, null, false, null); onCommit(); } @@ -1068,17 +1109,18 @@ public JSONObject getStructure(@NotNull String table, String method, String tag, // protected SQLConfig itemConfig; /**获取单个对象,该对象处于parentObject内 - * @param request parentObject 的 value - * @param parentPath parentObject 的路径 - * @param name parentObject 的 key - * @param arrayConfig config for array item - * @param isSubquery 是否为子查询 - * @return - * @throws Exception - */ + * @param request parentObject 的 value + * @param parentPath parentObject 的路径 + * @param name parentObject 的 key + * @param arrayConfig config for array item + * @param isSubquery 是否为子查询 + * @param cache SQL 结果缓存 + * @return + * @throws Exception + */ @Override - public JSONObject onObjectParse(final JSONObject request - , String parentPath, String name, final SQLConfig arrayConfig, boolean isSubquery) throws Exception { + public JSONObject onObjectParse(final JSONObject request, String parentPath, String name + , final SQLConfig arrayConfig, boolean isSubquery, JSONObject cache) throws Exception { if (Log.DEBUG) { Log.i(TAG, "\ngetObject: parentPath = " + parentPath @@ -1122,6 +1164,8 @@ public JSONObject onObjectParse(final JSONObject request } // 对象 - 设置 method setOpMethod(request, op, name); + + op.setCache(cache); op = op.parse(name, isReuse); JSONObject response = null; @@ -1181,23 +1225,28 @@ public JSONObject onObjectParse(final JSONObject request if (max < 0) { max = 0; } + int min = getMinQueryPage(); + + page += min; + max += min; JSONObject pagination = new JSONObject(true); Object explain = rp.get(JSONResponse.KEY_EXPLAIN); if (explain instanceof JSONObject) { pagination.put(JSONResponse.KEY_EXPLAIN, explain); } + pagination.put(JSONResponse.KEY_TOTAL, total); pagination.put(JSONRequest.KEY_COUNT, count); pagination.put(JSONRequest.KEY_PAGE, page); pagination.put(JSONResponse.KEY_MAX, max); pagination.put(JSONResponse.KEY_MORE, page < max); - pagination.put(JSONResponse.KEY_FIRST, page == 0); + pagination.put(JSONResponse.KEY_FIRST, page == min); pagination.put(JSONResponse.KEY_LAST, page == max); putQueryResult(pathPrefix + JSONResponse.KEY_INFO, pagination); - if (total <= count*page) { + if (total <= count*(page - min)) { query = JSONRequest.QUERY_TOTAL;//数量不够了,不再往后查询 } } @@ -1233,14 +1282,16 @@ public JSONObject onObjectParse(final JSONObject request } /**获取对象数组,该对象数组处于parentObject内 + * @param request parentObject的value * @param parentPath parentObject的路径 * @param name parentObject的key - * @param request parentObject的value + * @param isSubquery 是否为子查询 + * @param cache SQL 结果缓存 * @return * @throws Exception */ @Override - public JSONArray onArrayParse(JSONObject request, String parentPath, String name, boolean isSubquery) throws Exception { + public JSONArray onArrayParse(JSONObject request, String parentPath, String name, boolean isSubquery, JSONArray cache) throws Exception { if (Log.DEBUG) { Log.i(TAG, "\n\n\n onArrayParse parentPath = " + parentPath + "; name = " + name + "; request = " + JSON.toJSONString(request)); @@ -1283,14 +1334,16 @@ public JSONArray onArrayParse(JSONObject request, String parentPath, String name query2 = JSONRequest.QUERY_ALL; break; default: - throw new IllegalArgumentException(path + "/" + JSONRequest.KEY_QUERY + ":value 中 value 的值不合法!必须在 [0,1,2] 或 [TABLE, TOTAL, ALL] 内 !"); + throw new IllegalArgumentException(path + "/" + JSONRequest.KEY_QUERY + ":value 中 value 的值不合法!必须在 [0, 1, 2] 或 [TABLE, TOTAL, ALL] 内 !"); } } - int page2 = page == null ? 0 : page; + int minPage = getMinQueryPage(); // 兼容各种传 0 或 null/undefined 自动转 0 导致的问题 + int page2 = page == null || page == 0 ? 0 : page - minPage; + int maxPage = getMaxQueryPage(); if (page2 < 0 || page2 > maxPage) { - throw new IllegalArgumentException(path + "/" + JSONRequest.KEY_PAGE + ":value 中 value 的值不合法!必须在 0-" + maxPage + " 内 !"); + throw new IllegalArgumentException(path + "/" + JSONRequest.KEY_PAGE + ":value 中 value 的值不合法!必须在 " + minPage + "-" + maxPage + " 内 !"); } //不用total限制数量了,只用中断机制,total只在query = 1,2的时候才获取 @@ -1335,7 +1388,8 @@ else if (childKeys.length == 1 && JSONRequest.isTableKey(childKeys[0])) { // //Table<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< - response = new JSONArray(); + + List joinList = onJoinParse(join, request); SQLConfig config = createSQLConfig() .setMethod(requestMethod) .setCount(size) @@ -1343,15 +1397,16 @@ else if (childKeys.length == 1 && JSONRequest.isTableKey(childKeys[0])) { // .setQuery(query2) .setCompat(compat) .setTable(arrTableKey) - .setJoinList(onJoinParse(join, request)); + .setJoinList(joinList); JSONObject parent; boolean isExtract = true; + response = new JSONArray(); //生成size个 for (int i = 0; i < (isSubquery ? 1 : size); i++) { - parent = onObjectParse(request, isSubquery ? parentPath : path, isSubquery ? name : "" + i, config.setType(SQLConfig.TYPE_ITEM).setPosition(i), isSubquery); + parent = onObjectParse(request, isSubquery ? parentPath : path, isSubquery ? name : "" + i, config.setType(SQLConfig.TYPE_ITEM).setPosition(i), isSubquery, null); if (parent == null || parent.isEmpty()) { break; } @@ -1366,7 +1421,7 @@ else if (childKeys.length == 1 && JSONRequest.isTableKey(childKeys[0])) { // @SuppressWarnings("unchecked") List list = fo == null ? null : (List) fo.remove(AbstractSQLExecutor.KEY_RAW_LIST); - if (list != null && list.isEmpty() == false) { + if (list != null && list.isEmpty() == false && (joinList == null || joinList.isEmpty())) { isExtract = false; list.set(0, fo); // 不知道为啥第 0 项也加了 @RAW@LIST @@ -1435,6 +1490,8 @@ else if (childKeys.length == 1 && JSONRequest.isTableKey(childKeys[0])) { // JOIN_COPY_KEY_LIST = new ArrayList(); JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_ROLE); JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_DATABASE); + JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_NAMESPACE); + JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_CATALOG); JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_SCHEMA); JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_DATASOURCE); JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_COLUMN); @@ -1707,7 +1764,7 @@ else if (join != null){ throw new IllegalArgumentException(e.getKey() + ":'/targetTable:targetAlias/targetKey' 中 targetAlias 值 " + targetAlias + " 不合法!必须满足英文单词变量名格式!"); } - targetTable = targetTableKey; // 主表允许别名 + //targetTable = targetTableKey; // 主表允许别名 if (StringUtil.isName(targetTable) == false) { throw new IllegalArgumentException(e.getKey() + ":'/targetTable/targetKey' 中 targetTable 值 " + targetTable + " 不合法!必须满足大写字母开头的表对象英文单词 key 格式!"); } @@ -1733,6 +1790,7 @@ else if (join != null){ on.setOriginKey(originKey); on.setOriginValue((String) refEntry.getValue()); + on.setTargetTableKey(targetTableKey); on.setTargetTable(targetTable); on.setTargetAlias(targetAlias); on.setTargetKey(targetKey); @@ -1778,15 +1836,17 @@ public static V getValue(JSONObject parent, String[] pathKeys } //逐层到达child的直接容器JSONObject parent - final int last = pathKeys.length - 1; + int last = pathKeys.length - 1; for (int i = 0; i < last; i++) {//一步一步到达指定位置 if (parent == null) {//不存在或路径错误(中间的key对应value不是JSONObject) break; } - parent = getJSONObject(parent, pathKeys[i]); + + String k = getDecodedKey(pathKeys[i]); + parent = getJSONObject(parent, k); } - return parent == null ? null : (V) parent.get(pathKeys[last]); + return parent == null ? null : (V) parent.get(getDecodedKey(pathKeys[last])); } @@ -1912,18 +1972,21 @@ public Object getValueByPath(String valuePath) { } //逐层到达targetKey的直接容器JSONObject parent - if (keys != null && keys.length > 1) { - for (int i = 0; i < keys.length - 1; i++) {//一步一步到达指定位置parentPath + int last = keys == null ? -1 : keys.length - 1; + if (last >= 1) { + for (int i = 0; i < last; i++) {//一步一步到达指定位置parentPath if (parent == null) {//不存在或路径错误(中间的key对应value不是JSONObject) break; } - parent = getJSONObject(parent, keys[i]); + + String k = getDecodedKey(keys[i]); + parent = getJSONObject(parent, k); } } if (parent != null) { Log.i(TAG, "getValueByPath >> get from queryResultMap >> return parent.get(keys[keys.length - 1]);"); - target = keys == null || keys.length <= 0 ? parent : parent.get(keys[keys.length - 1]); //值为null应该报错NotExistExeption,一般都是id关联,不可为null,否则可能绕过安全机制 + target = last < 0 ? parent : parent.get(getDecodedKey(keys[last])); //值为null应该报错NotExistExeption,一般都是id关联,不可为null,否则可能绕过安全机制 if (target != null) { Log.i(TAG, "getValueByPath >> getValue >> return target = " + target); return target; @@ -1942,6 +2005,18 @@ public Object getValueByPath(String valuePath) { return null; } + /**解码 引用赋值 路径中的 key,支持把 URL encode 后的值,转为 decode 后的原始值,例如 %2Fuser%2Flist -> /user/list ; %7B%7D -> [] + * @param key + * @return + */ + public static String getDecodedKey(String key) { + try { + return URLDecoder.decode(key, StringUtil.UTF_8); + } catch (Throwable e) { + return key; + } + } + //依赖引用关系 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java index 0b8c8607b..19446e69e 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java @@ -9,15 +9,8 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; import java.util.regex.Pattern; import apijson.JSON; @@ -47,31 +40,11 @@ import apijson.orm.model.Table; import apijson.orm.model.TestRecord; -import static apijson.JSONObject.KEY_CACHE; -import static apijson.JSONObject.KEY_CAST; -import static apijson.JSONObject.KEY_COLUMN; -import static apijson.JSONObject.KEY_COMBINE; -import static apijson.JSONObject.KEY_DATABASE; -import static apijson.JSONObject.KEY_DATASOURCE; -import static apijson.JSONObject.KEY_EXPLAIN; -import static apijson.JSONObject.KEY_FROM; -import static apijson.JSONObject.KEY_GROUP; -import static apijson.JSONObject.KEY_HAVING; -import static apijson.JSONObject.KEY_HAVING_AND; -import static apijson.JSONObject.KEY_ID; -import static apijson.JSONObject.KEY_JSON; -import static apijson.JSONObject.KEY_NULL; -import static apijson.JSONObject.KEY_ORDER; -import static apijson.JSONObject.KEY_KEY; -import static apijson.JSONObject.KEY_RAW; -import static apijson.JSONObject.KEY_ROLE; -import static apijson.JSONObject.KEY_SCHEMA; -import static apijson.JSONObject.KEY_USER_ID; +import static apijson.JSONObject.*; import static apijson.RequestMethod.DELETE; import static apijson.RequestMethod.GET; import static apijson.RequestMethod.POST; import static apijson.RequestMethod.PUT; -import static apijson.JSONObject.KEY_METHOD; import static apijson.SQL.AND; import static apijson.SQL.NOT; import static apijson.SQL.ON; @@ -122,6 +95,8 @@ public abstract class AbstractSQLConfig implements SQLConfig implements SQLConfig TABLE_SCHEMA_MAP; + /** * 表名映射,隐藏真实表名,对安全要求很高的表可以这么做 */ @@ -138,9 +118,9 @@ public abstract class AbstractSQLConfig implements SQLConfig COLUMN_KEY_MAP; - /** - * 允许批量增删改部分记录失败的表 - */ + /** + * 允许批量增删改部分记录失败的表 + */ public static Map ALLOW_PARTIAL_UPDATE_FAIL_TABLE_MAP; public static List CONFIG_TABLE_LIST; public static List DATABASE_LIST; @@ -157,7 +137,20 @@ public abstract class AbstractSQLConfig implements SQLConfig\\|\\[\\]\\{\\} /\\.\\+\\-\\*\\^\\?\\(\\)\\$]+$"); - TABLE_KEY_MAP = new HashMap(); + TABLE_SCHEMA_MAP = new HashMap<>(); + TABLE_SCHEMA_MAP.put(Table.class.getSimpleName(), DEFAULT_SCHEMA); + TABLE_SCHEMA_MAP.put(Column.class.getSimpleName(), DEFAULT_SCHEMA); + TABLE_SCHEMA_MAP.put(PgClass.class.getSimpleName(), DEFAULT_SCHEMA); + TABLE_SCHEMA_MAP.put(PgAttribute.class.getSimpleName(), DEFAULT_SCHEMA); + TABLE_SCHEMA_MAP.put(SysTable.class.getSimpleName(), DEFAULT_SCHEMA); + TABLE_SCHEMA_MAP.put(SysColumn.class.getSimpleName(), DEFAULT_SCHEMA); + TABLE_SCHEMA_MAP.put(ExtendedProperty.class.getSimpleName(), DEFAULT_SCHEMA); + TABLE_SCHEMA_MAP.put(AllTable.class.getSimpleName(), DEFAULT_SCHEMA); + TABLE_SCHEMA_MAP.put(AllColumn.class.getSimpleName(), DEFAULT_SCHEMA); + TABLE_SCHEMA_MAP.put(AllTableComment.class.getSimpleName(), DEFAULT_SCHEMA); + TABLE_SCHEMA_MAP.put(AllColumnComment.class.getSimpleName(), DEFAULT_SCHEMA); + + TABLE_KEY_MAP = new HashMap<>(); TABLE_KEY_MAP.put(Table.class.getSimpleName(), Table.TABLE_NAME); TABLE_KEY_MAP.put(Column.class.getSimpleName(), Column.TABLE_NAME); TABLE_KEY_MAP.put(PgClass.class.getSimpleName(), PgClass.TABLE_NAME); @@ -170,7 +163,7 @@ public abstract class AbstractSQLConfig implements SQLConfig(); + ALLOW_PARTIAL_UPDATE_FAIL_TABLE_MAP = new HashMap<>(); CONFIG_TABLE_LIST = new ArrayList<>(); // Table, Column 等是系统表 AbstractVerifier.SYSTEM_ACCESS_MAP.keySet()); CONFIG_TABLE_LIST.add(Function.class.getSimpleName()); @@ -188,17 +181,31 @@ public abstract class AbstractSQLConfig implements SQLConfig(); // 保证顺序,避免配置冲突等意外情况 @@ -273,7 +280,6 @@ public abstract class AbstractSQLConfig implements SQLConfig implements SQLConfig implements SQLConfig implements SQLConfig parser; @@ -844,7 +860,7 @@ public int getVersion() { return version; } @Override - public AbstractSQLConfig setVersion(int version) { + public AbstractSQLConfig setVersion(int version) { this.version = version; return this; } @@ -858,7 +874,7 @@ public String getTag() { return tag; } @Override - public AbstractSQLConfig setTag(String tag) { + public AbstractSQLConfig setTag(String tag) { this.tag = tag; return this; } @@ -877,7 +893,7 @@ public int[] getDBVersionNums() { @Override public boolean limitSQLCount() { - return Log.DEBUG == false || AbstractVerifier.SYSTEM_ACCESS_MAP.containsKey(getTable()) == false; + return AbstractVerifier.SYSTEM_ACCESS_MAP.containsKey(getTable()) == false; } @Override public boolean allowPartialUpdateFailed() { @@ -914,6 +930,8 @@ public String getUserIdKey() { private String role; //发送请求的用户的角色 private boolean distinct = false; private String database; //表所在的数据库类型 + private String namespace; //表所在的命名空间 + private String catalog; //表所在的目录 private String schema; //表所在的数据库名 private String datasource; //数据源 private String table; //表名 @@ -951,7 +969,7 @@ public String getUserIdKey() { private String procedure; - public SQLConfig setProcedure(String procedure) { + public AbstractSQLConfig setProcedure(String procedure) { this.procedure = procedure; return this; } @@ -981,16 +999,16 @@ public RequestMethod getMethod() { return method; } @Override - public AbstractSQLConfig setMethod(RequestMethod method) { + public AbstractSQLConfig setMethod(RequestMethod method) { this.method = method; return this; } @Override public boolean isPrepared() { - return prepared; + return prepared && ! isMongoDB(); // MongoDB JDBC 还不支持预编译; } @Override - public AbstractSQLConfig setPrepared(boolean prepared) { + public AbstractSQLConfig setPrepared(boolean prepared) { this.prepared = prepared; return this; } @@ -999,7 +1017,7 @@ public boolean isMain() { return main; } @Override - public AbstractSQLConfig setMain(boolean main) { + public AbstractSQLConfig setMain(boolean main) { this.main = main; return this; } @@ -1010,7 +1028,7 @@ public Object getId() { return id; } @Override - public AbstractSQLConfig setId(Object id) { + public AbstractSQLConfig setId(Object id) { this.id = id; return this; } @@ -1020,7 +1038,7 @@ public Object getIdIn() { return idIn; } @Override - public AbstractSQLConfig setIdIn(Object idIn) { + public AbstractSQLConfig setIdIn(Object idIn) { this.idIn = idIn; return this; } @@ -1031,7 +1049,7 @@ public Object getUserId() { return userId; } @Override - public AbstractSQLConfig setUserId(Object userId) { + public AbstractSQLConfig setUserId(Object userId) { this.userId = userId; return this; } @@ -1041,7 +1059,7 @@ public Object getUserIdIn() { return userIdIn; } @Override - public AbstractSQLConfig setUserIdIn(Object userIdIn) { + public AbstractSQLConfig setUserIdIn(Object userIdIn) { this.userIdIn = userIdIn; return this; } @@ -1052,7 +1070,7 @@ public String getRole() { return role; } @Override - public AbstractSQLConfig setRole(String role) { + public AbstractSQLConfig setRole(String role) { this.role = role; return this; } @@ -1062,7 +1080,7 @@ public boolean isDistinct() { return distinct; } @Override - public SQLConfig setDistinct(boolean distinct) { + public AbstractSQLConfig setDistinct(boolean distinct) { this.distinct = distinct; return this; } @@ -1072,7 +1090,7 @@ public String getDatabase() { return database; } @Override - public SQLConfig setDatabase(String database) { + public AbstractSQLConfig setDatabase(String database) { this.database = database; return this; } @@ -1093,7 +1111,7 @@ public static boolean isMySQL(String db) { return DATABASE_MYSQL.equals(db); } - @Override + @Override public boolean isPostgreSQL() { return isPostgreSQL(getSQLDatabase()); } @@ -1109,7 +1127,7 @@ public static boolean isSQLServer(String db) { return DATABASE_SQLSERVER.equals(db); } - @Override + @Override public boolean isOracle() { return isOracle(getSQLDatabase()); } @@ -1125,7 +1143,7 @@ public static boolean isDb2(String db) { return DATABASE_DB2.equals(db); } - @Override + @Override public boolean isMariaDB() { return isMariaDB(getSQLDatabase()); } @@ -1133,7 +1151,7 @@ public static boolean isMariaDB(String db) { return DATABASE_MARIADB.equals(db); } - @Override + @Override public boolean isTiDB() { return isTiDB(getSQLDatabase()); } @@ -1141,6 +1159,14 @@ public static boolean isTiDB(String db) { return DATABASE_TIDB.equals(db); } + @Override + public boolean isCockroachDB() { + return isCockroachDB(getSQLDatabase()); + } + public static boolean isCockroachDB(String db) { + return DATABASE_COCKROACHDB.equals(db); + } + @Override public boolean isDameng() { return isDameng(getSQLDatabase()); @@ -1165,6 +1191,14 @@ public static boolean isElasticsearch(String db) { return DATABASE_ELASTICSEARCH.equals(db); } + @Override + public boolean isManticore() { + return isManticore(getSQLDatabase()); + } + public static boolean isManticore(String db) { + return DATABASE_MANTICORE.equals(db); + } + @Override public boolean isClickHouse() { return isClickHouse(getSQLDatabase()); @@ -1189,6 +1223,14 @@ public static boolean isPresto(String db) { return DATABASE_PRESTO.equals(db); } + @Override + public boolean isTrino() { + return isTrino(getSQLDatabase()); + } + public static boolean isTrino(String db) { + return DATABASE_TRINO.equals(db); + } + @Override public boolean isSnowflake() { return isSnowflake(getSQLDatabase()); @@ -1214,11 +1256,11 @@ public static boolean isCassandra(String db) { } @Override - public boolean isTrino() { - return isTrino(getSQLDatabase()); + public boolean isMilvus() { + return isMilvus(getSQLDatabase()); } - public static boolean isTrino(String db) { - return DATABASE_TRINO.equals(db); + public static boolean isMilvus(String db) { + return DATABASE_MILVUS.equals(db); } @Override @@ -1237,6 +1279,23 @@ public static boolean isTDengine(String db) { return DATABASE_TDENGINE.equals(db); } + @Override + public boolean isTimescaleDB() { + return isTimescaleDB(getSQLDatabase()); + } + public static boolean isTimescaleDB(String db) { + return DATABASE_TIMESCALEDB.equals(db); + } + + + public boolean isIoTDB() { + return isIoTDB(getDatabase()); + } + public static boolean isIoTDB(String db) { + return DATABASE_IOTDB.equals(db); + } + + @Override public boolean isRedis() { return isRedis(getSQLDatabase()); @@ -1245,20 +1304,68 @@ public static boolean isRedis(String db) { return DATABASE_REDIS.equals(db); } + @Override + public boolean isMongoDB() { + return isMongoDB(getSQLDatabase()); + } + public static boolean isMongoDB(String db) { + return DATABASE_MONGODB.equals(db); + } + + @Override + public boolean isKafka() { + return isKafka(getSQLDatabase()); + } + public static boolean isKafka(String db) { + return DATABASE_KAFKA.equals(db); + } + @Override public boolean isMQ() { return isMQ(getSQLDatabase()); } public static boolean isMQ(String db) { - return DATABASE_MQ.equals(db); + return DATABASE_MQ.equals(db) || isKafka(db); + } + + @Override + public boolean isSQLite() { + return isSQLite(getSQLDatabase()); + } + public static boolean isSQLite(String db) { + return DATABASE_SQLITE.equals(db); + } + + @Override + public boolean isDuckDB() { + return isDuckDB(getSQLDatabase()); + } + public static boolean isDuckDB(String db) { + return DATABASE_DUCKDB.equals(db); + } + + @Override + public boolean isSurrealDB() { + return isSurrealDB(getSQLDatabase()); + } + public static boolean isSurrealDB(String db) { + return DATABASE_SURREALDB.equals(db); + } + + @Override + public boolean isOpenGauss() { + return isOpenGauss(getSQLDatabase()); + } + public static boolean isOpenGauss(String db) { + return DATABASE_OPENGAUSS.equals(db); } @Override - public String getQuote() { - if(isElasticsearch()) { + public String getQuote() { // MongoDB 同时支持 `tbl` 反引号 和 "col" 双引号 + if(isElasticsearch() || isManticore() || isIoTDB() || isSurrealDB()) { return ""; } - return isMySQL() || isMariaDB() || isTiDB() || isClickHouse() || isTDengine() ? "`" : "\""; + return isMySQL() || isMariaDB() || isTiDB() || isClickHouse() || isTDengine() || isMilvus() ? "`" : "\""; } public String quote(String s) { @@ -1267,14 +1374,45 @@ public String quote(String s) { } @Override - public String getSchema() { - return schema; + public String getSQLNamespace() { + String sch = getNamespace(); // 前端传参 @namespace 优先 + return sch == null ? DEFAULT_NAMESPACE : sch; // 最后代码默认兜底配置 + } + + @Override + public String getNamespace() { + return namespace; + } + + @Override + public AbstractSQLConfig setNamespace(String namespace) { + this.namespace = namespace; + return this; + } + + + @Override + public String getSQLCatalog() { + String catalog = getCatalog(); // 前端传参 @catalog 优先 + return catalog == null ? DEFAULT_CATALOG : catalog; // 最后代码默认兜底配置 + } + + @Override + public String getCatalog() { + return catalog; + } + + @Override + public AbstractSQLConfig setCatalog(String catalog) { + this.catalog = catalog; + return this; } @NotNull + @Override public String getSQLSchema() { String table = getTable(); - //强制,避免因为全局默认的 @schema 自动填充进来,导致这几个类的 schema 为 sys 等其它值 + // FIXME 全部默认填充判断是 系统表 则不填充 // 强制,避免因为全局默认的 @schema 自动填充进来,导致这几个类的 schema 为 sys 等其它值 if (Table.TAG.equals(table) || Column.TAG.equals(table)) { return SCHEMA_INFORMATION; //MySQL, PostgreSQL, SQL Server 都有的 } @@ -1285,15 +1423,24 @@ public String getSQLSchema() { return SCHEMA_SYS; //SQL Server 在 sys 中的属性比 information_schema 中的要全,能拿到注释 } if (AllTable.TAG.equals(table) || AllColumn.TAG.equals(table) - || AllTableComment.TAG.equals(table) || AllTableComment.TAG.equals(table)) { + || AllTableComment.TAG.equals(table) || AllColumnComment.TAG.equals(table)) { return ""; //Oracle, Dameng 的 all_tables, dba_tables 和 all_tab_columns, dba_columns 表好像不属于任何 Schema } - String sch = getSchema(); - return sch == null ? DEFAULT_SCHEMA : sch; + String sch = getSchema(); // 前端传参 @schema 优先 + if (sch == null) { + sch = TABLE_SCHEMA_MAP.get(table); // 其次 Access 表 alias 和 schema 配置 + } + return sch == null ? DEFAULT_SCHEMA : sch; // 最后代码默认兜底配置 } + @Override - public AbstractSQLConfig setSchema(String schema) { + public String getSchema() { + return schema; + } + + @Override + public AbstractSQLConfig setSchema(String schema) { if (schema != null) { AbstractFunctionParser.verifySchema(schema, getTable()); } @@ -1306,7 +1453,7 @@ public String getDatasource() { return datasource; } @Override - public SQLConfig setDatasource(String datasource) { + public AbstractSQLConfig setDatasource(String datasource) { this.datasource = datasource; return this; } @@ -1332,37 +1479,44 @@ public String getSQLTable() { String nt = TABLE_KEY_MAP.get(ot); return StringUtil.isEmpty(nt) ? ot : nt; } + + @JSONField(serialize = false) @Override public String getTablePath() { String q = getQuote(); + String ns = isSurrealDB() ? getSQLNamespace() : null; + String cl = isPostgreSQL() || isCockroachDB() || isOpenGauss() || isDuckDB() ? getSQLCatalog() : null; String sch = getSQLSchema(); String sqlTable = getSQLTable(); - return (StringUtil.isEmpty(sch, true) ? "" : q + sch + q + ".") + q + sqlTable + q - + ( isKeyPrefix() ? " AS " + getAliasWithQuote() : ""); + return (StringUtil.isEmpty(ns, true) ? "" : q + ns + q + ".") + + (StringUtil.isEmpty(cl, true) ? "" : q + cl + q + ".") + + (StringUtil.isEmpty(sch, true) ? "" : q + sch + q + ".") + + q + sqlTable + q + (isKeyPrefix() ? getAs() + q + getSQLAlias() + q : ""); } @Override - public AbstractSQLConfig setTable(String table) { //Table已经在Parser中校验,所以这里不用防SQL注入 + public AbstractSQLConfig setTable(String table) { //Table已经在Parser中校验,所以这里不用防SQL注入 this.table = table; return this; } + public String getAs() { + return isOracle() || isManticore() ? " " : " AS "; + } + @Override public String getAlias() { return alias; } @Override - public AbstractSQLConfig setAlias(String alias) { + public AbstractSQLConfig setAlias(String alias) { this.alias = alias; return this; } - public String getAliasWithQuote() { - String a = getAlias(); - if (StringUtil.isEmpty(a, true)) { - a = getTable(); - } + public String getSQLAliasWithQuote() { + String a = getSQLAlias(); String q = getQuote(); // getTable 不能小写,因为Verifier用大小写敏感的名称判断权限 // 如果要强制小写,则可在子类重写这个方法再 toLowerCase @@ -1374,11 +1528,11 @@ public String getAliasWithQuote() { public String getGroup() { return group; } - public AbstractSQLConfig setGroup(String... keys) { + public AbstractSQLConfig setGroup(String... keys) { return setGroup(StringUtil.getString(keys)); } @Override - public AbstractSQLConfig setGroup(String group) { + public AbstractSQLConfig setGroup(String group) { this.group = group; return this; } @@ -1398,9 +1552,9 @@ public String getGroupString(boolean hasPrefix) { if (cfg != null) { cfg.setMain(false).setKeyPrefix(true); - if (StringUtil.isEmpty(cfg.getAlias(), true)) { - cfg.setAlias(cfg.getTable()); - } + //if (StringUtil.isEmpty(cfg.getAlias(), true)) { + // cfg.setAlias(cfg.getTable()); + //} String c = ((AbstractSQLConfig) cfg).getGroupString(false); if (StringUtil.isEmpty(c, true) == false) { @@ -1437,7 +1591,7 @@ public String getHavingCombine() { return havingCombine; } @Override - public SQLConfig setHavingCombine(String havingCombine) { + public AbstractSQLConfig setHavingCombine(String havingCombine) { this.havingCombine = havingCombine; return this; } @@ -1447,11 +1601,11 @@ public Map getHaving() { return having; } @Override - public SQLConfig setHaving(Map having) { + public AbstractSQLConfig setHaving(Map having) { this.having = having; return this; } - public AbstractSQLConfig setHaving(String... conditions) { + public AbstractSQLConfig setHaving(String... conditions) { return setHaving(StringUtil.getString(conditions)); } @@ -1475,9 +1629,9 @@ public String getHavingString(boolean hasPrefix) throws Exception { if (cfg != null) { cfg.setMain(false).setKeyPrefix(true); - if (StringUtil.isEmpty(cfg.getAlias(), true)) { - cfg.setAlias(cfg.getTable()); - } + //if (StringUtil.isEmpty(cfg.getAlias(), true)) { + // cfg.setAlias(cfg.getTable()); + //} String c = ((AbstractSQLConfig) cfg).getHavingString(false); if (StringUtil.isEmpty(c, true) == false) { @@ -1495,7 +1649,7 @@ public String getHavingString(boolean hasPrefix) throws Exception { } List raw = getRaw(); - // 提前把 @having& 转为 @having,或者干脆不允许 @raw:"@having&" boolean containRaw = raw != null && (raw.contains(KEY_HAVING) || raw.contains(KEY_HAVING_AND)); + // 提前把 @having& 转为 @having,或者干脆不允许 @raw:"@having&" boolean containRaw = raw != null && (raw.contains(KEY_HAVING) || raw.contains(KEY_HAVING_AND)); boolean containRaw = raw != null && raw.contains(KEY_HAVING); // 直接把 having 类型从 Map 定改为 Map,避免额外拷贝 @@ -1506,7 +1660,7 @@ public String getHavingString(boolean hasPrefix) throws Exception { //fun0(arg0,arg1,...);fun1(arg0,arg1,...) String havingString = parseCombineExpression(getMethod(), getQuote(), getTable() - , getAliasWithQuote(), map, getHavingCombine(), true, containRaw, true); + , getAlias(), map, getHavingCombine(), true, containRaw, true); return (hasPrefix ? " HAVING " : "") + StringUtil.concat(havingString, joinHaving, AND); } @@ -1565,11 +1719,11 @@ else if (SQL_FUNCTION_MAP.containsKey(method) == false) { public String getOrder() { return order; } - public AbstractSQLConfig setOrder(String... conditions) { + public AbstractSQLConfig setOrder(String... conditions) { return setOrder(StringUtil.getString(conditions)); } @Override - public AbstractSQLConfig setOrder(String order) { + public AbstractSQLConfig setOrder(String order) { this.order = order; return this; } @@ -1589,9 +1743,9 @@ public String getOrderString(boolean hasPrefix) { if (cfg != null) { cfg.setMain(false).setKeyPrefix(true); - if (StringUtil.isEmpty(cfg.getAlias(), true)) { - cfg.setAlias(cfg.getTable()); - } + //if (StringUtil.isEmpty(cfg.getAlias(), true)) { + // cfg.setAlias(cfg.getTable()); + //} String c = ((AbstractSQLConfig) cfg).getOrderString(false); if (StringUtil.isEmpty(c, true) == false) { @@ -1684,7 +1838,7 @@ public Map getKeyMap() { return keyMap; } @Override - public AbstractSQLConfig setKeyMap(Map keyMap) { + public AbstractSQLConfig setKeyMap(Map keyMap) { this.keyMap = keyMap; return this; } @@ -1694,7 +1848,7 @@ public List getRaw() { return raw; } @Override - public AbstractSQLConfig setRaw(List raw) { + public AbstractSQLConfig setRaw(List raw) { this.raw = raw; return this; } @@ -1754,7 +1908,7 @@ public List getJson() { return json; } @Override - public AbstractSQLConfig setJson(List json) { + public AbstractSQLConfig setJson(List json) { this.json = json; return this; } @@ -1765,7 +1919,7 @@ public Subquery getFrom() { return from; } @Override - public AbstractSQLConfig setFrom(Subquery from) { + public AbstractSQLConfig setFrom(Subquery from) { this.from = from; return this; } @@ -1775,7 +1929,7 @@ public List getColumn() { return column; } @Override - public AbstractSQLConfig setColumn(List column) { + public AbstractSQLConfig setColumn(List column) { this.column = column; return this; } @@ -1786,6 +1940,8 @@ public String getColumnString() throws Exception { @JSONField(serialize = false) public String getColumnString(boolean inSQLJoin) throws Exception { List column = getColumn(); + String as = getAs(); + String q = getQuote(); switch (getMethod()) { case HEAD: @@ -1846,25 +2002,24 @@ public String getColumnString(boolean inSQLJoin) throws Exception { if (start > 0 && end > start) { String fun = c0.substring(0, start); - // Invalid use of group function SELECT count(max(`id`)) AS count FROM `sys`.`Comment` + // Invalid use of group function SELECT count(max(`id`)) AS count FROM `sys`.`Comment` if (SQL_AGGREGATE_FUNCTION_MAP.containsKey(fun)) { String group = getGroup(); // TODO 唯一 100% 兼容的可能只有 SELECT count(*) FROM (原语句) AS table return StringUtil.isEmpty(group, true) ? "1" : "count(DISTINCT " + group + ")"; } String[] args = start == end - 1 ? null : StringUtil.split(c0.substring(start + 1, end)); - if (args == null || args.length <= 0) { - return SQL.count(c0); + if (args != null && args.length > 0) { + List raw = getRaw(); + boolean containRaw = raw != null && raw.contains(KEY_COLUMN); + c0 = parseSQLExpression(KEY_COLUMN, c0, containRaw, false, null); } - List raw = getRaw(); - boolean containRaw = raw != null && raw.contains(KEY_COLUMN); - - return SQL.count(parseSQLExpression(KEY_COLUMN, c0, containRaw, false, null)); + return "count(" + c0 + ")" + as + q + JSONResponse.KEY_COUNT + q; } } - return SQL.count(onlyOne ? getKey(c0) : "*"); + return "count(" + (onlyOne ? getKey(c0) : "*") + ")" + as + q + JSONResponse.KEY_COUNT + q; // return SQL.count(onlyOne && StringUtil.isName(column.get(0)) ? getKey(column.get(0)) : "*"); case POST: if (column == null || column.isEmpty()) { @@ -1889,30 +2044,28 @@ public String getColumnString(boolean inSQLJoin) throws Exception { String joinColumn = ""; if (joinList != null) { boolean first = true; - for (Join j : joinList) { - if (j.isAppJoin()) { + for (Join join : joinList) { + if (join.isAppJoin()) { continue; } - SQLConfig ocfg = j.getOuterConfig(); + SQLConfig ocfg = join.getOuterConfig(); boolean isEmpty = ocfg == null || ocfg.getColumn() == null; - boolean isLeftOrRightJoin = j.isLeftOrRightJoin(); + boolean isLeftOrRightJoin = join.isLeftOrRightJoin(); if (isEmpty && isLeftOrRightJoin) { // 改为 SELECT ViceTable.* 解决 SELECT sum(ViceTable.id) // LEFT/RIGHT JOIN (SELECT sum(id) FROM ViceTable...) AS ViceTable // 不仅导致 SQL 函数重复计算,还有时导致 SQL 报错或对应字段未返回 - String quote = getQuote(); - joinColumn += (first ? "" : ", ") + quote + (StringUtil.isEmpty(j.getAlias(), true) - ? j.getTable() : j.getAlias()) + quote + ".*"; + joinColumn += (first ? "" : ", ") + q + SQLConfig.getSQLAlias(join.getTable(), join.getAlias()) + q + ".*"; first = false; } else { - SQLConfig cfg = isLeftOrRightJoin == false && isEmpty ? j.getJoinConfig() : ocfg; + SQLConfig cfg = isLeftOrRightJoin == false && isEmpty ? join.getJoinConfig() : ocfg; if (cfg != null) { cfg.setMain(false).setKeyPrefix(true); - if (StringUtil.isEmpty(cfg.getAlias(), true)) { - cfg.setAlias(cfg.getTable()); - } + //if (StringUtil.isEmpty(cfg.getAlias(), true)) { + // cfg.setAlias(cfg.getTable()); + //} String c = ((AbstractSQLConfig) cfg).getColumnString(true); if (StringUtil.isEmpty(c, true) == false) { @@ -1926,9 +2079,8 @@ public String getColumnString(boolean inSQLJoin) throws Exception { } } - String tableAlias = getAliasWithQuote(); - - // String c = StringUtil.getString(column); //id,name;json_length(contactIdList):contactCount;... + String tableAlias = q + getSQLAlias() + q; + // String c = StringUtil.getString(column); //id,name;json_length(contactIdList):contactCount;... String[] keys = column == null ? null : column.toArray(new String[]{}); //StringUtil.split(c, ";"); if (keys == null || keys.length <= 0) { @@ -1939,7 +2091,6 @@ public String getColumnString(boolean inSQLJoin) throws Exception { return StringUtil.concat(mc, joinColumn, ", ", true); } - List raw = getRaw(); boolean containRaw = raw != null && raw.contains(KEY_COLUMN); @@ -1953,14 +2104,14 @@ public String getColumnString(boolean inSQLJoin) throws Exception { } // 简单点, 后台配置就带上 AS - // int index = expression.lastIndexOf(":"); - // String alias = expression.substring(index+1); - // boolean hasAlias = StringUtil.isName(alias); - // String pre = index > 0 && hasAlias ? expression.substring(0, index) : expression; - // if (RAW_MAP.containsValue(pre) || "".equals(RAW_MAP.get(pre))) { // newSQLConfig 提前处理好的 - // expression = pre + (hasAlias ? " AS " + alias : ""); - // continue; - // } + int index = expression.lastIndexOf(":"); + String alias = expression.substring(index+1); + boolean hasAlias = StringUtil.isName(alias); + String pre = index > 0 && hasAlias ? expression.substring(0, index) : expression; + if (RAW_MAP.containsValue(pre) || "".equals(RAW_MAP.get(pre))) { // newSQLConfig 提前处理好的 + keys[i] = pre + (hasAlias ? getAs() + q + alias + q : ""); + continue; + } } if (expression.length() > 100) { @@ -2001,6 +2152,16 @@ public String parseSQLExpression(String key, String expression, boolean containR * @return */ public String parseSQLExpression(String key, String expression, boolean containRaw, boolean allowAlias, String example) { + if (containRaw) { + String s = RAW_MAP.get(expression); + if ("".equals(s)) { + return expression; + } + if (s != null) { + return s; + } + } + String quote = getQuote(); int start = expression.indexOf('('); if (start < 0) { @@ -2083,7 +2244,7 @@ public String parseSQLExpression(String key, String expression, boolean containR } String origin = fun + "(" + (distinct ? PREFIX_DISTINCT : "") + StringUtil.getString(ckeys) + ")" + suffix; - expression = origin + (StringUtil.isEmpty(alias, true) ? "" : " AS " + quote + alias + quote); + expression = origin + (StringUtil.isEmpty(alias, true) ? "" : getAs() + quote + alias + quote); } else { //是窗口函数 fun(arg0,agr1) OVER (agr0 agr1 ...) @@ -2141,7 +2302,7 @@ else if (SQL_FUNCTION_MAP.containsKey(fun) == false) { String argsString2[] = parseArgsSplitWithComma(argString2, false, containRaw, allowAlias); expression = fun + "(" + StringUtil.getString(agrsString1) + (containOver ? ") OVER (" : ") AGAINST (") + StringUtil.getString(argsString2) + ")" + suffix // 传参不传空格,拼接带空格 - + (StringUtil.isEmpty(alias, true) ? "" : " AS " + quote + alias + quote); + + (StringUtil.isEmpty(alias, true) ? "" : getAs() + quote + alias + quote); } } @@ -2160,7 +2321,7 @@ private String[] parseArgsSplitWithComma(String param, boolean isColumn, boolean // 以"," 分割参数 String quote = getQuote(); boolean isKeyPrefix = isKeyPrefix(); - String tableAlias = getAliasWithQuote(); + String tableAlias = quote + getSQLAlias() + quote; String ckeys[] = StringUtil.split(param); // 以","分割参数 if (ckeys != null && ckeys.length > 0) { @@ -2271,7 +2432,7 @@ else if ("!=null".equals(ck)) { } if (isColumn && StringUtil.isEmpty(alias, true) == false) { - origin += " AS " + quote + alias + quote; + origin += getAs() + quote + alias + quote; } } } @@ -2294,7 +2455,7 @@ else if ("!=null".equals(ck)) { private String parseArgsSplitWithSpace(String mkes[]) { String quote = getQuote(); boolean isKeyPrefix = isKeyPrefix(); - String tableAlias = getAliasWithQuote(); + String tableAlias = quote + getSQLAlias() + quote; // 包含空格的参数 肯定不包含别名 不用处理别名 if (mkes != null && mkes.length > 0) { @@ -2407,7 +2568,7 @@ public String getValuesString() { return s; } @Override - public AbstractSQLConfig setValues(List> valuess) { + public AbstractSQLConfig setValues(List> valuess) { this.values = valuess; return this; } @@ -2417,7 +2578,7 @@ public Map getContent() { return content; } @Override - public AbstractSQLConfig setContent(Map content) { + public AbstractSQLConfig setContent(Map content) { this.content = content; return this; } @@ -2427,7 +2588,7 @@ public int getCount() { return count; } @Override - public AbstractSQLConfig setCount(int count) { + public AbstractSQLConfig setCount(int count) { this.count = count; return this; } @@ -2436,7 +2597,7 @@ public int getPage() { return page; } @Override - public AbstractSQLConfig setPage(int page) { + public AbstractSQLConfig setPage(int page) { this.page = page; return this; } @@ -2445,7 +2606,7 @@ public int getPosition() { return position; } @Override - public AbstractSQLConfig setPosition(int position) { + public AbstractSQLConfig setPosition(int position) { this.position = position; return this; } @@ -2455,7 +2616,7 @@ public int getQuery() { return query; } @Override - public AbstractSQLConfig setQuery(int query) { + public AbstractSQLConfig setQuery(int query) { this.query = query; return this; } @@ -2464,7 +2625,7 @@ public Boolean getCompat() { return compat; } @Override - public AbstractSQLConfig setCompat(Boolean compat) { + public AbstractSQLConfig setCompat(Boolean compat) { this.compat = compat; return this; } @@ -2474,7 +2635,7 @@ public int getType() { return type; } @Override - public AbstractSQLConfig setType(int type) { + public AbstractSQLConfig setType(int type) { this.type = type; return this; } @@ -2484,12 +2645,12 @@ public int getCache() { return cache; } @Override - public AbstractSQLConfig setCache(int cache) { + public AbstractSQLConfig setCache(int cache) { this.cache = cache; return this; } - public AbstractSQLConfig setCache(String cache) { + public AbstractSQLConfig setCache(String cache) { return setCache(getCache(cache)); } public static int getCache(String cache) { @@ -2528,7 +2689,7 @@ public boolean isExplain() { return explain; } @Override - public AbstractSQLConfig setExplain(boolean explain) { + public AbstractSQLConfig setExplain(boolean explain) { this.explain = explain; return this; } @@ -2538,7 +2699,7 @@ public List getJoinList() { return joinList; } @Override - public SQLConfig setJoinList(List joinList) { + public AbstractSQLConfig setJoinList(List joinList) { this.joinList = joinList; return this; } @@ -2553,7 +2714,7 @@ public boolean isTest() { return test; } @Override - public AbstractSQLConfig setTest(boolean test) { + public AbstractSQLConfig setTest(boolean test) { this.test = test; return this; } @@ -2578,16 +2739,37 @@ public static int getOffset(int page, int count) { */ @JSONField(serialize = false) public String getLimitString() { - if (count <= 0 || RequestMethod.isHeadMethod(getMethod(), true)) { + int count = getCount(); + + if (isMilvus()) { + if (count == 0) { + Parser parser = getParser(); + count = parser == null ? AbstractParser.MAX_QUERY_COUNT : parser.getMaxQueryCount(); + } + + int offset = getOffset(getPage(), count); + return " LIMIT " + offset + ", " + count; // 目前 moql-transx 的限制 + } else if (isSurrealDB()) { + if (count == 0) { + Parser parser = getParser(); + count = parser == null ? AbstractParser.MAX_QUERY_COUNT : parser.getMaxQueryCount(); + } + + int offset = getOffset(getPage(), count); + return " START " + offset + " LIMIT " + count; + } + + if (count <= 0 || RequestMethod.isHeadMethod(getMethod(), true)) { // TODO HEAD 真的不需要 LIMIT ? return ""; } + return getLimitString( - getPage() - , getCount() - , isOracle() || isSQLServer() || isDb2() - , isOracle() || isDameng() || isKingBase() - , isPresto() || isTrino() - ); + getPage() + , getCount() + , isOracle() || isSQLServer() || isDb2() + , isOracle() || isDameng() || isKingBase() + , isPresto() || isTrino() + ); } /**获取限制数量及偏移量 * @param page @@ -2597,8 +2779,8 @@ public String getLimitString() { * @return */ public static String getLimitString(int page, int count, boolean isTSQL, boolean isOracle) { - return getLimitString(page, count, isTSQL, isOracle, false); - } + return getLimitString(page, count, isTSQL, isOracle, false); + } /**获取限制数量及偏移量 * @param page * @param count @@ -2610,17 +2792,17 @@ public static String getLimitString(int page, int count, boolean isTSQL, boolean public static String getLimitString(int page, int count, boolean isTSQL, boolean isOracle, boolean isPresto) { int offset = getOffset(page, count); - if (isOracle) { // TODO 判断版本,高版本可以用 OFFSET FETCH - return " WHERE ROWNUM BETWEEN " + offset + " AND " + (offset + count); - } + if (isOracle) { // TODO 判断版本,高版本可以用 OFFSET FETCH + return " WHERE ROWNUM BETWEEN " + offset + " AND " + (offset + count); + } if (isTSQL) { // OFFSET FECTH 中所有关键词都不可省略, 另外 Oracle 数据库使用子查询加 where 分页 return " OFFSET " + offset + " ROWS FETCH FIRST " + count + " ROWS ONLY"; } - if (isPresto) { // https://prestodb.io/docs/current/sql/select.html - return (offset <= 0 ? "" : " OFFSET " + offset) + " LIMIT " + count; - } + if (isPresto) { // https://prestodb.io/docs/current/sql/select.html + return (offset <= 0 ? "" : " OFFSET " + offset) + " LIMIT " + count; + } return " LIMIT " + count + (offset <= 0 ? "" : " OFFSET " + offset); // DELETE, UPDATE 不支持 OFFSET } @@ -2630,7 +2812,7 @@ public List getNull() { return nulls; } @Override - public SQLConfig setNull(List nulls) { + public AbstractSQLConfig setNull(List nulls) { this.nulls = nulls; return this; } @@ -2640,7 +2822,7 @@ public Map getCast() { return cast; } @Override - public SQLConfig setCast(Map cast) { + public AbstractSQLConfig setCast(Map cast) { this.cast = cast; return this; } @@ -2672,7 +2854,7 @@ public String getCombine() { return combine; } @Override - public AbstractSQLConfig setCombine(String combine) { + public AbstractSQLConfig setCombine(String combine) { this.combine = combine; return this; } @@ -2691,7 +2873,7 @@ public Map> getCombineMap() { return combineMap; } @Override - public AbstractSQLConfig setCombineMap(Map> combineMap) { + public AbstractSQLConfig setCombineMap(Map> combineMap) { this.combineMap = combineMap; return this; } @@ -2701,7 +2883,7 @@ public Map getWhere() { return where; } @Override - public AbstractSQLConfig setWhere(Map where) { + public AbstractSQLConfig setWhere(Map where) { this.where = where; return this; } @@ -2746,7 +2928,7 @@ public Object getWhere(String key, boolean exactMatch) { return null; } @Override - public AbstractSQLConfig putWhere(String key, Object value, boolean prior) { + public AbstractSQLConfig putWhere(String key, Object value, boolean prior) { if (key != null) { if (where == null) { where = new LinkedHashMap(); @@ -2853,8 +3035,7 @@ public String getWhereString(boolean hasPrefix) throws Exception { @JSONField(serialize = false) public String getWhereString(boolean hasPrefix, RequestMethod method, Map where , String combine, List joinList, boolean verifyName) throws Exception { - - String whereString = parseCombineExpression(method, getQuote(), getTable(), getAliasWithQuote() + String whereString = parseCombineExpression(method, getQuote(), getTable(), getAlias() , where, combine, verifyName, false, false); whereString = concatJoinWhereString(whereString); String result = StringUtil.isEmpty(whereString, true) ? "" : (hasPrefix ? " WHERE " : "") + whereString; @@ -3482,7 +3663,9 @@ public String getEqualString(String key, String column, Object value, String raw if (not) { column = column.substring(0, column.length() - 1); } - if (StringUtil.isName(column) == false) { + + String rc = column.endsWith("[") || column.endsWith("{") ? column.substring(0, column.length() - 1) : column; + if (StringUtil.isName(rc) == false) { throw new IllegalArgumentException(key + ":value 中key不合法!不支持 ! 以外的逻辑符 !"); } @@ -3496,7 +3679,9 @@ public String getCompareString(String key, String column, Object value, String t if (value != null && JSON.isBooleanOrNumberOrString(value) == false && value instanceof Subquery == false) { throw new IllegalArgumentException(key + ":value 中 value 不合法!比较运算 [>, <, >=, <=] 只支持 [Boolean, Number, String] 内的类型 !"); } - if (StringUtil.isName(column) == false) { + + String rc = column.endsWith("[") || column.endsWith("{") ? column.substring(0, column.length() - 1) : column; + if ( ! StringUtil.isName(rc)) { throw new IllegalArgumentException(key + ":value 中 key 不合法!比较运算 [>, <, >=, <=] 不支持 [&, !, |] 中任何逻辑运算符 !"); } @@ -3505,7 +3690,16 @@ public String getCompareString(String key, String column, Object value, String t } public String getKey(String key) { - if (isTest()) { + String lenFun = ""; + if (key.endsWith("[")) { + lenFun = isSQLServer() ? "datalength" : "length"; + key = key.substring(0, key.length() - 1); + } + else if (key.endsWith("{")) { + lenFun = "json_length"; + key = key.substring(0, key.length() - 1); + } + else if (isTest()) { if (key.contains("'")) { // || key.contains("#") || key.contains("--")) { throw new IllegalArgumentException("参数 " + key + " 不合法!key 中不允许有单引号 ' !"); } @@ -3517,17 +3711,22 @@ public String getKey(String key) { if (expression == null) { expression = COLUMN_KEY_MAP == null ? null : COLUMN_KEY_MAP.get(key); } + + String sqlKey; if (expression == null) { - return getSQLKey(key); + sqlKey = getSQLKey(key); + } + else { + // (name,tag) left(date,4) 等 + List raw = getRaw(); + sqlKey = parseSQLExpression(KEY_KEY, expression, raw != null && raw.contains(KEY_KEY), false); } - // (name,tag) left(date,4) 等 - List raw = getRaw(); - return parseSQLExpression(KEY_KEY, expression, raw != null && raw.contains(KEY_KEY), false); + return lenFun.isEmpty() ? sqlKey : lenFun + "(" + sqlKey + ")"; } public String getSQLKey(String key) { String q = getQuote(); - return (isKeyPrefix() ? getAliasWithQuote() + "." : "") + q + key + q; + return (isKeyPrefix() ? q + getSQLAlias() + q + "." : "") + q + key + q; } /** @@ -3592,7 +3791,7 @@ public List getPreparedValueList() { return preparedValueList; } @Override - public AbstractSQLConfig setPreparedValueList(List preparedValueList) { + public AbstractSQLConfig setPreparedValueList(List preparedValueList) { this.preparedValueList = preparedValueList; return this; } @@ -3787,23 +3986,23 @@ public String getRegExpString(String key, String column, Object[] values, int ty */ @JSONField(serialize = false) public String getRegExpString(String key, String column, String value, boolean ignoreCase) { - if (isPostgreSQL() || isInfluxDB()) { + if (isPostgreSQL() || isCockroachDB() || isInfluxDB()) { return getKey(column) + " ~" + (ignoreCase ? "* " : " ") + getValue(key, column, value); } if (isOracle() || isDameng() || isKingBase() || (isMySQL() && getDBVersionNums()[0] >= 8)) { return "regexp_like(" + getKey(column) + ", " + getValue(key, column, value) + (ignoreCase ? ", 'i'" : ", 'c'") + ")"; } - if (isPresto() || isTrino()) { - return "regexp_like(" + (ignoreCase ? "lower(" : "") + getKey(column) + (ignoreCase ? ")" : "") - + ", " + (ignoreCase ? "lower(" : "") + getValue(key, column, value) + (ignoreCase ? ")" : "") + ")"; - } + if (isPresto() || isTrino()) { + return "regexp_like(" + (ignoreCase ? "lower(" : "") + getKey(column) + (ignoreCase ? ")" : "") + + ", " + (ignoreCase ? "lower(" : "") + getValue(key, column, value) + (ignoreCase ? ")" : "") + ")"; + } if (isClickHouse()) { return "match(" + (ignoreCase ? "lower(" : "") + getKey(column) + (ignoreCase ? ")" : "") + ", " + (ignoreCase ? "lower(" : "") + getValue(key, column, value) + (ignoreCase ? ")" : "") + ")"; } - if (isElasticsearch()) { - return getKey(column) + " RLIKE " + getValue(key, column, value); - } + if (isElasticsearch()) { + return getKey(column) + " RLIKE " + getValue(key, column, value); + } if (isHive()) { return (ignoreCase ? "lower(" : "") + getKey(column) + (ignoreCase ? ")" : "") + " REGEXP " + (ignoreCase ? "lower(" : "") + getValue(key, column, value) + (ignoreCase ? ")" : ""); @@ -4060,7 +4259,7 @@ public String getExistsString(String key, String column, Object value, String ra /**WHERE key contains value * @param key * @param value - * @return {@link #getContainString(String, String, Object[], int)} + * @return {@link #getContainString(String, String, Object[], int)} * @throws NotExistException */ @JSONField(serialize = false) @@ -4113,7 +4312,7 @@ public String getContainString(String key, String column, Object[] childs, int t } condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR)); - if (isPostgreSQL() || isInfluxDB()) { + if (isPostgreSQL() || isCockroachDB() || isInfluxDB()) { condition += (getKey(column) + " @> " + getValue(key, column, newJSONArray(c))); // operator does not exist: jsonb @> character varying "[" + c + "]"); } @@ -4121,11 +4320,11 @@ else if (isOracle() || isDameng() || isKingBase()) { condition += ("json_textcontains(" + getKey(column) + ", " + (StringUtil.isEmpty(path, true) ? "'$'" : getValue(key, column, path)) + ", " + getValue(key, column, c == null ? null : c.toString()) + ")"); } - else if (isPresto() || isTrino()) { - condition += ("json_array_contains(cast(" + getKey(column) + " AS VARCHAR), " + else if (isPresto() || isTrino()) { + condition += ("json_array_contains(cast(" + getKey(column) + " AS VARCHAR), " + getValue(key, column, c) + (StringUtil.isEmpty(path, true) ? "" : ", " + getValue(key, column, path)) + ")"); - } + } else { String v = c == null ? "null" : (c instanceof Boolean || c instanceof Number ? c.toString() : "\"" + c + "\""); if (isClickHouse()) { @@ -4174,11 +4373,12 @@ private String withAsExpreSubqueryString(SQLConfig cfg, Subquery subquery) throw } String quote = getQuote(); + String as = getAs(); String withAsExpreSql; if (list != null) { String withQuoteName = quote + subquery.getKey() + quote; - list.add(" " + withQuoteName + " AS " + "(" + cfg.getSQL(isPrepared()) + ") "); + list.add(" " + withQuoteName + as + "(" + cfg.getSQL(isPrepared()) + ") "); withAsExpreSql = " SELECT * FROM " + withQuoteName; // 预编译参数 FIXME 这里重复添加了,导致子查询都报错参数超过 ? 数量 Parameter index out of range (5 > number of parameters, which is 4) @@ -4197,7 +4397,7 @@ private String withAsExpreSubqueryString(SQLConfig cfg, Subquery subquery) throw withAsExpreSql = cfg.getSQL(isPrepared()); // mysql 才存在这个问题, 主表和子表是一张表 if (isWithAsEnable && isMySQL() && StringUtil.equals(getTable(), subquery.getFrom())) { - withAsExpreSql = " SELECT * FROM (" + withAsExpreSql + ") AS " + quote + subquery.getKey() + quote; + withAsExpreSql = " SELECT * FROM (" + withAsExpreSql + ")" + as + quote + subquery.getKey() + quote; } } @@ -4351,7 +4551,7 @@ public String getSetString(RequestMethod method, Map content, bo if (setString.isEmpty()) { throw new IllegalArgumentException("PUT 请求必须在Table内设置要修改的 key:value !"); } - return (isClickHouse()?" ":" SET ") + setString; + return (isClickHouse() ? " " : " SET ") + setString; } /**SET key = concat(key, 'value') @@ -4476,7 +4676,7 @@ public static String getSQL(AbstractSQLConfig config) throws Exception { if (config.isTest() && RequestMethod.isGetMethod(config.getMethod(), true)) { // FIXME 为啥是 code 而不是 count ? String q = config.getQuote(); // 生成 SELECT ( (24 >=0 AND 24 <3) ) AS `code` LIMIT 1 OFFSET 0 return explain + "SELECT " + config.getWhereString(false) - + " AS " + q + JSONResponse.KEY_COUNT + q + config.getLimitString(); + + config.getAs() + q + JSONResponse.KEY_COUNT + q + config.getLimitString(); } config.setPreparedValueList(new ArrayList()); @@ -4533,11 +4733,14 @@ public boolean isWithAsEnable() { */ protected String getOraclePageSql(String sql) { int count = getCount(); + if (count <= 0 || RequestMethod.isHeadMethod(getMethod(), true)) { // TODO HEAD 真的不需要 LIMIT ? + return sql; + } int offset = getOffset(getPage(), count); - String alias = getAliasWithQuote(); - - return "SELECT * FROM (SELECT " + alias + ".*, ROWNUM RN FROM (" + sql + ") " + alias - + " WHERE ROWNUM <= " + (offset + count) + ") WHERE RN > " + offset; + String quote = getQuote(); + String alias = quote + getSQLAlias() + quote; + return "SELECT * FROM (SELECT " + alias + ".*, ROWNUM "+ quote + "RN" + quote +" FROM (" + sql + ") " + alias + + " WHERE ROWNUM <= " + (offset + count) + ") WHERE "+ quote + "RN" + quote +" > " + offset; } /**获取条件SQL字符串 @@ -4549,7 +4752,7 @@ protected String getOraclePageSql(String sql) { private static String getConditionString(String table, AbstractSQLConfig config) throws Exception { Subquery from = config.getFrom(); if (from != null) { - table = config.getSubqueryString(from) + " AS " + config.getAliasWithQuote() + " "; + table = config.getSubqueryString(from) + config.getAs() + config.getSQLAliasWithQuote() + " "; } String join = config.getJoinString(); @@ -4618,7 +4821,7 @@ public boolean isKeyPrefix() { return keyPrefix; } @Override - public AbstractSQLConfig setKeyPrefix(boolean keyPrefix) { + public AbstractSQLConfig setKeyPrefix(boolean keyPrefix) { this.keyPrefix = keyPrefix; return this; } @@ -4647,7 +4850,7 @@ public String getJoinString() throws Exception { jc.setPrepared(isPrepared()); // 将关联表所属数据源配置为主表数据源 jc.setDatasource(this.getDatasource()); - String jt = StringUtil.isEmpty(jc.getAlias(), true) ? jc.getTable() : jc.getAlias(); + String jt = jc.getSQLAlias(); List onList = j.getOnList(); //如果要强制小写,则可在子类重写这个方法再 toLowerCase @@ -4668,7 +4871,7 @@ public String getJoinString() throws Exception { case ">": // RIGHT JOIN jc.setMain(true).setKeyPrefix(false); sql = ( "<".equals(type) ? " LEFT" : (">".equals(type) ? " RIGHT" : " CROSS") ) - + " JOIN ( " + jc.getSQL(isPrepared()) + " ) AS " + quote + jt + quote; + + " JOIN ( " + jc.getSQL(isPrepared()) + " ) " + getAs() + quote + jt + quote; sql = concatJoinOn(sql, quote, j, jt, onList); jc.setMain(false).setKeyPrefix(true); @@ -4688,9 +4891,10 @@ public String getJoinString() throws Exception { sql = concatJoinOn(sql, quote, j, jt, onList); break; default: + String k = jc.getTableKey(); throw new UnsupportedOperationException( - "join:value 中 value 里的 " + jt + "/" + j.getPath() - + "错误!不支持 " + jt + " 等 [ @ APP, < LEFT, > RIGHT, * CROSS" + "join:value 中 value 里的 " + k + "/" + j.getPath() + + "错误!不支持 " + k + " 等 [ @ APP, < LEFT, > RIGHT, * CROSS" + ", & INNER, | FULL, ! OUTER, ^ SIDE, ( ANTI, ) FOREIGN ] 之外的 JOIN 类型 !" ); } @@ -4712,10 +4916,10 @@ public String getJoinString() throws Exception { //if (changed) { - // List opvl = getPreparedValueList(); - // if (opvl != null && opvl.isEmpty() == false) { - // pvl.addAll(opvl); - // } + // List opvl = getPreparedValueList(); + // if (opvl != null && opvl.isEmpty() == false) { + // pvl.addAll(opvl); + // } setPreparedValueList(pvl); //} @@ -4725,32 +4929,42 @@ public String getJoinString() throws Exception { } - protected String concatJoinOn(@NotNull String sql, @NotNull String quote, @NotNull Join j, @NotNull String jt, List onList) { + protected String concatJoinOn(@NotNull String sql, @NotNull String quote, @NotNull Join join, @NotNull String jt, List onList) { if (onList != null) { + SQLConfig jc = join.getJoinConfig(); + Map castMap = jc == null ? null : jc.getCast(); + boolean first = true; for (On on : onList) { Logic logic = on.getLogic(); boolean isNot = logic == null ? false : logic.isNot(); if (isNot) { - onJoinNotRelation(sql, quote, j, jt, onList, on); + onJoinNotRelation(sql, quote, join, jt, onList, on); + } + + String lk = quote + jt + quote + "." + quote + on.getKey() + quote; + Object ct = castMap == null ? null : castMap.get(on.getOriginKey()); + if (StringUtil.isNotEmpty(ct, false)) { + lk = "cast(" + lk + " AS " + ct + ")"; // 解决 JOIN ON 不支持 @cast 问题,CAST(expression AS TYPE) 中 AS 不能省略 } String rt = on.getRelateType(); + + String rk = quote + SQLConfig.getSQLAlias(on.getTargetTable(), on.getTargetAlias()) + quote + "." + quote + on.getTargetKey() + quote; + if (StringUtil.isEmpty(rt, false)) { - sql += (first ? ON : AND) + quote + jt + quote + "." + quote + on.getKey() + quote + (isNot ? " != " : " = ") - + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote; + sql += (first ? ON : AND) + lk + (isNot ? " != " : " = ") + rk; } else { - onJoinComplexRelation(sql, quote, j, jt, onList, on); + onJoinComplexRelation(sql, quote, join, jt, onList, on); if (">=".equals(rt) || "<=".equals(rt) || ">".equals(rt) || "<".equals(rt)) { if (isNot) { - throw new IllegalArgumentException("join:value 中 value 里的 " + jt + "/" + j.getPath() + throw new IllegalArgumentException("join:value 中 value 里的 " + jt + "/" + join.getPath() + " 中 JOIN ON 条件关联逻辑符 " + rt + " 不合法! >, <, >=, <= 不支持与或非逻辑符 & | ! !"); } - sql += (first ? ON : AND) + quote + jt + quote + "." + quote + on.getKey() + quote + " " + rt + " " - + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote; + sql += (first ? ON : AND) + lk + " " + rt + " " + rk; } else if (rt.endsWith("$")) { String t = rt.substring(0, rt.length() - 1); @@ -4795,52 +5009,38 @@ else if (l > 0 && StringUtil.isName(String.valueOf(l))) { } if (l <= 0 && r <= 0) { - sql += (first ? ON : AND) + quote + jt + quote + "." + quote + on.getKey() + quote + (isNot ? NOT : "") - + " LIKE " + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote; + sql += (first ? ON : AND) + lk + (isNot ? NOT : "") + " LIKE " + rk; } else { - sql += (first ? ON : AND) + quote + jt + quote + "." + quote + on.getKey() + quote + (isNot ? NOT : "") - + (l <= 0 ? " LIKE concat(" : " LIKE concat('" + l + "', ") + quote + on.getTargetTable() + quote - + "." + quote + on.getTargetKey() + quote + (r <= 0 ? ")" : ", '" + r + "')"); + sql += (first ? ON : AND) + lk + (isNot ? NOT : "") + + (l <= 0 ? " LIKE concat(" : " LIKE concat('" + l + "', ") + rk + (r <= 0 ? ")" : ", '" + r + "')"); } } else if (rt.endsWith("~")) { boolean ignoreCase = "*~".equals(rt); - if (isPostgreSQL() || isInfluxDB()) { - sql += (first ? ON : AND) + quote + jt + quote + "." + quote + on.getKey() + quote - + (isNot ? NOT : "") + " ~" + (ignoreCase ? "* " : " ") - + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote; + if (isPostgreSQL() || isCockroachDB() || isInfluxDB()) { + sql += (first ? ON : AND) + lk + (isNot ? NOT : "") + " ~" + (ignoreCase ? "* " : " ") + rk; } else if (isOracle() || isDameng() || isKingBase()) { - sql += (first ? ON : AND) + "regexp_like(" + quote + jt + quote + "." + quote + on.getKey() + quote - + ", " + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote - + (ignoreCase ? ", 'i'" : ", 'c'") + ")"; + sql += (first ? ON : AND) + "regexp_like(" + lk + ", " + rk + (ignoreCase ? ", 'i'" : ", 'c'") + ")"; + } + else if (isPresto() || isTrino()) { + sql += (first ? ON : AND) + "regexp_like(" + (ignoreCase ? "lower(" : "") + lk + (ignoreCase ? ")" : "") + + ", " + (ignoreCase ? "lower(" : "") + rk + (ignoreCase ? ")" : "") + ")"; } - else if (isPresto() || isTrino()) { - sql += (first ? ON : AND) + "regexp_like(" + (ignoreCase ? "lower(" : "") + quote - + jt + quote + "." + quote + on.getKey() + quote + (ignoreCase ? ")" : "") - + ", " + (ignoreCase ? "lower(" : "") + quote + on.getTargetTable() - + quote + "." + quote + on.getTargetKey() + quote + (ignoreCase ? ")" : "") + ")"; - } else if (isClickHouse()) { - sql += (first ? ON : AND) + "match(" + (ignoreCase ? "lower(" : "") + quote + jt - + quote + "." + quote + on.getKey() + quote + (ignoreCase ? ")" : "") - + ", " + (ignoreCase ? "lower(" : "") + quote + on.getTargetTable() - + quote + "." + quote + on.getTargetKey() + quote + (ignoreCase ? ")" : "") + ")"; + sql += (first ? ON : AND) + "match(" + (ignoreCase ? "lower(" : "") + lk + (ignoreCase ? ")" : "") + + ", " + (ignoreCase ? "lower(" : "") + rk + (ignoreCase ? ")" : "") + ")"; } else if (isElasticsearch()) { - sql += (first ? ON : AND) + quote + jt + quote + "." + quote + on.getKey() + quote + (isNot ? NOT : "") - + " RLIKE " + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote; - } + sql += (first ? ON : AND) + lk + (isNot ? NOT : "") + " RLIKE " + rk; + } else if (isHive()) { - sql += (first ? ON : AND) + (ignoreCase ? "lower(" : "") + quote + jt + quote + "." + quote + on.getKey() + quote + (ignoreCase ? ")" : "") - + " REGEXP " + (ignoreCase ? "lower(" : "") + quote + on.getTargetTable() - + quote + "." + quote + on.getTargetKey() + quote + (ignoreCase ? ")" : ""); - } + sql += (first ? ON : AND) + (ignoreCase ? "lower(" : "") + lk + (ignoreCase ? ")" : "") + + " REGEXP " + (ignoreCase ? "lower(" : "") + rk + (ignoreCase ? ")" : ""); + } else { - sql += (first ? ON : AND) + quote + jt + quote + "." + quote + on.getKey() + quote + (isNot ? NOT : "") - + " REGEXP " + (ignoreCase ? "" : "BINARY ") - + quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote; + sql += (first ? ON : AND) + lk + (isNot ? NOT : "") + " REGEXP " + (ignoreCase ? "" : "BINARY ") + rk; } } else if ("{}".equals(rt) || "<>".equals(rt)) { @@ -4848,13 +5048,13 @@ else if ("{}".equals(rt) || "<>".equals(rt)) { String ta = on.getTargetAlias(); Map cast = null; - if (tt.equals(getTable()) && ((ta == null && getAlias() == null) || ta.equals(getAlias()))) { + if (tt.equals(getTable()) && Objects.equals(ta, getAlias())) { cast = getCast(); } else { boolean find = false; for (Join jn : joinList) { - if (tt.equals(jn.getTable()) && ((ta == null && jn.getAlias() == null) || ta.equals(jn.getAlias()))) { + if (tt.equals(jn.getTable()) && Objects.equals(ta, jn.getAlias())) { cast = getCast(); find = true; break; @@ -4862,25 +5062,18 @@ else if ("{}".equals(rt) || "<>".equals(rt)) { } if (find == false) { - throw new IllegalArgumentException("join:value 中 value 里的 " + jt + "/" + j.getPath() + throw new IllegalArgumentException("join:value 中 value 里的 " + jt + "/" + join.getPath() + " 中 JOIN ON 条件中找不到对应的 " + rt + " 不合法!只支持 =, {}, <> 这几种!"); } } boolean isBoolOrNum = SQL.isBooleanOrNumber(cast == null ? null : cast.get(on.getTargetKey())); - String arrKeyPath; - String itemKeyPath; - if ("{}".equals(rt)) { - arrKeyPath = quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote; - itemKeyPath = quote + jt + quote + "." + quote + on.getKey() + quote; - } - else { - arrKeyPath = quote + jt + quote + "." + quote + on.getKey() + quote; - itemKeyPath = quote + on.getTargetTable() + quote + "." + quote + on.getTargetKey() + quote; - } + boolean isIn = "{}".equals(rt); + String arrKeyPath = isIn ? rk : lk; + String itemKeyPath = isIn ? lk : rk; - if (isPostgreSQL() || isInfluxDB()) { //operator does not exist: jsonb @> character varying "[" + c + "]"); + if (isPostgreSQL() || isCockroachDB() || isInfluxDB()) { //operator does not exist: jsonb @> character varying "[" + c + "]"); sql += (first ? ON : AND) + (isNot ? "( " : "") + getCondition(isNot, arrKeyPath + " IS NOT NULL AND " + arrKeyPath + " @> " + itemKeyPath) + (isNot ? ") " : ""); } @@ -4904,12 +5097,12 @@ else if (isClickHouse()) { + " IS NOT NULL AND json_contains(" + arrKeyPath + (isBoolOrNum ? ", cast(" + itemKeyPath + " AS CHAR), '$')" : ", concat('\"', " + itemKeyPath + ", '\"'), '$')" - ) - ) + (isNot ? ") " : ""); + ) + ) + (isNot ? ") " : ""); } } else { - throw new IllegalArgumentException("join:value 中 value 里的 " + jt + "/" + j.getPath() + throw new IllegalArgumentException("join:value 中 value 里的 " + jt + "/" + join.getPath() + " 中 JOIN ON 条件关联类型 " + rt + " 不合法!只支持 =, >, <, >=, <=, !=, $, ~, {}, <> 这几种!"); } } @@ -4961,15 +5154,19 @@ public static SQLConfig newSQLConfig(RequestMethod method, + StringUtil.getString(DATABASE_LIST.toArray()) + "] 中的一种!"); } - String schema = request.getString(KEY_SCHEMA); String datasource = request.getString(KEY_DATASOURCE); + String namespace = request.getString(KEY_NAMESPACE); + String catalog = request.getString(KEY_CATALOG); + String schema = request.getString(KEY_SCHEMA); SQLConfig config = callback.getSQLConfig(method, database, schema, datasource, table); config.setAlias(alias); config.setDatabase(database); // 不删,后面表对象还要用的,必须放在 parseJoin 前 - config.setSchema(schema); // 不删,后面表对象还要用的 config.setDatasource(datasource); // 不删,后面表对象还要用的 + config.setNamespace(namespace); // 不删,后面表对象还要用的 + config.setCatalog(catalog); // 不删,后面表对象还要用的 + config.setSchema(schema); // 不删,后面表对象还要用的 if (isProcedure) { return config; @@ -5127,8 +5324,10 @@ else if (userId instanceof Subquery) {} request.remove(KEY_ROLE); request.remove(KEY_EXPLAIN); request.remove(KEY_CACHE); - request.remove(KEY_DATASOURCE); request.remove(KEY_DATABASE); + request.remove(KEY_DATASOURCE); + request.remove(KEY_NAMESPACE); + request.remove(KEY_CATALOG); request.remove(KEY_SCHEMA); request.remove(KEY_FROM); request.remove(KEY_COLUMN); @@ -5781,13 +5980,13 @@ else if (joinConfig.getDatabase().equals(config.getDatabase()) == false) { joinConfig.setMain(false).setKeyPrefix(true); if (j.getOuter() != null) { - SQLConfig outterConfig = newSQLConfig(method, table, alias, j.getOuter(), null, false, callback); - outterConfig.setMain(false) + SQLConfig outerConfig = newSQLConfig(method, table, alias, j.getOuter(), null, false, callback); + outerConfig.setMain(false) .setKeyPrefix(true) .setDatabase(joinConfig.getDatabase()) .setSchema(joinConfig.getSchema()); //解决主表 JOIN 副表,引号不一致 - j.setOuterConfig(outterConfig); + j.setOuterConfig(outerConfig); } } @@ -5851,7 +6050,7 @@ public static String getRealKey(RequestMethod method, String originKey return originKey; } - String key = new String(originKey); + String key = originKey; if (key.endsWith("$")) {//搜索 LIKE,查询时处理 String k = key.substring(0, key.length() - 1); // key%$:"a" -> key LIKE '%a%'; key?%$:"a" -> key LIKE 'a%'; key_?$:"a" -> key LIKE '_a'; key_%$:"a" -> key LIKE '_a%' @@ -5924,28 +6123,37 @@ else if (key.endsWith("-")) {//缩减,PUT查询时处理 } } - //TODO if (key.endsWith("-")) { // 表示 key 和 value 顺序反过来: value LIKE key + // TODO if (key.endsWith("-")) { // 表示 key 和 value 顺序反过来: value LIKE key ? - //不用Logic优化代码,否则 key 可能变为 key| 导致 key=value 变成 key|=value 而出错 + // 不用Logic优化代码,否则 key 可能变为 key| 导致 key=value 变成 key|=value 而出错 String last = key.isEmpty() ? "" : key.substring(key.length() - 1); if ("&".equals(last) || "|".equals(last) || "!".equals(last)) { key = key.substring(0, key.length() - 1); } else { - last = null;//避免key + StringUtil.getString(last)错误延长 + last = null; // 避免key + StringUtil.getString(last) 错误延长 } - //"User:toUser":User转换"toUser":User, User为查询同名Table得到的JSONObject。交给客户端处理更好 - if (isTableKey) {//不允许在column key中使用Type:key形式 - key = Pair.parseEntry(key, true).getKey();//table以左边为准 + String len = ""; + if (key.endsWith("[") || key.endsWith("{")) { + len = key.substring(key.length() - 1); + key = key.substring(0, key.length() - 1); + } + + // "User:toUser":User转换"toUser":User, User为查询同名Table得到的JSONObject。交给客户端处理更好 + if (isTableKey) { // 不允许在column key中使用Type:key形式 + key = Pair.parseEntry(key, true).getKey(); // table以左边为准 } else { - key = Pair.parseEntry(key).getValue();//column以右边为准 + key = Pair.parseEntry(key).getValue();// column 以右边为准 } if (verifyName && StringUtil.isName(key.startsWith("@") ? key.substring(1) : key) == false) { throw new IllegalArgumentException(method + "请求,字符 " + originKey + " 不合法!" - + " key:value 中的key只能关键词 '@key' 或 'key[逻辑符][条件符]' 或 PUT请求下的 'key+' / 'key-' !"); + + " key:value 中的 key 只能关键词 '@key' 或 'key[长度符][逻辑符][条件符]' 或 PUT 请求下的 'key+' / 'key-' !" + + "长度符 只能为 [ - length 和 { - json_length,逻辑符 只能是 & - 与、| - 或、! - 非 !"); } + key += len; + if (saveLogic && last != null) { key = key + last; } @@ -6079,7 +6287,7 @@ public List getWithAsExprPreparedValueList() { } @Override - public AbstractSQLConfig setWithAsExprPreparedValueList(List list) { + public AbstractSQLConfig setWithAsExprPreparedValueList(List list) { this.withAsExprPreparedValueList = list; return this; } diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java index e4b38d0b1..9393f43be 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java @@ -5,44 +5,34 @@ package apijson.orm; +import apijson.*; +import apijson.orm.Join.On; +import apijson.orm.exception.NotExistException; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; + import java.io.BufferedReader; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Connection; -import java.util.*; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Savepoint; -import java.sql.Statement; -import java.sql.Timestamp; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.*; import java.time.DayOfWeek; import java.time.LocalDateTime; import java.time.Month; import java.time.Year; +import java.util.Date; +import java.util.*; import java.util.Map.Entry; import java.util.regex.Pattern; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; - -import apijson.JSONResponse; -import apijson.Log; -import apijson.NotNull; -import apijson.RequestMethod; -import apijson.StringUtil; -import apijson.orm.Join.On; -import apijson.orm.exception.NotExistException; - /**executor for query(read) or update(write) MySQL database * @author Lemon */ public abstract class AbstractSQLExecutor implements SQLExecutor { private static final String TAG = "AbstractSQLExecutor"; - + //是否返回 值为null的字段 + public static boolean ENABLE_OUTPUT_NULL_COLUMN = false; public static String KEY_RAW_LIST = "@RAW@LIST"; // 避免和字段命名冲突,不用 $RAW@LIST$ 是因为 $ 会在 fastjson 内部转义,浪费性能 + public static String KEY_VICE_ITEM = "@VICE@ITEM"; // 避免和字段命名冲突,不用 $VICE@LIST$ 是因为 $ 会在 fastjson 内部转义,浪费性能 private Parser parser; @Override @@ -417,8 +407,10 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknownType) thr Log.d(TAG, "\n\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n execute while (rs.next()){ index = " + index + "\n\n"); JSONObject item = new JSONObject(true); + JSONObject viceItem = null; JSONObject curItem = item; boolean isMain = true; + boolean reseted = false; for (int i = 1; i <= length; i++) { @@ -446,20 +438,31 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknownType) thr if (toFindJoin) { // 在主表字段数量内的都归属主表 long startTime3 = System.currentTimeMillis(); sqlTable = rsmd.getTableName(i); // SQL 函数甚至部分字段都不返回表名,当然如果没传 @column 生成的 Table.* 则返回的所有字段都会带表名 - sqlResultDuration += System.currentTimeMillis() - startTime3; - if (StringUtil.isEmpty(sqlTable, true)) { - boolean isEmpty = curItem == null || curItem.isEmpty(); - String label = isEmpty ? null : getKey(config, rs, rsmd, index, curItem, i, childMap); - if (isEmpty || curItem.containsKey(label) == false) { // 重复字段几乎肯定不是一张表的,尤其是主副表同名主键 id - sqlTable = i <= 1 ? config.getSQLTable() : lastTableName; // Presto 等引擎 JDBC 返回 rsmd.getTableName(i) 为空,主表如果一个字段都没有会导致 APISJON 主副表所有字段都不返回 - } - } + //if (StringUtil.isEmpty(sqlTable, true)) { + // boolean isEmpty = curItem == null || curItem.isEmpty(); + String label = getKey(config, rs, rsmd, index, curItem, i, childMap); + if (i > 1 && ( (curItem != null && curItem.containsKey(label)) + || (StringUtil.isNotEmpty(label) && StringUtil.equals(label, curConfig == null ? null : curConfig.getIdKey()))) + ) { // Presto 等引擎 JDBC 返回 rsmd.getTableName(i) 为空,主表如果一个字段都没有会导致 APISJON 主副表所有字段都不返回 + sqlTable = null; + if (reseted) { + lastViceTableStart ++; + + SQLConfig lastCfg = lastJoin == null ? null : lastJoin.getCacheConfig(); + List lastColumn = lastCfg == null ? null : lastCfg.getColumn(); + lastViceColumnStart += lastColumn == null ? 1 : lastColumn.size(); + } + reseted = true; + } + //} + sqlResultDuration += System.currentTimeMillis() - startTime3; if (StringUtil.isEmpty(sqlTable, true)) { // hasJoin 已包含这个判断 && joinList != null) { int nextViceColumnStart = lastViceColumnStart; // 主表没有 @column 时会偏小 lastViceColumnStart - for (int j = lastViceTableStart; j < joinList.size(); j++) { // 查找副表 @column,定位字段所在表 + int joinCount = joinList.size(); + for (int j = lastViceTableStart; j < joinCount; j++) { // 查找副表 @column,定位字段所在表 Join join = joinList.get(j); SQLConfig cfg = join == null || ! join.isSQLJoin() ? null : join.getJoinConfig(); List c = cfg == null ? null : cfg.getColumn(); @@ -470,7 +473,7 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknownType) thr && StringUtil.equals(sqlAlias, lastAliasName) ? 1 : 0 ) ); - if (i < nextViceColumnStart) { + if (i < nextViceColumnStart || j >= joinCount - 1) { sqlTable = cfg.getSQLTable(); sqlAlias = cfg.getAlias(); lastViceTableStart = j; // 避免后面的空 @column 表内字段被放到之前的空 @column 表 @@ -552,10 +555,13 @@ else if (config.isClickHouse() && (sqlTable.startsWith("`") || sqlTable.startsWi Join prevJoin = columnIndexAndJoinMap == null || i < 2 ? null : columnIndexAndJoinMap[i - 2]; if (curJoin != prevJoin) { // 前后字段不在同一个表对象,即便后面出现 null,也不该是主表数据,而是逻辑 bug 导致 SQLConfig viceConfig = curJoin != null && curJoin.isSQLJoin() ? curJoin.getCacheConfig() : null; + boolean hasPK = false; if (viceConfig != null) { //FIXME 只有和主表关联才能用 item,否则应该从 childMap 查其它副表数据 List onList = curJoin.getOnList(); int size = onList == null ? 0 : onList.size(); if (size > 0) { + String idKey = viceConfig.getIdKey(); + String tblKey = config.getTableKey(); for (int j = size - 1; j >= 0; j--) { On on = onList.get(j); String ok = on == null ? null : on.getOriginKey(); @@ -563,26 +569,54 @@ else if (config.isClickHouse() && (sqlTable.startsWith("`") || sqlTable.startsWi throw new NullPointerException("服务器内部错误,List 中 Join.onList[" + j + (on == null ? "] = null!" : ".getOriginKey() = null!")); } - viceConfig.putWhere(ok.substring(0, ok.length() - 1), item.get(on.getTargetKey()), true); + String k = ok.substring(0, ok.length() - 1); + String ttk = on.getTargetTableKey(); + + JSONObject target = StringUtil.equals(ttk, tblKey) ? item : (viceItem == null ? null : viceItem.getJSONObject(ttk)); + Object v = target == null ? null : target.get(on.getTargetKey()); + hasPK = hasPK || (k.equals(idKey) && v != null); + + viceConfig.putWhere(k, v, true); } } } - String viceSql = viceConfig == null ? null : viceConfig.getSQL(false); //TODO 在 SQLConfig 缓存 SQL,减少大量的重复生成 - if (StringUtil.isEmpty(viceSql, true)) { - Log.i(TAG, "execute StringUtil.isEmpty(viceSql, true) >> item = null; >> "); + if (viceConfig == null) { // StringUtil.isEmpty(viceSql, true)) { + Log.i(TAG, "execute viceConfig == null >> item = null; >> "); curItem = null; } else if (curJoin.isOuterJoin() || curJoin.isAntiJoin()) { Log.i(TAG, "execute curJoin.isOuterJoin() || curJoin.isAntiJoin() >> item = null; >> "); curItem = null; // 肯定没有数据,缓存也无意义 - // 副表是按常规条件查询,缓存会导致其它同表同条件对象查询结果集为空 childMap.put(viceSql, new JSONObject()); // 缓存固定空数据,避免后续多余查询 + // 副表是按常规条件查询,缓存会导致其它同表同条件对象查询结果集为空 childMap.put(viceSql, new JSONObject()); // 缓存固定空数据,避免后续多余查询 } else { - curItem = childMap.get(viceSql); - if (curItem == null) { + String viceName = viceConfig.getTableKey(); + if (viceItem == null) { + viceItem = new JSONObject(true); + } + curItem = viceItem.getJSONObject(viceName); + + String viceSql = hasPK ? viceConfig.getSQL(false) : null; // TODO 在 SQLConfig 缓存 SQL,减少大量的重复生成 + JSONObject curCache = hasPK ? childMap.get(viceSql) : null; + + if (curItem == null || curItem.isEmpty()) { + // 导致前面判断重复 key 出错 curItem = curCache != null ? curCache : new JSONObject(true); curItem = new JSONObject(true); - childMap.put(viceSql, curItem); + viceItem.put(viceName, curItem); + if (hasPK && curCache == null) { + childMap.put(viceSql, curItem); + } + } + else if (hasPK) { + if (curCache == null || curCache.isEmpty()) { + childMap.put(viceSql, curItem); + } + else { + curCache.putAll(curItem); + // 导致前面判断重复 key 出错 curItem = curCache; + // viceItem.put(viceName, curItem); + } } } } @@ -590,6 +624,10 @@ else if (curJoin.isOuterJoin() || curJoin.isAntiJoin()) { curItem = onPutColumn(config, rs, rsmd, index, curItem, i, curJoin, childMap); // isExplain == false && hasJoin && i >= viceColumnStart ? childMap : null); } + if (viceItem != null) { + item.put(KEY_VICE_ITEM, viceItem); + } + resultList = onPutTable(config, rs, rsmd, resultList, index, item); Log.d(TAG, "execute while (rs.next()) { resultList.put( " + index + ", result); " + "\n >>>>>>>>>>>>>>>>>>>>>>>>>>> \n\n"); @@ -916,8 +954,14 @@ protected JSONObject onPutColumn(@NotNull SQLConfig config, @NotNull ResultSe Object value = getValue(config, rs, rsmd, tablePosition, table, columnIndex, label, childMap); // 主表必须 put 至少一个 null 进去,否则全部字段为 null 都不 put 会导致中断后续正常返回值 - if (value != null || (join == null && table.isEmpty())) { + if (value != null) { table.put(label, value); + } else { + if (join == null && table.isEmpty()) { + table.put(label, null); + } else if (ENABLE_OUTPUT_NULL_COLUMN) { + table.put(label, null); + } } return table; @@ -995,9 +1039,12 @@ protected Object getValue(@NotNull SQLConfig config, @NotNull ResultSet rs, @ boolean castToJson = false; //数据库查出来的null和empty值都有意义,去掉会导致 Moment:{ @column:"content" } 部分无结果及中断数组查询! - if (value instanceof Boolean || value instanceof Number) { + if (value instanceof Boolean) { //加快判断速度 } + else if (value instanceof Number) { + value = getNumVal((Number) value); + } else if (value instanceof Timestamp) { value = ((Timestamp) value).toString(); } @@ -1058,6 +1105,31 @@ else if (value instanceof Clob) { //SQL Server TEXT 类型 居然走这个 return value; } + public Object getNumVal(Number value) { + if (value == null) { + return null; + } + + if (value instanceof BigInteger) { + return ((BigInteger) value).toString(); + } + + if (value instanceof BigDecimal) { + return ((BigDecimal) value).toString(); + } + + double v = value.doubleValue(); + // if (v > Integer.MAX_VALUE || v < Integer.MIN_VALUE) { // 避免前端/客户端拿到精度丢失甚至严重失真的值 + // return value.toString(); + // } + // JavaScript: Number.MAX_SAFE_INTEGER ~ Number.MIN_SAFE_INTEGER + if (v > 9007199254740991L || v < -9007199254740991L) { // 避免前端/客户端拿到精度丢失甚至严重失真的值 + return value.toString(); + } + + return value; + } + /**判断是否为JSON类型 * @param config @@ -1118,7 +1190,7 @@ else if (RequestMethod.isGetMethod(config.getMethod(), true)) { //} else { // statement = getConnection(config).prepareStatement(sql, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE); //} - if (config.isMySQL() || config.isPostgreSQL() || config.isOracle() || config.isSQLServer() || config.isDb2()) { + if (config.isMySQL() || config.isPostgreSQL() || config.isCockroachDB() || config.isOracle() || config.isSQLServer() || config.isDb2()) { statement = getConnection(config).prepareStatement(sql, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE); } else { statement = getConnection(config).prepareStatement(sql); @@ -1165,7 +1237,7 @@ public PreparedStatement setArgument(@NotNull SQLConfig config, @NotNull Prep @NotNull @Override public Connection getConnection(@NotNull SQLConfig config) throws Exception { - String connectionKey = config.getDatasource() + "-" + config.getDatabase(); + String connectionKey = getConnectionKey(config); connection = connectionMap.get(connectionKey); if (connection == null || connection.isClosed()) { Log.i(TAG, "select connection " + (connection == null ? " = null" : ("isClosed = " + connection.isClosed()))) ; @@ -1183,6 +1255,13 @@ public Connection getConnection(@NotNull SQLConfig config) throws Exception { return connection; } + public String getConnectionKey(@NotNull SQLConfig config) { + return getConnectionKey(config.getNamespace(), config.getCatalog(), config.getDatasource(), config.getDatabase()); + } + public String getConnectionKey(String database, String datasource, String namespace, String catalog) { + return database + "-" + datasource + "-" + namespace + "-" + catalog; + } + //事务处理 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< private int transactionIsolation; @Override diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java index 79c1d1191..b2eca8bc8 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java @@ -80,7 +80,7 @@ public abstract class AbstractVerifier implements Verifier, IdCallback { private static final String TAG = "AbstractVerifier"; - /**为 PUT, DELETE 强制要求必须有 id/id{} 条件 + /**为 PUT, DELETE 强制要求必须有 id/id{}/id{}@ 条件 */ public static boolean IS_UPDATE_MUST_HAVE_ID_CONDITION = true; /**开启校验请求角色权限 @@ -700,8 +700,9 @@ public JSONObject onParseJSONObject(String key, JSONObject tobj, JSONObject robj throw new IllegalArgumentException(method + "请求," + name + "/" + key + " 不能传 " + finalIdKey + " !"); } } else { - if (RequestMethod.isQueryMethod(method) == false) { - verifyId(method.name(), name, key, robj, finalIdKey, maxUpdateCount, IS_UPDATE_MUST_HAVE_ID_CONDITION); + Boolean atLeastOne = tobj == null ? null : tobj.getBoolean(Operation.IS_ID_CONDITION_MUST.name()); + if (Boolean.TRUE.equals(atLeastOne) || RequestMethod.isUpdateMethod(method)) { + verifyId(method.name(), name, key, robj, finalIdKey, maxUpdateCount, atLeastOne != null ? atLeastOne : IS_UPDATE_MUST_HAVE_ID_CONDITION); String userIdKey = idCallback == null ? null : idCallback.getUserIdKey(db, sh, ds, key); String finalUserIdKey = StringUtil.isEmpty(userIdKey, false) ? apijson.JSONObject.KEY_USER_ID : userIdKey; @@ -746,7 +747,7 @@ private static void verifyId(@NotNull String method, @NotNull String name, @NotN Object id = robj.get(idKey); //如果必须传 id ,可在Request表中配置NECESSARY if (id != null && id instanceof Number == false && id instanceof String == false) { throw new IllegalArgumentException(method + "请求," + name + "/" + key - + " 里面的 " + idKey + ":value 中value的类型只能是 Long 或 String !"); + + " 里面的 " + idKey + ":value 中value的类型只能是 Long 或 String !"); } @@ -795,7 +796,7 @@ else if (o instanceof String) { } else { throw new IllegalArgumentException(method + "请求," + name + "/" + key - + " 里面的 " + idInKey + ":[] 中所有项的类型都只能是 Long 或 String !"); + + " 里面的 " + idInKey + ":[] 中所有项的类型都只能是 Long 或 String !"); } } } diff --git a/APIJSONORM/src/main/java/apijson/orm/Join.java b/APIJSONORM/src/main/java/apijson/orm/Join.java index 68d7e8344..f648ff8bf 100644 --- a/APIJSONORM/src/main/java/apijson/orm/Join.java +++ b/APIJSONORM/src/main/java/apijson/orm/Join.java @@ -181,6 +181,7 @@ public static class On { private Logic logic; // & | ! private String relateType; // "" - 一对一, "{}" - 一对多, "<>" - 多对一, > , <= , != private String key; // id + private String targetTableKey; // Moment:main private String targetTable; // Moment private String targetAlias; // main private String targetKey; // userId @@ -218,6 +219,14 @@ public String getKey() { public void setKey(String key) { this.key = key; } + + public void setTargetTableKey(String targetTableKey) { + this.targetTableKey = targetTableKey; + } + public String getTargetTableKey() { + return targetTableKey; + } + public void setTargetTable(String targetTable) { this.targetTable = targetTable; } diff --git a/APIJSONORM/src/main/java/apijson/orm/ObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/ObjectParser.java index 6df050e0b..205126908 100755 --- a/APIJSONORM/src/main/java/apijson/orm/ObjectParser.java +++ b/APIJSONORM/src/main/java/apijson/orm/ObjectParser.java @@ -26,6 +26,10 @@ public interface ObjectParser { String getParentPath(); ObjectParser setParentPath(String parentPath); + ObjectParser setCache(JSONObject cache); + JSONObject getCache(); + + /**解析成员 * response重新赋值 * @param name @@ -67,10 +71,11 @@ public interface ObjectParser { * @param index * @param key * @param value + * @param cache SQL 结果缓存 * @return * @throws Exception */ - JSON onChildParse(int index, String key, JSONObject value) throws Exception; + JSON onChildParse(int index, String key, JSONObject value, JSON cache) throws Exception; /**解析赋值引用 * @param path @@ -164,5 +169,4 @@ public interface ObjectParser { Map> getFunctionMap(); Map getChildMap(); - } diff --git a/APIJSONORM/src/main/java/apijson/orm/Operation.java b/APIJSONORM/src/main/java/apijson/orm/Operation.java index 6a588a94e..2976d09b0 100755 --- a/APIJSONORM/src/main/java/apijson/orm/Operation.java +++ b/APIJSONORM/src/main/java/apijson/orm/Operation.java @@ -145,8 +145,13 @@ public enum Operation { /** * 允许批量增删改部分失败,结构是 * "Table[],key[],key:alias[]" - * 自动 ALLOW_PARTIAL_UPDATE_FAILED_TABLE_MAP.put + * 自动 ALLOW_PARTIAL_UPDATE_FAILED_TABLE_MAP.put,结构是 Boolean,例如 true */ - ALLOW_PARTIAL_UPDATE_FAIL; + ALLOW_PARTIAL_UPDATE_FAIL, + + /** + * 强制要求必须有 id/id{}/id{}@ 条件,结构是 Boolean,例如 true + */ + IS_ID_CONDITION_MUST; } diff --git a/APIJSONORM/src/main/java/apijson/orm/Parser.java b/APIJSONORM/src/main/java/apijson/orm/Parser.java index 969dff95b..a272fc27a 100755 --- a/APIJSONORM/src/main/java/apijson/orm/Parser.java +++ b/APIJSONORM/src/main/java/apijson/orm/Parser.java @@ -66,9 +66,9 @@ JSONObject parseCorrectRequest(RequestMethod method, String tag, int version, St JSONObject getStructure(String table, String method, String tag, int version) throws Exception; - JSONObject onObjectParse(JSONObject request, String parentPath, String name, SQLConfig arrayConfig, boolean isSubquery) throws Exception; + JSONObject onObjectParse(JSONObject request, String parentPath, String name, SQLConfig arrayConfig, boolean isSubquery, JSONObject cache) throws Exception; - JSONArray onArrayParse(JSONObject request, String parentPath, String name, boolean isSubquery) throws Exception; + JSONArray onArrayParse(JSONObject request, String parentPath, String name, boolean isSubquery, JSONArray cache) throws Exception; /**解析远程函数 * @param key @@ -83,8 +83,9 @@ JSONObject parseCorrectRequest(RequestMethod method, String tag, int version, St ObjectParser createObjectParser(JSONObject request, String parentPath, SQLConfig arrayConfig, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception; - int getDefaultQueryCount(); + int getMinQueryPage(); int getMaxQueryPage(); + int getDefaultQueryCount(); int getMaxQueryCount(); int getMaxUpdateCount(); int getMaxSQLCount(); @@ -111,8 +112,10 @@ JSONObject parseCorrectRequest(RequestMethod method, String tag, int version, St Boolean getGlobalFormat(); String getGlobalRole(); String getGlobalDatabase(); - String getGlobalSchema(); String getGlobalDatasource(); + String getGlobalNamespace(); + String getGlobalCatalog(); + String getGlobalSchema(); Boolean getGlobalExplain(); String getGlobalCache(); diff --git a/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java index a453d9a80..64e6273ee 100755 --- a/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java +++ b/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java @@ -22,22 +22,35 @@ public interface SQLConfig { String DATABASE_SQLSERVER = "SQLSERVER"; // https://www.microsoft.com/en-us/sql-server String DATABASE_ORACLE = "ORACLE"; // https://www.oracle.com/database String DATABASE_DB2 = "DB2"; // https://www.ibm.com/products/db2 - String DATABASE_MARIADB = "MARIADB"; // https://mariadb.org - String DATABASE_TIDB = "TIDB"; // https://www.pingcap.com/tidb - String DATABASE_DAMENG = "DAMENG"; // https://www.dameng.com - String DATABASE_KINGBASE = "KINGBASE"; // https://www.kingbase.com.cn - String DATABASE_ELASTICSEARCH = "ELASTICSEARCH"; // https://www.elastic.co/guide/en/elasticsearch/reference/7.4/xpack-sql.html - String DATABASE_CLICKHOUSE = "CLICKHOUSE"; // https://clickhouse.com + String DATABASE_MARIADB = "MARIADB"; // https://mariadb.org + String DATABASE_TIDB = "TIDB"; // https://www.pingcap.com/tidb + String DATABASE_COCKROACHDB = "COCKROACHDB"; // https://www.cockroachlabs.com + String DATABASE_DAMENG = "DAMENG"; // https://www.dameng.com + String DATABASE_KINGBASE = "KINGBASE"; // https://www.kingbase.com.cn + String DATABASE_ELASTICSEARCH = "ELASTICSEARCH"; // https://www.elastic.co/guide/en/elasticsearch/reference/7.4/xpack-sql.html + String DATABASE_MANTICORE = "MANTICORE"; // https://manticoresearch.com + String DATABASE_CLICKHOUSE = "CLICKHOUSE"; // https://clickhouse.com String DATABASE_HIVE = "HIVE"; // https://hive.apache.org String DATABASE_PRESTO = "PRESTO"; // Facebook PrestoDB https://prestodb.io String DATABASE_TRINO = "TRINO"; // PrestoSQL https://trino.io String DATABASE_SNOWFLAKE = "SNOWFLAKE"; // https://www.snowflake.com String DATABASE_DATABRICKS = "DATABRICKS"; // https://www.databricks.com String DATABASE_CASSANDRA = "CASSANDRA"; // https://cassandra.apache.org + String DATABASE_MILVUS = "MILVUS"; // https://milvus.io String DATABASE_INFLUXDB = "INFLUXDB"; // https://www.influxdata.com/products/influxdb-overview String DATABASE_TDENGINE = "TDENGINE"; // https://tdengine.com - String DATABASE_REDIS = "REDIS"; - String DATABASE_MQ = "MQ"; + String DATABASE_TIMESCALEDB = "TIMESCALEDB"; // https://www.timescale.com + String DATABASE_IOTDB = "IOTDB"; // https://iotdb.apache.org/zh/UserGuide/latest/API/Programming-JDBC.html + + String DATABASE_REDIS = "REDIS"; // https://redisql.com + String DATABASE_MONGODB = "MONGODB"; // https://www.mongodb.com/docs/atlas/data-federation/query/query-with-sql + String DATABASE_KAFKA = "KAFKA"; // https://github.com/APIJSON/APIJSON-Demo/tree/master/APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Kafka + String DATABASE_SQLITE = "SQLITE"; // https://www.sqlite.org + String DATABASE_DUCKDB = "DUCKDB"; // https://duckdb.org + String DATABASE_SURREALDB = "SURREALDB"; // https://surrealdb.com + String DATABASE_OPENGAUSS = "OPENGAUSS"; // https://opengauss.org + + String DATABASE_MQ = "MQ"; // String SCHEMA_INFORMATION = "information_schema"; //MySQL, PostgreSQL, SQL Server 都有的系统模式 String SCHEMA_SYS = "sys"; //SQL Server 系统模式 @@ -50,19 +63,19 @@ public interface SQLConfig { Parser getParser(); - AbstractSQLConfig setParser(Parser parser); + SQLConfig setParser(Parser parser); ObjectParser getObjectParser(); - AbstractSQLConfig setObjectParser(ObjectParser objectParser); + SQLConfig setObjectParser(ObjectParser objectParser); int getVersion(); - AbstractSQLConfig setVersion(int version); + SQLConfig setVersion(int version); String getTag(); - AbstractSQLConfig setTag(String tag); + SQLConfig setTag(String tag); boolean isMySQL(); boolean isPostgreSQL(); @@ -71,31 +84,42 @@ public interface SQLConfig { boolean isDb2(); boolean isMariaDB(); boolean isTiDB(); + boolean isCockroachDB(); boolean isDameng(); boolean isKingBase(); boolean isElasticsearch(); + boolean isManticore(); boolean isClickHouse(); boolean isHive(); boolean isPresto(); + boolean isTrino(); boolean isSnowflake(); boolean isDatabricks(); boolean isCassandra(); - boolean isTrino(); + boolean isMilvus(); boolean isInfluxDB(); boolean isTDengine(); + boolean isTimescaleDB(); + boolean isIoTDB(); boolean isRedis(); + boolean isMongoDB(); + boolean isKafka(); boolean isMQ(); + boolean isSQLite(); + boolean isDuckDB(); + boolean isSurrealDB(); + boolean isOpenGauss(); - //暂时只兼容以上几种 + // 暂时只兼容以上几种 // boolean isSQL(); // boolean isTSQL(); // boolean isPLSQL(); // boolean isAnsiSQL(); - /**用来给 Table, Column 等系统属性表来绕过 MAX_SQL_COUNT 等限制 - * @return - */ + /**用来给 Table, Column 等系统属性表来绕过 MAX_SQL_COUNT 等限制 + * @return + */ boolean limitSQLCount(); /**是否开启 WITH AS 表达式来简化 SQL 和提升性能 @@ -103,11 +127,11 @@ public interface SQLConfig { */ boolean isWithAsEnable(); /**允许增删改部分失败 - * @return - */ - boolean allowPartialUpdateFailed(); + * @return + */ + boolean allowPartialUpdateFailed(); - @NotNull + @NotNull String getIdKey(); @NotNull String getUserIdKey(); @@ -164,67 +188,76 @@ default int[] getDBVersionNums() { boolean isTest(); - SQLConfig setTest(boolean test); + SQLConfig setTest(boolean test); int getType(); - SQLConfig setType(int type); + SQLConfig setType(int type); int getCount(); - SQLConfig setCount(int count); + SQLConfig setCount(int count); int getPage(); - SQLConfig setPage(int page); + SQLConfig setPage(int page); int getQuery(); - SQLConfig setQuery(int query); + SQLConfig setQuery(int query); Boolean getCompat(); - SQLConfig setCompat(Boolean compat); + SQLConfig setCompat(Boolean compat); int getPosition(); - SQLConfig setPosition(int position); + SQLConfig setPosition(int position); int getCache(); - SQLConfig setCache(int cache); + SQLConfig setCache(int cache); boolean isExplain(); - SQLConfig setExplain(boolean explain); + SQLConfig setExplain(boolean explain); RequestMethod getMethod(); - SQLConfig setMethod(RequestMethod method); + SQLConfig setMethod(RequestMethod method); Object getId(); - SQLConfig setId(Object id); + SQLConfig setId(Object id); Object getIdIn(); - SQLConfig setIdIn(Object idIn); + SQLConfig setIdIn(Object idIn); Object getUserId(); - SQLConfig setUserId(Object userId); + SQLConfig setUserId(Object userId); Object getUserIdIn(); - SQLConfig setUserIdIn(Object userIdIn); + SQLConfig setUserIdIn(Object userIdIn); String getRole(); - SQLConfig setRole(String role); + SQLConfig setRole(String role); public boolean isDistinct(); - public SQLConfig setDistinct(boolean distinct); + public SQLConfig setDistinct(boolean distinct); String getDatabase(); - SQLConfig setDatabase(String database); + SQLConfig setDatabase(String database); + String getSQLNamespace(); + String getNamespace(); + SQLConfig setNamespace(String namespace); + + String getSQLCatalog(); + String getCatalog(); + SQLConfig setCatalog(String catalog); + + String getSQLSchema(); String getSchema(); - SQLConfig setSchema(String schema); + SQLConfig setSchema(String schema); String getDatasource(); - SQLConfig setDatasource(String datasource); + SQLConfig setDatasource(String datasource); String getQuote(); List getJson(); - SQLConfig setJson(List json); + SQLConfig setJson(List json); /**请求传进来的Table名 * @return @@ -232,7 +265,7 @@ default int[] getDBVersionNums() { */ String getTable(); - SQLConfig setTable(String table); + SQLConfig setTable(String table); /**数据库里的真实Table名 * 通过 {@link AbstractSQLConfig.TABLE_KEY_MAP} 映射 @@ -243,49 +276,49 @@ default int[] getDBVersionNums() { String getTablePath(); Map getKeyMap(); - AbstractSQLConfig setKeyMap(Map keyMap); + SQLConfig setKeyMap(Map keyMap); List getRaw(); - SQLConfig setRaw(List raw); + SQLConfig setRaw(List raw); Subquery getFrom(); - SQLConfig setFrom(Subquery from); + SQLConfig setFrom(Subquery from); List getColumn(); - SQLConfig setColumn(List column); + SQLConfig setColumn(List column); List> getValues(); - SQLConfig setValues(List> values); + SQLConfig setValues(List> values); Map getContent(); - SQLConfig setContent(Map content); + SQLConfig setContent(Map content); Map> getCombineMap(); - SQLConfig setCombineMap(Map> combineMap); + SQLConfig setCombineMap(Map> combineMap); String getCombine(); - SQLConfig setCombine(String combine); + SQLConfig setCombine(String combine); Map getCast(); - SQLConfig setCast(Map cast); + SQLConfig setCast(Map cast); List getNull(); - SQLConfig setNull(List nulls); + SQLConfig setNull(List nulls); Map getWhere(); - SQLConfig setWhere(Map where); + SQLConfig setWhere(Map where); String getGroup(); - SQLConfig setGroup(String group); + SQLConfig setGroup(String group); Map getHaving(); - SQLConfig setHaving(Map having); + SQLConfig setHaving(Map having); String getHavingCombine(); - SQLConfig setHavingCombine(String havingCombine); + SQLConfig setHavingCombine(String havingCombine); String getOrder(); - SQLConfig setOrder(String order); + SQLConfig setOrder(String order); /** * exactMatch = false @@ -304,25 +337,39 @@ default int[] getDBVersionNums() { * @param value * @return */ - SQLConfig putWhere(String key, Object value, boolean prior); + SQLConfig putWhere(String key, Object value, boolean prior); boolean isPrepared(); - SQLConfig setPrepared(boolean prepared); + SQLConfig setPrepared(boolean prepared); boolean isMain(); - SQLConfig setMain(boolean main); + SQLConfig setMain(boolean main); List getPreparedValueList(); - SQLConfig setPreparedValueList(List preparedValueList); + SQLConfig setPreparedValueList(List preparedValueList); String getAlias(); - SQLConfig setAlias(String alias); + SQLConfig setAlias(String alias); + + default String getTableKey() { + String alias = getAlias(); + return getTable() + (StringUtil.isEmpty(alias) ? "" : ":" + alias); + } + + default String getSQLAlias() { + return getSQLAlias(getTable(), getAlias()); + } + static String getSQLAlias(@NotNull String table, String alias) { + // 这里不用 : $ 等符号,因为部分数据库/引擎似乎不支持 `key`, "key", [key] 等避免关键词冲突的方式,只能使用符合变量命名的表别名 + return StringUtil.isEmpty(alias) ? table : table + "__" + alias; // 带上原表名,避免 alias 和其它表名/字段名冲突 + } + String getWhereString(boolean hasPrefix) throws Exception; @@ -331,26 +378,27 @@ default int[] getDBVersionNums() { boolean isKeyPrefix(); - SQLConfig setKeyPrefix(boolean keyPrefix); + SQLConfig setKeyPrefix(boolean keyPrefix); List getJoinList(); - SQLConfig setJoinList(List joinList); + SQLConfig setJoinList(List joinList); boolean hasJoin(); String getSubqueryString(Subquery subquery) throws Exception; - SQLConfig setProcedure(String procedure); + SQLConfig setProcedure(String procedure); List getWithAsExprPreparedValueList(); - SQLConfig setWithAsExprPreparedValueList(List withAsExprePreparedValueList); + SQLConfig setWithAsExprPreparedValueList(List withAsExprePreparedValueList); boolean isFakeDelete(); Map onFakeDelete(Map map); + } diff --git a/APIJSONORM/src/main/java/apijson/orm/Verifier.java b/APIJSONORM/src/main/java/apijson/orm/Verifier.java index 366adb070..a4ab72055 100755 --- a/APIJSONORM/src/main/java/apijson/orm/Verifier.java +++ b/APIJSONORM/src/main/java/apijson/orm/Verifier.java @@ -18,7 +18,6 @@ public interface Verifier { /**验证权限是否通过 * @param config - * @param visitor * @return * @throws Exception */ @@ -37,12 +36,10 @@ public interface Verifier { void verifyRole(SQLConfig config, String table, RequestMethod method, String role) throws Exception; /**登录校验 - * @param config * @throws Exception */ void verifyLogin() throws Exception; /**管理员角色校验 - * @param config * @throws Exception */ void verifyAdmin() throws Exception; @@ -67,24 +64,36 @@ public interface Verifier { void verifyRepeat(String table, String key, Object value, long exceptId) throws Exception; /**验证请求参数的数据和结构 - * @param table - * @param key - * @param value - * @param exceptId 不包含id + * @param method + * @param name + * @param target + * @param request + * @param maxUpdateCount + * @param globalDatabase + * @param globalSchema + * @param creator + * @return * @throws Exception */ JSONObject verifyRequest(RequestMethod method, String name, JSONObject target, JSONObject request, int maxUpdateCount, String globalDatabase, String globalSchema, SQLCreator creator) throws Exception; /**验证返回结果的数据和结构 - * @param table - * @param key - * @param value - * @param exceptId 不包含id + * @param method + * @param name + * @param target + * @param response + * @param database + * @param schema + * @param creator + * @param callback + * @return * @throws Exception */ - JSONObject verifyResponse(RequestMethod method, String name, JSONObject target, JSONObject response, - String database, String schema, SQLCreator creator, OnParseCallback callback) throws Exception; + JSONObject verifyResponse( + RequestMethod method, String name, JSONObject target, JSONObject response, + String database, String schema, SQLCreator creator, OnParseCallback callback + ) throws Exception; @NotNull diff --git a/APIJSONORM/src/main/java/apijson/orm/exception/CommonException.java b/APIJSONORM/src/main/java/apijson/orm/exception/CommonException.java index fe748b7a1..9dab4ea16 100755 --- a/APIJSONORM/src/main/java/apijson/orm/exception/CommonException.java +++ b/APIJSONORM/src/main/java/apijson/orm/exception/CommonException.java @@ -147,7 +147,7 @@ public CommonException(Throwable t, String environment) { } - public static Exception wrap(Exception e, SQLConfig config) { + public static Exception wrap(Exception e, SQLConfig config) { if (Log.DEBUG == false && e instanceof SQLException) { return new SQLException("数据库驱动执行异常SQLException,非 Log.DEBUG 模式下不显示详情,避免泄漏真实模式名、表名等隐私信息", e); } @@ -158,23 +158,32 @@ public static Exception wrap(Exception e, SQLConfig config) { // msg != null && msg.contains(Log.KEY_SYSTEM_INFO_DIVIDER) == false) { try { String db = config == null ? AbstractSQLConfig.DEFAULT_DATABASE : (config instanceof AbstractSQLConfig - ? ((AbstractSQLConfig) config).getSQLDatabase() : config.getDatabase() + ? ((AbstractSQLConfig) config).getSQLDatabase() : config.getDatabase() ); - String dbVersion = config.getDBVersion(); + String dbVersion = config == null ? null : config.getDBVersion(); if (StringUtil.isEmpty(dbVersion)) { dbVersion = ""; } - if (db != null) { + if (db != null || config == null) { db += " " + dbVersion; } else if (config.isMySQL()) { db = SQLConfig.DATABASE_MYSQL + " " + dbVersion; } + else if (config.isMariaDB()) { + db = SQLConfig.DATABASE_MARIADB + " " + dbVersion; + } + else if (config.isTiDB()) { + db = SQLConfig.DATABASE_TIDB + " " + dbVersion; + } else if (config.isPostgreSQL()) { db = SQLConfig.DATABASE_POSTGRESQL + " " + dbVersion; } + else if (config.isCockroachDB()) { + db = SQLConfig.DATABASE_COCKROACHDB + " " + dbVersion; + } else if (config.isSQLServer()) { db = SQLConfig.DATABASE_SQLSERVER + " " + dbVersion; } @@ -184,15 +193,75 @@ else if (config.isOracle()) { else if (config.isDb2()) { db = SQLConfig.DATABASE_DB2 + " " + dbVersion; } + else if (config.isDuckDB()) { + db = SQLConfig.DATABASE_DUCKDB + " " + dbVersion; + } + else if (config.isSurrealDB()) { + db = SQLConfig.DATABASE_SURREALDB + " " + dbVersion; + } + else if (config.isOpenGauss()) { + db = SQLConfig.DATABASE_OPENGAUSS + " " + dbVersion; + } else if (config.isDameng()) { db = SQLConfig.DATABASE_DAMENG + " " + dbVersion; } + else if (config.isKingBase()) { + db = SQLConfig.DATABASE_KINGBASE + " " + dbVersion; + } + else if (config.isElasticsearch()) { + db = SQLConfig.DATABASE_ELASTICSEARCH + " " + dbVersion; + } + else if (config.isManticore()) { + db = SQLConfig.DATABASE_MANTICORE + " " + dbVersion; + } else if (config.isClickHouse()) { db = SQLConfig.DATABASE_CLICKHOUSE + " " + dbVersion; } + else if (config.isMilvus()) { + db = SQLConfig.DATABASE_MILVUS + " " + dbVersion; + } + else if (config.isInfluxDB()) { + db = SQLConfig.DATABASE_INFLUXDB + " " + dbVersion; + } else if (config.isTDengine()) { db = SQLConfig.DATABASE_TDENGINE + " " + dbVersion; } + else if (config.isTimescaleDB()) { + db = SQLConfig.DATABASE_TIMESCALEDB + " " + dbVersion; + } + else if (config.isIoTDB()) { + db = SQLConfig.DATABASE_IOTDB + " " + dbVersion; + } + else if (config.isSQLite()) { + db = SQLConfig.DATABASE_SQLITE + " " + dbVersion; + } + else if (config.isHive()) { + db = SQLConfig.DATABASE_HIVE + " " + dbVersion; + } + else if (config.isPresto()) { + db = SQLConfig.DATABASE_PRESTO + " " + dbVersion; + } + else if (config.isTrino()) { + db = SQLConfig.DATABASE_TRINO + " " + dbVersion; + } + else if (config.isSnowflake()) { + db = SQLConfig.DATABASE_SNOWFLAKE + " " + dbVersion; + } + else if (config.isDatabricks()) { + db = SQLConfig.DATABASE_DATABRICKS + " " + dbVersion; + } + else if (config.isMongoDB()) { + db = SQLConfig.DATABASE_MONGODB + " " + dbVersion; + } + else if (config.isCassandra()) { + db = SQLConfig.DATABASE_CASSANDRA + " " + dbVersion; + } + else if (config.isRedis()) { + db = SQLConfig.DATABASE_REDIS + " " + dbVersion; + } + else if (config.isKafka()) { + db = SQLConfig.DATABASE_KAFKA + " " + dbVersion; + } else { db = ""; } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ffcbf2724..06596081b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ - [gdjs2](https://github.com/gdjs2)(University of California, Riverside) - [Rkyzzy](https://github.com/Rkyzzy)(SUSTech, University of California, Berkeley) - [kxlv2000](https://github.com/kxlv2000)(SUSTech) -- [caohao-php](https://github.com/caohao-php)(腾讯工程师) +- [caohao-go](https://github.com/caohao-go)(腾讯工程师,曾在华为、恒生担任C/C++开发工程师,在wps担任项目经理,在360担任技术专家) - [Wscats](https://github.com/Wscats)(腾讯工程师、腾讯 AlloyTeam 成员、Tencent Creation Camp 成员、知名技术博主) - [jun0315](https://github.com/jun0315)(腾讯工程师) - [JieJo](https://github.com/JieJo) @@ -56,6 +56,14 @@ - [cnscoo](https://github.com/cnscoo)(阿里云工程师) - [aninZz](https://github.com/aninZz) - [leomiaomiao](https://github.com/leomiaomiao) +- [YqxLzx](https://github.com/YqxLzx) +- [hiteshbedre](https://github.com/hiteshbedre) +- [wahowaho](https://github.com/wahowaho) +- [jarrodquan](https://github.com/jarrodquan) +- [gemufeng](https://github.com/gemufeng)(上海麦市工程师) +- [komiblog](https://github.com/komiblog) +- [ostrichManX](https://github.com/ostrichManX) +- [jia199807](https://github.com/jia199807) #### 其中特别致谢:
cloudAndMonkey 提交的 11 个 Commits, 对 APIJSON 做出了 1,496 增加和 845 处删减(截止 2022/12/15 日);
diff --git a/Document.md b/Document.md index 38adef507..e20bfbb27 100644 --- a/Document.md +++ b/Document.md @@ -403,24 +403,24 @@ DELETE:
删除数据 | base_url/delete/ | {
   TableName:{< 功能 | 键值对格式 | 使用示例 ------------ | ------------ | ------------ - 查询数组 | "key[]":{},后面是JSONObject,key可省略。当key和里面的Table名相同时,Table会被提取出来,即 {Table:{Content}} 会被转化为 {Content} | [{"User[]":{"User":{}}}](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{}}}),查询一个User数组。这里key和Table名都是User,User会被提取出来,即 {"User":{"id", ...}} 会被转化为 {"id", ...},如果要进一步提取User中的id,可以把User[]改为User-id[] - 匹配选项范围 | "key{}":[],后面是JSONArray,作为key可取的值的选项 | ["id{}":[38710,82001,70793]](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"id{}":[38710,82001,70793]}}}),对应SQL是`id IN(38710,82001,70793)`,查询id符合38710,82001,70793中任意一个的一个User数组 - 匹配条件范围 | "key{}":"条件0,条件1...",条件为SQL表达式字符串,可进行数字比较运算等 | ["id{}":"<=80000,\>90000"](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"id{}":"<=80000,\>90000"}}}),对应SQL是`id<=80000 OR id>90000`,查询id符合id\<=80000 \| id>90000的一个User数组 - 包含选项范围 | "key<\>":Object => "key<\>":[Object],key对应值的类型必须为JSONArray,Object类型不能为JSON | ["contactIdList<\>":38710](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"contactIdList<\>":38710}}}),对应SQL是`json_contains(contactIdList,38710)`,查询contactIdList包含38710的一个User数组 + 查询数组 | "key[]":{},后面是 JSONObject,key 可省略。当 key 和里面的 Table 名相同时,Table 会被提取出来,即 {Table:{Content}} 会被转化为 {Content} | [{"User[]":{"User":{}}}](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{}}}),查询一个 User 数组。这里 key 和 Table 名都是 User,User 会被提取出来,即 {"User":{"id", ...}} 会被转化为 {"id", ...},如果要进一步提取 User 中的 id,可以把 User[] 改为 User-id[],其中 - 用来分隔路径中涉及的 key + 匹配选项范围 | "key{}":[],后面是 JSONArray,作为 key 可取的值的选项 | ["id{}":[38710,82001,70793]](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"id{}":[38710,82001,70793]}}}),对应 SQL 是`id IN(38710,82001,70793)`,查询 id 符合 38710,82001,70793 中任意一个的一个 User 数组 + 匹配条件范围 | "key{}":"条件0,条件1...",条件为 SQL 表达式字符串,可进行数字比较运算等 | ["id{}":"<=80000,\>90000"](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"id{}":"<=80000,\>90000"}}}),对应 SQL 是`id<=80000 OR id>90000`,查询 id 符合 id\<=80000 \| id>90000 的一个 User 数组 + 包含选项范围 | "key<\>":value => "key<\>":[value],key 对应值的类型必须为 JSONArray,value 值类型只能为 Boolean, Number, String 中的一种 | ["contactIdList<\>":38710](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"contactIdList<\>":38710}}}),对应SQL是`json_contains(contactIdList,38710)`,查询 contactIdList 包含 38710 的一个 User 数组 判断是否存在 | "key}{@":{
   "from":"Table",
   "Table":{ ... }
}
其中:
}{ 表示 EXISTS;
key 用来标识是哪个判断;
@ 后面是 子查询 对象,具体见下方 子查询 的说明。 | ["id}{@":{
   "from":"Comment",
   "Comment":{
      "momentId":15
   }
}](http://apijson.cn:8080/get/{"User":{"id}{@":{"from":"Comment","Comment":{"momentId":15}}}})
WHERE EXISTS(SELECT * FROM Comment WHERE momentId=15) - 远程调用函数 | "key()":"函数表达式",函数表达式为 function(key0,key1...),会调用后端对应的函数 function(JSONObject request, String key0, String key1...),实现 参数校验、数值计算、数据同步、消息推送、字段拼接、结构变换 等特定的业务逻辑处理,
可使用 - 和 + 表示优先级,解析 key-() > 解析当前对象 > 解析 key() > 解析子对象 > 解析 key+() | ["isPraised()":"isContain(praiseUserIdList,userId)"](http://apijson.cn:8080/get/{"Moment":{"id":301,"isPraised()":"isContain(praiseUserIdList,userId)"}}),会调用远程函数 [boolean isContain(JSONObject request, String array, String value)](https://github.com/APIJSON/apijson-framework/blob/master/src/main/java/apijson/framework/APIJSONFunctionParser.java#L361-L374) ,然后变为 "isPraised":true 这种(假设点赞用户id列表包含了userId,即这个User点了赞) - 存储过程 | "@key()":"SQL函数表达式",函数表达式为
function(key0,key1...)
会调用后端数据库对应的存储过程 SQL函数
function(String key0, String key1...)
除了参数会提前赋值,其它和 远程函数 一致 | ["@limit":10,
"@offset":0,
"@procedure()":"getCommentByUserId(id,@limit,@offset)"](http://apijson.cn:8080/get/{"User":{"@limit":10,"@offset":0,"@procedure()":"getCommentByUserId(id,@limit,@offset)"}})
会转为
`getCommentByUserId(38710,10,0)`
来调用存储过程 SQL 函数
`getCommentByUserId(IN id bigint, IN limit int, IN offset int)`
然后变为
"procedure":{
   "count":-1,
   "update":false,
   "list":[]
}
其中 count 是指写操作影响记录行数,-1 表示不是写操作;update 是指是否为写操作(增删改);list 为返回结果集 - 引用赋值 | "key@":"key0/key1/.../refKey",引用路径为用/分隔的字符串。以/开头的是缺省引用路径,从声明key所处容器的父容器路径开始;其它是完整引用路径,从最外层开始。
被引用的refKey必须在声明key的上面。如果对refKey的容器指定了返回字段,则被引用的refKey必须写在@column对应的值内,例如 "@column":"refKey,key1,..." | ["Moment":{
   "userId":38710
},
"User":{
   "id@":"/Moment/userId"
}](http://apijson.cn:8080/get/{"Moment":{"userId":38710},"User":{"id@":"%252FMoment%252FuserId"}})
User内的id引用了与User同级的Moment内的userId,
即User.id = Moment.userId,请求完成后
"id@":"/Moment/userId" 会变成 "id":38710 - 子查询 | "key@":{
   "range":"ALL",
   "from":"Table",
   "Table":{ ... }
}
其中:
range 可为 ALL,ANY;
from 为目标表 Table 的名称;
@ 后面的对象类似数组对象,可使用 count 和 join 等功能。 | ["id@":{
   "from":"Comment",
   "Comment":{
      "@column":"min(userId)"
   }
}](http://apijson.cn:8080/get/{"User":{"id@":{"from":"Comment","Comment":{"@column":"min(userId)"}}}})
WHERE id=(SELECT min(userId) FROM Comment) - 模糊搜索 | `"key$":"SQL搜索表达式"` => `"key$":["SQL搜索表达式"]`,任意SQL搜索表达式字符串,如 %key%(包含key), key%(以key开始), %k%e%y%(包含字母k,e,y) 等,%表示任意字符 | ["name$":"%m%"](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"name$":"%2525m%2525"}}}),对应SQL是`name LIKE '%m%'`,查询name包含"m"的一个User数组 - 正则匹配 | "key~":"正则表达式" => "key~":["正则表达式"],任意正则表达式字符串,如 ^[0-9]+$ ,*~ 忽略大小写,可用于高级搜索 | ["name~":"^[0-9]+$"](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"name~":"^[0-9]%252B$"}}}),对应SQL是`name REGEXP '^[0-9]+$'`,查询name中字符全为数字的一个User数组 - 连续范围 | "key%":"start,end" => "key%":["start,end"],其中 start 和 end 都只能为 Boolean, Number, String 中的一种,如 "2017-01-01,2019-01-01" ,["1,90000", "82001,100000"] ,可用于连续范围内的筛选 | ["date%":"2017-10-01,2018-10-01"](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"date%2525":"2017-10-01,2018-10-01"}}}),对应SQL是`date BETWEEN '2017-10-01' AND '2018-10-01'`,查询在2017-10-01和2018-10-01期间注册的用户的一个User数组 - 新建别名 | "name:alias",name映射为alias,用alias替代name。可用于 column,Table,SQL函数 等。只用于GET类型、HEAD类型的请求 | ["@column":"toId:parentId"](http://apijson.cn:8080/get/{"Comment":{"@column":"id,toId:parentId","id":51}}),对应SQL是`toId AS parentId`,将查询的字段toId变为parentId返回 - 增加 或 扩展 | "key+":Object,Object的类型由key指定,且类型为Number,String,JSONArray中的一种。如 82001,"apijson",["url0","url1"] 等。只用于PUT请求 | "praiseUserIdList+":[82001],对应SQL是`json_insert(praiseUserIdList,82001)`,添加一个点赞用户id,即这个用户点了赞 + 远程调用函数 | "key()":"函数表达式",函数表达式为 function(key0,key1...),会调用后端对应的函数 function(JSONObject request, String key0, String key1...),实现 参数校验、数值计算、数据同步、消息推送、字段拼接、结构变换 等特定的业务逻辑处理,
可使用 - 和 + 表示优先级,解析 key-() > 解析当前对象 > 解析 key() > 解析子对象 > 解析 key+() | ["isPraised()":"isContain(praiseUserIdList,userId)"](http://apijson.cn:8080/get/{"Moment":{"id":301,"isPraised()":"isContain(praiseUserIdList,userId)"}}),会调用远程函数 [boolean isContain(JSONObject request, String array, String value)](https://github.com/APIJSON/apijson-framework/blob/master/src/main/java/apijson/framework/APIJSONFunctionParser.java#L361-L374) ,然后变为 "isPraised":true 这种(假设点赞用户 id 列表包含了 userId,即这个 User 点了赞) + 存储过程 | "@key()":"SQL函数表达式",函数表达式为
function(key0,key1...)
会调用后端数据库对应的存储过程 SQL 函数
function(String key0, String key1...)
除了参数会提前赋值,其它和 远程函数 一致 | ["@limit":10,
"@offset":0,
"@procedure()":"getCommentByUserId(id,@limit,@offset)"](http://apijson.cn:8080/get/{"User":{"@limit":10,"@offset":0,"@procedure()":"getCommentByUserId(id,@limit,@offset)"}})
会转为
`getCommentByUserId(38710,10,0)`
来调用存储过程 SQL 函数
`getCommentByUserId(IN id bigint, IN limit int, IN offset int)`
然后变为
"procedure":{
   "count":-1,
   "update":false,
   "list":[]
}
其中 count 是指写操作影响记录行数,-1 表示不是写操作;update 是指是否为写操作(增删改);list 为返回结果集 + 引用赋值 | "key@":"key0/key1/.../refKey",引用路径为用 / 分隔的字符串。以 / 开头的是缺省引用路径,从声明 key 所处容器的父容器路径开始;其它是完整引用路径,从最外层开始。
被引用的 refKey 必须在声明 key 的上面。如果对 refKey 的容器指定了返回字段,则被引用的 refKey 必须写在 @column 对应的值内,例如 "@column":"refKey,key1,..." | ["Moment":{
   "userId":38710
},
"User":{
   "id@":"/Moment/userId"
}](http://apijson.cn:8080/get/{"Moment":{"userId":38710},"User":{"id@":"%252FMoment%252FuserId"}})
User 内的 id 引用了与 User 同级的 Moment 内的 userId,
即 User.id = Moment.userId,请求完成后
"id@":"/Moment/userId" 会变成 "id":38710 + 子查询 | "key@":{
   "range":"ALL",
   "from":"Table", // 可省略,默认为首个表对象 key 名
   "Table":{ ... }
}
其中:
range 可为 ALL,ANY;
from 为目标表 Table 的名称;
@ 后面的对象类似数组对象,可使用 count 和 join 等功能。 | ["id@":{
   "from":"Comment", // 可省略
   "Comment":{
      "@column":"min(userId)"
   }
}](http://apijson.cn:8080/get/{"User":{"id@":{"from":"Comment","Comment":{"@column":"min(userId)"}}}})
WHERE id=(SELECT min(userId) FROM Comment) + 模糊搜索 | `"key$":"SQL搜索表达式"` => `"key$":["SQL搜索表达式"]`,任意 SQL 搜索表达式字符串,如 %key%(包含 key), key%(以 key 开始), %k%e%y%(包含字母 k,e,y) 等,% 表示任意字符 | ["name$":"%m%"](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"name$":"%2525m%2525"}}}),对应 SQL 是`name LIKE '%m%'`,查询 name 包含 "m" 的一个 User 数组 + 正则匹配 | "key~":"正则表达式" => "key~":["正则表达式"],任意正则表达式字符串,如 ^[0-9]+$ ,*~ 忽略大小写,可用于高级搜索 | ["name~":"^[0-9]+$"](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"name~":"^[0-9]%252B$"}}}),对应 SQL 是`name REGEXP '^[0-9]+$'`,查询 name 中字符全为数字的一个 User 数组 + 连续范围 | "key%":"start,end" => "key%":["start,end"],其中 start 和 end 都只能为 Number, String 中的一种,如 "2017-01-01,2019-01-01" ,["1,90000", "82001,100000"] ,可用于连续范围内的筛选 | ["date%":"2017-10-01,2018-10-01"](http://apijson.cn:8080/get/{"User[]":{"count":3,"User":{"date%2525":"2017-10-01,2018-10-01"}}}),对应SQL是`date BETWEEN '2017-10-01' AND '2018-10-01'`,查询在2017-10-01和2018-10-01期间注册的用户的一个User数组 + 新建别名 | "name:alias",name 映射为 alias,用 alias 替代 name。可用于 column,Table,SQL 函数 等。只用于 GET 类型、HEAD 类型的请求 | ["@column":"toId:parentId"](http://apijson.cn:8080/get/{"Comment":{"@column":"id,toId:parentId","id":51}}),对应 SQL 是`toId AS parentId`,将查询的字段 toId 变为 parentId 返回 + 增加 或 扩展 | "key+":Object,Object的类型由key指定,且类型为 Number,String,JSONArray 中的一种。如 82001,"apijson",["url0","url1"] 等。只用于 PUT 请求 | "praiseUserIdList+":[82001],对应 SQL 是`json_insert(praiseUserIdList,82001)`,添加一个点赞用户 id,即这个用户点了赞 减少 或 去除 | "key-":Object,与"key+"相反 | "balance-":100.00,对应SQL是`balance = balance - 100.00`,余额减少100.00,即花费了100元 - 比较运算 | >, <, >=, <= 比较运算符,用于
① 提供 "id{}":"<=90000" 这种条件范围的简化写法

② 实现子查询相关比较运算

不支持 "key=":Object 和 "key!=":Object 这两种写法,直接用更简单的 "key":Object 和 "key!":Object 替代。 | ① ["id<=":90000](http://apijson.cn:8080/get/{"[]":{"User":{"id<=":90000}}}),对应SQL是`id<=90000`,查询符合id<=90000的一个User数组

② ["id>@":{
   "from":"Comment",
   "Comment":{
      "@column":"min(userId)"
   }
}](http://apijson.cn:8080/get/{"User":{"id>@":{"from":"Comment","Comment":{"@column":"min(userId)"}}}})
WHERE id>(SELECT min(userId) FROM Comment) - 逻辑运算 | &, \|, ! 逻辑运算符,对应数据库 SQL 中的 AND, OR, NOT。
横或纵与:同一键值对的值内条件默认 \| 或连接,可以在 key 后加逻辑运算符来具体指定;不同键值对的条件默认 & 与连接,可以用下面说明的对象关键词 @combine 来具体指定。

① & 可用于"key&{}":"条件"等

② \| 可用于"key\|{}":"条件", "key\|{}":[]等,一般可省略

③ ! 可单独使用,如"key!":Object,也可像&,\|一样配合其他功能符使用
"key!":null 无效,null 值会导致整个键值对被忽略解析,可以用 "key{}":"!=null" 替代,
"key":null 同理,用 "key{}":"=null" 替代。 | ① ["id&{}":">80000,<=90000"](http://apijson.cn:8080/head/{"User":{"id&{}":">80000,<=90000"}}),对应SQL是`id>80000 AND id<=90000`,即id满足id>80000 & id<=90000

② ["id\|{}":">90000,<=80000"](http://apijson.cn:8080/head/{"User":{"id\|{}":">90000,<=80000"}}),同"id{}":">90000,<=80000",对应SQL是`id>90000 OR id<=80000`,即id满足id>90000 \| id<=80000

③ ["id!{}":[82001,38710]](http://apijson.cn:8080/head/{"User":{"id!{}":[82001,38710]}}),对应SQL是`id NOT IN(82001,38710)`,即id满足 ! (id=82001 \| id=38710),可过滤黑名单的消息 - 数组关键词,可自定义 | "key":Object,key为 "[]":{} 中{}内的关键词,Object的类型由key指定

① "count":Integer,查询数量,0 表示最大值,默认最大值为100

② "page":Integer,查询页码,从0开始,默认最大值为100,一般和count一起用

③ "query":Integer,查询内容
0-对象,1-总数和分页详情,2-数据、总数和分页详情
总数关键词为 total,分页详情关键词为 info,
它们都和 query 同级,通过引用赋值得到,例如
"total@":"/[]/total", "info@":"/[]/info"
这里query及total仅为GET类型的请求提供方便,
一般可直接用HEAD类型的请求获取总数

④ "join":"&/Table0,\"join":{
   "&/Table0":{}, // 支持 ON 多个字段关联,
   "\      "key0":value0, // 其它ON条件
     "key2":value2,
     ...
     "@combine":"...", // 其它ON条件的组合方式
     "@column":"...", // 外层 SELECT
     "@group":"...", // 外层 GROUP BY
     "@having":"..." // 外层 HAVING
   }
}
多表连接方式:
"@" - APP JOIN
"\<" - LEFT JOIN
">" - RIGHT JOIN
"&" - INNER JOIN
"\|" - FULL JOIN
"!" - OUTER JOIN
"*" - CROSS JOIN
"^" - SIDE JOIN
"(" - ANTI JOIN
")" - FOREIGN JOIN
其中 @ APP JOIN 为应用层连表,会从已查出的主表里取得所有副表 key@ 关联的主表内的 refKey 作为一个数组 refKeys: [value0, value1...],然后把原来副表 count 次查询 key=$refKey 的 SQL 用 key IN($refKeys) 的方式合并为一条 SQL 来优化性能;
其它 JOIN 都是 SQL JOIN,具体功能和 MySQL,PostgreSQL 等数据库的 JOIN 一一对应
`"join":"`"MainTable":{},`
`"ViceTable":{"key@":"/MainTable/refKey"}`
会对应生成
`MainTable LEFT JOIN ViceTable`
`ON ViceTable.key=MainTable.refKey` AND 其它ON条件
除了 = 等价关联,也支持 ! 不等关联、\> \< \>= \<= 等比较关联和 $ ~ {} <> 等其它复杂关联方式

⑤ "otherKey":Object,自定义关键词,名称和以上系统关键词不一样,且原样返回上传的值 | ① 查询User数组,最多5个:
["count":5](http://apijson.cn:8080/get/{"[]":{"count":5,"User":{}}})
对应SQL是`LIMIT 5`

② 查询第3页的User数组,每页5个:
["count":5,
"page":3](http://apijson.cn:8080/get/{"[]":{"count":5,"page":3,"User":{}}})
对应SQL是`LIMIT 5 OFFSET 15`

③ 查询User数组和对应的User总数:
["[]":{
   "query":2,
   "User":{}
},
"total@":"/[]/total",
"info@":"/[]/info"](http://apijson.cn:8080/get/{"[]":{"query":2,"count":5,"User":{}},"total@":"%252F[]%252Ftotal","info@":"%252F[]%252Finfo"})
返回的数据中,总数及分页详情结构为:
"total":139, //总数
"info":{ //分页详情
   "total":139, //总数
   "count":5, //每页数量
   "page":0, //当前页码
   "max":27, //最大页码
   "more":true, //是否还有更多
   "first":true, //是否为首页
   "last":false //是否为尾页
}

④ Moment INNER JOIN User LEFT JOIN Comment:
["[]":{
   "join":"&/User/id@,\    "Moment":{
     "@group":"id" //主副表不是一对一,要去除重复数据
   },
   "User":{
     "name~":"t",
     "id@":"/Moment/userId"
   },
   "Comment":{
     "momentId@":"/Moment/id"
   }
}](http://apijson.cn/api/?type=JSON&url=http://apijson.cn:8080/get&json=%7B%22%5B%5D%22:%7B%22count%22:5,%22join%22:%22%26%2FUser%2Fid@,%3C%2FComment%22,%22Moment%22:%7B%22@column%22:%22id,userId,content%22,%22@group%22:%22id%22%7D,%22User%22:%7B%22name~%22:%22t%22,%22id@%22:%22%2FMoment%2FuserId%22,%22@column%22:%22id,name,head%22%7D,%22Comment%22:%7B%22momentId@%22:%22%2FMoment%2Fid%22,%22@column%22:%22id,momentId,content%22%7D%7D%7D)

⑤ 每一层都加当前用户名:
["User":{},
"[]":{
   "name@":"User/name", //自定义关键词
   "Moment":{}
}](http://apijson.cn:8080/get/{"User":{},"[]":{"name@":"User%252Fname","Moment":{}}}) - 对象关键词,可自定义 | "@key":Object,@key为 Table:{} 中{}内的关键词,Object的类型由@key指定

① "@combine":"key0 \| (key1 & (key2 \| !key3))...",条件组合方式,最终按
(其它key条件 AND 连接) AND (key0条件 OR (key1条件 AND (key2条件 OR (NOT key3条件))))
这种方式连接,其中 "其它key" 是指与 @combine 在同一对象,且未被它声明的条件 key,默认都是 & 连接。注意不要缺少或多余任何一个空格。

② "@column":"column;function(arg)...",返回字段

③ "@order":"column0+,column1-...",排序方式

④ "@group":"column0,column1...",分组方式。如果@column里声明了Table的id,则id也必须在@group中声明;其它情况下必须满足至少一个条件:
1.分组的key在@column里声明
2.Table主键在@group中声明

⑤ "@having":"function0(...)?value0;function1(...)?value1;function2(...)?value2..." // OR 连接,或
"@having&":"function0(...)?value0;function1(...)?value1;function2(...)?value2..." // AND 连接,或
"@having":{
   "h0":"function0(...)?value0",
   "h1":function1(...)?value1",
   "h2":function2(...)?value2...",
   "@combine":"h0 & (h1 \| !h2)" // 任意组合,非必传
}
SQL函数条件,一般和@group一起用,函数一般在@column里声明

⑥ "@schema":"sys",集合空间(数据库名/模式),非默认的值可通过它来指定,可以在最外层作为全局默认配置

⑦ "@database":"POSTGRESQL",数据库类型,非默认的值可通过它来指定,可以在最外层作为全局默认配置

⑧ "@datasource":"DRUID",跨数据源,非默认的值可通过它来指定,可以在最外层作为全局默认配置

⑨ "@json":"key0,key1...",转为 JSON 格式返回,符合 JSONObject 则转为 {...},符合 JSONArray 则转为 \[...]

⑩ "@role":"OWNER",来访角色,包括
UNKNOWN,LOGIN,CONTACT,CIRCLE,OWNER,ADMIN,
可以在最外层作为全局默认配置,
可自定义其它角色并重写 Verifier.verify 等相关方法来自定义校验

⑪ "@explain":true,性能分析,可以在最外层作为全局默认配置

⑫ "@raw":"key0,key1...",其中 key0, key1 都对应有键值对
"key0":"SQL片段或SQL片段的别名",
"key1":"SQL片段或SQL片段的别名"
自定义原始SQL片段,可扩展嵌套SQL函数等复杂语句,必须是后端已配置的,只有其它功能符都做不到才考虑,谨慎使用,注意防SQL注入

⑬ "@otherKey":Object,自定义关键词,名称和以上系统关键词不一样,且原样返回上传的值 | ① 搜索name或tag任何一个字段包含字符a的User列表:
["name~":"a",
"tag~":"a",
"@combine":"name~ \| tag~"](http://apijson.cn:8080/get/{"User[]":{"count":10,"User":{"@column":"id,name,tag","name~":"a","tag~":"a","@combine":"name~%20%7C%20tag~"}}})
对应SQL是`name REGEXP 'a' OR tag REGEXP 'a'`

② 只查询id,sex,name这几列并且请求结果也按照这个顺序:
["@column":"id,sex,name"](http://apijson.cn:8080/get/{"User":{"@column":"id,sex,name","id":38710}})
对应SQL是`SELECT id,sex,name`

③ 查询按 name降序、id默认顺序 排序的User数组:
["@order":"name-,id"](http://apijson.cn:8080/get/{"[]":{"count":10,"User":{"@column":"name,id","@order":"name-,id"}}})
对应SQL是`ORDER BY name DESC,id`

④ 查询按userId分组的Moment数组:
["@group":"userId,id"](http://apijson.cn:8080/get/{"[]":{"count":10,"Moment":%7B"@column":"userId,id","@group":"userId,id"}}})
对应SQL是`GROUP BY userId,id`

⑤ 查询 按userId分组、id最大值>=100 的Moment数组:
["@column":"userId;max(id)",
"@group":"userId",
"@having":"max(id)>=100"](http://apijson.cn:8080/get/{"[]":{"count":10,"Moment":{"@column":"userId%253Bmax(id)","@group":"userId","@having":"max(id)>=100"}}})
对应SQL是`SELECT userId,max(id) ... GROUP BY userId HAVING max(id)>=100`
还可以指定函数返回名:
["@column":"userId;max(id):maxId",
"@group":"userId",
"@having":"(maxId)>=100"](http://apijson.cn:8080/get/{"[]":{"count":10,"Moment":{"@column":"userId%253Bmax(id):maxId","@group":"userId","@having":"(maxId)>=100"}}})
对应SQL是`SELECT userId,max(id) AS maxId ... GROUP BY userId HAVING (maxId)>=100`

⑥ 查询 sys 内的 User 表:
["@schema":"sys"](http://apijson.cn:8080/get/{"User":{"@schema":"sys"}})
对应SQL是`FROM sys.User`

⑦ 查询 PostgreSQL 数据库的 User 表:
["@database":"POSTGRESQL"](http://apijson.cn:8080/get/{"User":{"@database":"POSTGRESQL","@explain":true}})

⑧ 使用 Druid 连接池查询 User 表:
["@datasource":"DRUID"](http://apijson.cn:8080/get/{"User":{"@datasource":"DRUID"}})

⑨ 将 VARCHAR 字符串字段 get 转为 JSONArray 返回:
["@json":"get"](http://apijson.cn:8080/get/{"Access":{"@json":"get"}})

⑩ 查询当前用户的动态:
["@role":"OWNER"](http://apijson.cn:8080/get/{"[]":{"Moment":{"@role":"OWNER"}}})

⑪ 开启性能分析:
["@explain":true](http://apijson.cn:8080/get/{"[]":{"Moment":{"@explain":true}}})
对应SQL是`EXPLAIN`

⑫ 统计最近一周偶数userId的数量
["@column":"date;left(date,10):day;sum(if(userId%2=0,1,0))",
"@group":"day",
"@having":"to_days(now())-to_days(\`date\`)<=7",
"@raw":"@column,@having"](http://apijson.cn:8080/get/{"[]":{"Moment":{"@column":"date%3bleft(date,10):day%3bsum(if(userId%252=0,1,0))","@group":"day","@having":"to_days(now())-to_days(\`date\`)<=7","@raw":"@column,@having"}}})
对应SQL是``SELECT date, left(date,10) AS day, sum(if(userId%2=0,1,0)) ... GROUP BY day HAVING to_days(now())-to_days(`date`)<=7``

⑬ 从pictureList获取第0张图片:
["@position":0, //自定义关键词
"firstPicture()":"getFromArray(pictureList,@position)"](http://apijson.cn:8080/get/{"User":{"id":38710,"@position":0,"firstPicture()":"getFromArray(pictureList,@position)"}}) - 全局关键词 | 为最外层对象 {} 内的关键词。其中 @database,@schema, @datasource, @role, @explain 基本同对象关键词,见上方说明,区别是全局关键词会每个表对象中没有时自动放入,作为默认值。

① "tag":String,后面的 tag 是非 GET、HEAD 请求中匹配请求的 JSON 结构的标识,一般是要查询的 Table 的名称或该名称对应的数组 Table[] 或 Table:[],由后端 Request 表中指定。

② "version":Integer,接口版本,version 不传、为 null 或 <=0 都会使用最高版本,传了其它有效值则会使用最接近它的最低版本,由后端 Request 表中指定。

③ "format":Boolean,格式化返回 Response JSON 的 key,一般是将 TableName 转为 tableName, TableName[] 转为 tableNameList, Table:alias 转为 alias, TableName-key[] 转为 tableNameKeyList 等小驼峰格式。 | ① 查隐私信息:
[{"tag":"Privacy","Privacy":{"id":82001}}](http://apijson.cn/api?url=http%3A%2F%2Fapijson.cn%3A8080%2Fgets&type=JSON&json={%22tag%22:%22Privacy%22,%22Privacy%22:{%22id%22:82001}})

② 使用第 1 版接口查隐私信息:
[{"version":1,"tag":"Privacy","Privacy":{"id":82001}}](http://apijson.cn/api?url=http%3A%2F%2Fapijson.cn%3A8080%2Fgets&type=JSON&json={%22version%22:1,%22tag%22:%22Privacy%22,%22Privacy%22:{%22id%22:82001}})

③ 格式化朋友圈接口返回 JSON 中的 key:
[{
   "format":true,
   "[]":{
     "page":0,
     "count":3,
     "Moment":{},
     "User":{
       "id@":"/Moment/userId"
     },
     "Comment[]":{
       "count":3,
       "Comment":{
         "momentId@":"[]/Moment/id"
       }
     }
   }
}](http://apijson.cn:8080/get/{"format":true,"[]":{"page":0,"count":3,"Moment":{},"User":{"id@":"%252FMoment%252FuserId"},"Comment[]":{"count":3,"Comment":{"momentId@":"[]%252FMoment%252Fid"}}}}) + 比较运算 | >, <, >=, <= 比较运算符,用于
① 提供 "id{}":"<=90000" 这种条件范围的简化写法

② 实现子查询相关比较运算

不支持 "key=":Object 和 "key!=":Object 这两种写法,直接用更简单的 "key":Object 和 "key!":Object 替代。 | ① ["id<=":90000](http://apijson.cn:8080/get/{"[]":{"User":{"id<=":90000}}}),对应 SQL 是`id<=90000`,查询符合id<=90000的一个User数组

② ["id>@":{
   "from":"Comment",
   "Comment":{
      "@column":"min(userId)"
   }
}](http://apijson.cn:8080/get/{"User":{"id>@":{"from":"Comment","Comment":{"@column":"min(userId)"}}}})
WHERE id>(SELECT min(userId) FROM Comment) + 逻辑运算 | &, \|, ! 逻辑运算符,对应数据库 SQL 中的 AND, OR, NOT。
横或纵与:同一键值对的值内条件默认 \| 或连接,可以在 key 后加逻辑运算符来具体指定;不同键值对的条件默认 & 与连接,可以用下面说明的对象关键词 @combine 来具体指定。

① & 可用于 "key&{}":"条件"等

② \| 可用于 "key\|{}":"条件", "key\|{}":[]等,一般可省略

③ ! 可单独使用,如 "key!":Object,也可像 &,\| 一样配合其他功能符使用
"key!":null 无效,null 值会导致整个键值对被忽略解析,可以用 "key{}":"!=null" 替代,
"key":null 同理,用 "key{}":"=null" 替代。 | ① ["id&{}":">80000,<=90000"](http://apijson.cn:8080/head/{"User":{"id&{}":">80000,<=90000"}}),对应SQL是`id>80000 AND id<=90000`,即id满足id>80000 & id<=90000

② ["id\|{}":">90000,<=80000"](http://apijson.cn:8080/head/{"User":{"id\|{}":">90000,<=80000"}}),同 "id{}":">90000,<=80000",对应 SQL 是`id>90000 OR id<=80000`,即 id 满足 id>90000 \| id<=80000

③ ["id!{}":[82001,38710]](http://apijson.cn:8080/head/{"User":{"id!{}":[82001,38710]}}),对应 SQL 是`id NOT IN(82001,38710)`,即 id 满足 ! (id=82001 \| id=38710),可过滤黑名单的消息 + 数组关键词,可自定义 | "key":Object,key为 "[]":{} 中 {} 内的关键词,Object 的类型由 key 指定

① "count":5,查询数量,0 表示最大值,默认值为 10,默认最大值为 100

② "page":1,查询页码,从 0 开始,默认值为 0,默认最大值为 100,一般和 count 一起用

③ "query":2,查询内容
0-对象,1-总数和分页详情,2-数据、总数和分页详情
总数关键词为 total,分页详情关键词为 info,
它们都和 query 同级,通过引用赋值得到自定义 key:value 键值对,不传则返回默认键值对,例如
"total@":"/[]/total", "info@":"/[]/info"
这里query及total仅为GET类型的请求提供方便,
一般可直接用HEAD类型的请求获取总数

④ "join":"&/Table0,\"join":{
   "&/Table0":{}, // 支持 ON 多个字段关联,
   "\      "key0":value0, // 其它ON条件
     "key2":value2,
     ...
     "@combine":"...", // 其它ON条件的组合方式
     "@column":"...", // 外层 SELECT
     "@group":"...", // 外层 GROUP BY
     "@having":"..." // 外层 HAVING
   }
}
多表连接方式:
"@" - APP JOIN
"\<" - LEFT JOIN
">" - RIGHT JOIN
"&" - INNER JOIN
"\|" - FULL JOIN
"!" - OUTER JOIN
"*" - CROSS JOIN
"^" - SIDE JOIN
"(" - ANTI JOIN
")" - FOREIGN JOIN
其中 @ APP JOIN 为应用层连表,会从已查出的主表里取得所有副表 key@ 关联的主表内的 refKey 作为一个数组 refKeys: [value0, value1...],然后把原来副表 count 次查询 key=$refKey 的 SQL 用 key IN($refKeys) 的方式合并为一条 SQL 来优化性能;
其它 JOIN 都是 SQL JOIN,具体功能和 MySQL,PostgreSQL 等数据库的 JOIN 一一对应
`"join":"`"MainTable":{},`
`"ViceTable":{"key@":"/MainTable/refKey"}`
会对应生成
`MainTable LEFT JOIN ViceTable`
`ON ViceTable.key=MainTable.refKey` AND 其它ON条件
除了 = 等价关联,也支持 ! 不等关联、\> \< \>= \<= 等比较关联和 $ ~ {} <> 等其它复杂关联方式

⑤ "otherKey":Object,自定义关键词,名称和以上系统关键词不一样,且原样返回上传的值 | ① 查询User数组,最多5个:
["count":5](http://apijson.cn:8080/get/{"[]":{"count":5,"User":{}}})
对应 SQL 是`LIMIT 5`

② 查询第3页的User数组,每页5个:
["count":5,
"page":3](http://apijson.cn:8080/get/{"[]":{"count":5,"page":3,"User":{}}})
对应 SQL 是`LIMIT 5 OFFSET 15`

③ 查询User数组和对应的User总数:
["[]":{
   "query":2,
   "User":{}
},
"total@":"/[]/total", // 可省略
"info@":"/[]/info" // 可省略](http://apijson.cn:8080/get/{"[]":{"query":2,"count":5,"User":{}},"total@":"%252F[]%252Ftotal","info@":"%252F[]%252Finfo"})
返回的数据中,总数及分页详情结构为:
"total":139, // 总数
"info":{ // 分页详情
   "total":139, // 总数
   "count":5, // 每页数量
   "page":0, // 当前页码
   "max":27, // 最大页码
   "more":true, // 是否还有更多
   "first":true, // 是否为首页
   "last":false // 是否为尾页
}

④ Moment INNER JOIN User LEFT JOIN Comment:
["[]":{
   "join":"&/User/id@,\    "Moment":{
     "@group":"id" // 主副表不是一对一,要去除重复数据
   },
   "User":{
     "name~":"t",
     "id@":"/Moment/userId"
   },
   "Comment":{
     "momentId@":"/Moment/id"
   }
}](http://apijson.cn/api/?type=JSON&url=http://apijson.cn:8080/get&json=%7B%22%5B%5D%22:%7B%22count%22:5,%22join%22:%22%26%2FUser%2Fid@,%3C%2FComment%22,%22Moment%22:%7B%22@column%22:%22id,userId,content%22,%22@group%22:%22id%22%7D,%22User%22:%7B%22name~%22:%22t%22,%22id@%22:%22%2FMoment%2FuserId%22,%22@column%22:%22id,name,head%22%7D,%22Comment%22:%7B%22momentId@%22:%22%2FMoment%2Fid%22,%22@column%22:%22id,momentId,content%22%7D%7D%7D)

⑤ 每一层都加当前用户名:
["User":{},
"[]":{
   "name@":"User/name", // 自定义关键词
   "Moment":{}
}](http://apijson.cn:8080/get/{"User":{},"[]":{"name@":"User%252Fname","Moment":{}}}) + 对象关键词,可自定义 | "@key":Object,@key 为 Table:{} 中 {} 内的关键词,Object 的类型由 @key 指定

① "@combine":"key0 \| (key1 & (key2 \| !key3))...",条件组合方式,最终按
(其它key条件 AND 连接) AND (key0条件 OR (key1条件 AND (key2条件 OR (NOT key3条件))))
这种方式连接,其中 "其它key" 是指与 @combine 在同一对象,且未被它声明的条件 key,默认都是 & 连接。注意不要缺少或多余任何一个空格。

② "@column":"column;function(arg)...",返回字段

③ "@order":"column0+,column1-...",排序方式

④ "@group":"column0,column1...",分组方式。如果 @column 里声明了 Table 的 id,则 id 也必须在 @group 中声明;其它情况下必须满足至少一个条件:
1.分组的 key 在 @column 里声明
2.Table 主键在 @group 中声明

⑤ "@having":"function0(...)?value0;function1(...)?value1;function2(...)?value2..." // OR 连接,或
"@having&":"function0(...)?value0;function1(...)?value1;function2(...)?value2..." // AND 连接,或
"@having":{
   "h0":"function0(...)?value0",
   "h1":function1(...)?value1",
   "h2":function2(...)?value2...",
   "@combine":"h0 & (h1 \| !h2)" // 任意组合,非必传
}
SQL 函数条件,一般和 @group 一起用,函数一般在 @column 里声明

⑥ "@schema":"sys",集合空间(数据库名/模式),非默认的值可通过它来指定,可以在最外层作为全局默认配置

⑦ "@database":"POSTGRESQL",数据库类型,非默认的值可通过它来指定,可以在最外层作为全局默认配置

⑧ "@datasource":"DRUID",跨数据源,非默认的值可通过它来指定,可以在最外层作为全局默认配置

⑨ "@json":"key0,key1...",转为 JSON 格式返回,符合 JSONObject 则转为 {...},符合 JSONArray 则转为 \[...]

⑩ "@role":"OWNER",来访角色,包括
UNKNOWN,LOGIN,CONTACT,CIRCLE,OWNER,ADMIN,
可以在最外层作为全局默认配置,
可自定义其它角色并重写 Verifier.verify 等相关方法来自定义校验

⑪ "@explain":true,性能分析,可以在最外层作为全局默认配置

⑫ "@raw":"key0,key1...",其中 key0, key1 都对应有键值对
"key0":"SQL片段或SQL片段的别名",
"key1":"SQL片段或SQL片段的别名"
自定义原始SQL片段,可扩展嵌套SQL函数等复杂语句,必须是后端已配置的,只有其它功能符都做不到才考虑,谨慎使用,注意防 SQL 注入

⑬ "@null":"key1,key2...",空值键值对,自动插入 key1:null, key2:null ... 并作为有效键值对执行,作为条件时对应 SQL 是 `WHERE tag IS NULL`,作为值时对应 SQL 是 `SET tag = NULL`

⑭ "@otherKey":Object,自定义关键词,名称和以上系统关键词不一样,且原样返回上传的值 | ① 搜索 name 或 tag 任何一个字段包含字符 a 的 User 列表:
["name~":"a",
"tag~":"a",
"@combine":"name~ \| tag~"](http://apijson.cn:8080/get/{"User[]":{"count":10,"User":{"@column":"id,name,tag","name~":"a","tag~":"a","@combine":"name~%20%7C%20tag~"}}})
对应SQL是`name REGEXP 'a' OR tag REGEXP 'a'`

② 只查询 id,sex,name 这几列并且请求结果也按照这个顺序:
["@column":"id,sex,name"](http://apijson.cn:8080/get/{"User":{"@column":"id,sex,name","id":38710}})
对应 SQL 是`SELECT id,sex,name`

③ 查询按 name 降序、id 默认顺序 排序的 User 数组:
["@order":"name-,id"](http://apijson.cn:8080/get/{"[]":{"count":10,"User":{"@column":"name,id","@order":"name-,id"}}})
对应 SQL 是`ORDER BY name DESC,id`

④ 查询按 userId 分组的 Moment 数组:
["@group":"userId,id"](http://apijson.cn:8080/get/{"[]":{"count":10,"Moment":%7B"@column":"userId,id","@group":"userId,id"}}})
对应 SQL 是`GROUP BY userId,id`

⑤ 查询 按 userId 分组、id 最大值>=100 的 Moment 数组:
["@column":"userId;max(id)",
"@group":"userId",
"@having":"max(id)>=100"](http://apijson.cn:8080/get/{"[]":{"count":10,"Moment":{"@column":"userId%253Bmax(id)","@group":"userId","@having":"max(id)>=100"}}})
对应 SQL 是`SELECT userId,max(id) ... GROUP BY userId HAVING max(id)>=100`
还可以指定函数返回名:
["@column":"userId;max(id):maxId",
"@group":"userId",
"@having":"(maxId)>=100"](http://apijson.cn:8080/get/{"[]":{"count":10,"Moment":{"@column":"userId%253Bmax(id):maxId","@group":"userId","@having":"(maxId)>=100"}}})
对应 SQL 是`SELECT userId,max(id) AS maxId ... GROUP BY userId HAVING (maxId)>=100`

⑥ 查询 sys 内的 User 表:
["@schema":"sys"](http://apijson.cn:8080/get/{"User":{"@schema":"sys"}})
对应 SQL 是`FROM sys.User`

⑦ 查询 PostgreSQL 数据库的 User 表:
["@database":"POSTGRESQL"](http://apijson.cn:8080/get/{"User":{"@database":"POSTGRESQL","@explain":true}})

⑧ 使用 Druid 连接池查询 User 表:
["@datasource":"DRUID"](http://apijson.cn:8080/get/{"User":{"@datasource":"DRUID"}})

⑨ 将 VARCHAR 字符串字段 get 转为 JSONArray 返回:
["@json":"get"](http://apijson.cn:8080/get/{"Access":{"@json":"get"}})

⑩ 查询当前用户的动态:
["@role":"OWNER"](http://apijson.cn:8080/get/{"[]":{"Moment":{"@role":"OWNER"}}})

⑪ 开启性能分析:
["@explain":true](http://apijson.cn:8080/get/{"[]":{"Moment":{"@explain":true}}})
对应 SQL 是`EXPLAIN`

⑫ 统计最近一周偶数 userId 的数量
["@column":"date;left(date,10):day;sum(if(userId%2=0,1,0))",
"@group":"day",
"@having":"to_days(now())-to_days(\`date\`)<=7",
"@raw":"@column,@having"](http://apijson.cn:8080/get/{"[]":{"Moment":{"@column":"date%3bleft(date,10):day%3bsum(if(userId%252=0,1,0))","@group":"day","@having":"to_days(now())-to_days(\`date\`)<=7","@raw":"@column,@having"}}})
对应 SQL 是``SELECT date, left(date,10) AS day, sum(if(userId%2=0,1,0)) ... GROUP BY day HAVING to_days(now())-to_days(`date`)<=7``

⑬ 把用户的标签设置为空
["@null":"tag"](http://apijson.cn/api/?type=JSON&url=http://apijson.cn:8080/put/User&json={%22id%22:82001,%22@null%22:%22tag%22,%22@explain%22:true})

⑭ 从pictureList 获取第 0 张图片:
["@position":0, // 自定义关键词
"firstPicture()":"getFromArray(pictureList,@position)"](http://apijson.cn:8080/get/{"User":{"id":38710,"@position":0,"firstPicture()":"getFromArray(pictureList,@position)"}}) + 全局关键词 | 为最外层对象 {} 内的关键词。其中 @database,@schema, @datasource, @role, @explain 基本同对象关键词,见上方说明,区别是全局关键词会每个表对象中没有时自动放入,作为默认值。

① "tag":"Table",后面的 tag 是非 GET、HEAD 请求中匹配请求的 JSON 结构的标识,一般是要查询的 Table 的名称或该名称对应的数组 Table[] 或 Table:[],由后端 Request 表中指定。

② "version":1,接口版本,version 不传、为 null 或 <=0 都会使用最高版本,传了其它有效值则会使用最接近它的最低版本,由后端 Request 表中指定。

③ "format":true,格式化返回 Response JSON 的 key,一般是将 TableName 转为 tableName, TableName[] 转为 tableNameList, Table:alias 转为 alias, TableName-key[] 转为 tableNameKeyList 等小驼峰格式。 | ① 查隐私信息:
[{"tag":"Privacy","Privacy":{"id":82001}}](http://apijson.cn/api?url=http%3A%2F%2Fapijson.cn%3A8080%2Fgets&type=JSON&json={%22tag%22:%22Privacy%22,%22Privacy%22:{%22id%22:82001}})

② 使用第 1 版接口查隐私信息:
[{"version":1,"tag":"Privacy","Privacy":{"id":82001}}](http://apijson.cn/api?url=http%3A%2F%2Fapijson.cn%3A8080%2Fgets&type=JSON&json={%22version%22:1,%22tag%22:%22Privacy%22,%22Privacy%22:{%22id%22:82001}})

③ 格式化朋友圈接口返回 JSON 中的 key:
[{
   "format":true,
   "[]":{
     "page":0,
     "count":3,
     "Moment":{},
     "User":{
       "id@":"/Moment/userId"
     },
     "Comment[]":{
       "count":3,
       "Comment":{
         "momentId@":"[]/Moment/id"
       }
     }
   }
}](http://apijson.cn:8080/get/{"format":true,"[]":{"page":0,"count":3,"Moment":{},"User":{"id@":"%252FMoment%252FuserId"},"Comment[]":{"count":3,"Comment":{"momentId@":"[]%252FMoment%252Fid"}}}})
diff --git a/README-English.md b/README-English.md index 3cd37214e..9329faf0e 100644 --- a/README-English.md +++ b/README-English.md @@ -7,7 +7,7 @@ This source code is licensed under the Apache License Version 2.0
-

🏆 Tencent Top 8 Open Source Project, Achieved 5 Awards Inside & Outside Tencent 🚀
A JSON Transmission Protocol and an ORM Library for providing APIs and Documents without writing any code.

+

🏆 Tencent Top 6 Open Source Project, Achieved 5 Awards Inside & Outside Tencent 🚀
A JSON Transmission Protocol and an ORM Library for providing APIs and Documents without writing any code.

 中文版  diff --git a/README.md b/README.md index 76721b69a..a5f474067 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This source code is licensed under the Apache License Version 2.0
APIJSON -

🏆 零代码、全功能、强安全 ORM 库 🚀
后端接口和文档零代码,前端(客户端) 定制返回 JSON 的数据和结构

+

🏆 实时 零代码、全功能、强安全 ORM 库 🚀
后端接口和文档零代码,前端(客户端) 定制返回 JSON 的数据和结构

English @@ -20,23 +20,35 @@ This source code is licensed under the Apache License Version 2.0
  + + + + + + + - - + + + + + - - - - - - + + + + + + + +

@@ -52,6 +64,7 @@ This source code is licensed under the Apache License Version 2.0
    +  

@@ -177,8 +190,8 @@ https://github.com/Tencent/APIJSON/wiki * **解决十大痛点** (可帮前后端开发大幅提振开发效率、强力杜绝联调扯皮、巧妙规避文档缺陷、非常节省流量带宽) * **开发提速很大** (CRUD 零代码热更新全自动,APIJSONBoot 对比 SSM、SSH 等保守估计可提速 20 倍以上) * **腾讯官方开源** (使用 GitHub、Gitee、工蜂 等平台的官方账号开源,微信公众号、腾讯云+社区 等官方公告) -* **社区影响力大** (GitHub 15.6K Star 在 400W Java 项目排名前 100,远超 FLAG, BAT 等国内外绝大部分开源项目) -* **各项荣誉成就** (腾讯内外 5 个奖项、腾讯开源前八、腾讯后端 Star 第一、GitHub Java 日周月榜大满贯 等) +* **社区影响力大** (GitHub 17K+ Star 在 400W Java 项目排名前 100,远超 FLAG, BAT 等国内外绝大部分开源项目) +* **各项荣誉成就** (腾讯内外 5 个奖项、腾讯开源前六、腾讯后端 Star 第一、Trending 日周月榜大满贯 等) * **多样用户案例** (腾讯内有互娱、音乐、微信、云与智慧,外部有华为、华能、百度、快手、中兴、圆通、传音等) * **适用场景广泛** (社交聊天、阅读资讯、影音娱乐、办公学习 等各种 App、网站、小程序、公众号 等非金融类项目) * **周边生态丰富** (Android, iOS, Web 等各种 Demo、继承 JSON 的海量生态、零代码 接口测试 和 单元测试 工具等) @@ -186,10 +199,10 @@ https://github.com/Tencent/APIJSON/wiki * **功能丰富强大** (增删改查、分页排序、分组聚合、各种条件、各种 JOIN、各种子查询、跨库连表 等零代码实现) * **使用安全简单** (自动增删改查、自动生成文档、自动管理版本、自动控制权限、自动校验参数、自动防 SQL 注入) * **灵活定制业务** (在后端编写 远程函数,可以拿到 session、version、当前 JSON 对象 等,然后自定义处理) -* **高质可靠代码** (代码严谨规范,商业分析软件源伞 Pinpoint 代码扫描报告平均每行代码 Bug 率低至 0.15%) +* **高质可靠代码** (代码严谨规范,蚂蚁集团源伞 Pinpoint 代码扫描分析报告平均每行代码 Bug 率低至 0.15%) * **兼容各种项目** (协议不限 HTTP,与其它库无冲突,对各类 Web 框架集成友好且提供 SpringBoot, JFinal 的示例) * **工程轻量小巧** (仅依赖 fastjson,Jar 仅 280KB,Java 文件仅 59 个共 13719 行代码,例如 APIJSONORM 4.3.1) -* **多年持续迭代** (自 2016 年起已连续维护近 7 年,50+ 个贡献者、90+ 次发版、3000+ 次提交,不断更新迭代中...) +* **多年持续迭代** (自 2016 年起已连续维护 8 年多,70+ 贡献者、100+ 发版、3000+ 提交,不断更新迭代中...) **按照一般互联网中小型项目情况可得出以下对比表格:** @@ -351,9 +364,13 @@ https://github.com/Tencent/APIJSON/issues/187 * [爱投斯智能技术(深圳)有限公司](http://www.aiotos.net) * [邻盛科技(武汉)有限公司](http://www.linksame.com) * [上海麦市信息科技有限公司](https://www.masscms.com) + * [上海翊丞互联网科技有限公司](http://www.renrencjl.com/home) + * [上海直真君智科技有限公司](http://www.zzjunzhi.com) + * [北明软件有限公司](https://www.bmsoft.com.cn/) + * [上海钰亿环保科技有限公司](#) ### 贡献者们 -主项目 APIJSON 的贡献者们(6 个腾讯工程师、1 个微软工程师、1 个阿里云工程师、1 个字节跳动工程师、1 个网易工程师、1 个 Zoom 工程师、1 个圆通工程师、1 个知乎基础研发架构师、1 个智联招聘工程师、1 个美国加州大学学生、3 个 SUSTech 学生等):
+主项目 APIJSON 的贡献者们(6 个腾讯工程师、1 个微软工程师、1 个阿里云工程师、1 个字节跳动工程师、1 个网易工程师、1 个 Zoom 工程师、1 个圆通工程师、1 个知乎基础研发架构师、1 个智联招聘工程师、gorm-plus 作者、1 个美国加州大学学生、3 个 SUSTech 学生等):
https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md

+ + + + + + + + + + +

@@ -456,10 +484,10 @@ https://search.gitee.com/?skin=rec&type=repository&q=apijson&sort=stars_count
-还有为 APIJSON 扫描代码贡献 Issue 的 [奇安信代码卫士](https://github.com/QiAnXinCodeSafe) 和 [源伞科技](https://www.sourcebrella.com) +还有为 APIJSON 扫描代码贡献 Issue 的 [蚂蚁集团源伞](https://www.sourcebrella.com) 和 [奇安信代码卫士](https://github.com/QiAnXinCodeSafe)
+ -

@@ -473,6 +501,8 @@ https://search.gitee.com/?skin=rec&type=repository&q=apijson&sort=stars_count image +根据开源指南针报告,APIJSON Java 版已经是国内顶级、国际一流的 Java 开源项目了 [#518](https://github.com/Tencent/APIJSON/issues/518)
+image ### 规划及路线图 新增功能、强化安全、提高性能、增强稳定、完善文档、丰富周边、推广使用
@@ -587,7 +617,11 @@ Issue/问卷 一般解答顺序:贡献者 > 帮助他人的用户 > 提供任 [APIJSON使用介绍](http://api.flyrise.cn:9099/docs/open-docs//1459) [MassCMS With APIJSON最佳实践](https://zhuanlan.zhihu.com/p/655826966) - + +[APIJSON语法使用,超详细](https://blog.csdn.net/qq_36565607/article/details/139167040) + +[wend看源码-ORM-APIJSON](https://itwend.blog.csdn.net/article/details/143980281) + ### 生态项目 [APIJSON-Demo](https://github.com/APIJSON/APIJSON-Demo) APIJSON 各种语言、各种框架 的 使用示例项目、上手文档、测试数据 SQL 文件 等 @@ -599,12 +633,22 @@ Issue/问卷 一般解答顺序:贡献者 > 帮助他人的用户 > 提供任 [apijson-column](https://github.com/APIJSON/apijson-column) APIJSON 的字段插件,支持 字段名映射 和 !key 反选字段 +[apijson-milvus](https://github.com/APIJSON/apijson-milvus) APIJSON 的 Milvus AI 向量数据库插件 + +[apijson-influxdb](https://github.com/APIJSON/apijson-influxdb) APIJSON 的 InfluxDB 物联网时序数据库插件 + +[apijson-mongodb](https://github.com/APIJSON/apijson-mongodb) APIJSON 的 MongoDB NoSQL 数据库插件 + +[apijson-cassandra](https://github.com/APIJSON/apijson-cassandra) APIJSON 的 Cassandra NoSQL 数据库插件 + [APIAuto](https://github.com/TommyLemon/APIAuto) 敏捷开发最强大易用的接口工具,机器学习零代码测试、生成代码与静态检查、生成文档与光标悬浮注释 -[UnitAuto](https://github.com/TommyLemon/UnitAuto) 机器学习零代码单元测试平台,零代码、全方位、自动化 测试 方法/函数 的正确性、可用性和性能 +[UnitAuto](https://github.com/TommyLemon/UnitAuto) 最先进、最省事、ROI 最高的单元测试,机器学习 零代码、全方位、自动化 测试 方法/函数,用户包含腾讯、快手、某 500 强巨头等 [SQLAuto](https://github.com/TommyLemon/SQLAuto) 智能零代码自动化测试 SQL 语句执行结果的数据库工具,一键批量生成参数组合、快速构造大量测试数据 +[UIGO](https://github.com/TommyLemon/UIGO) 📱 零代码快准稳 UI 智能录制回放平台 🚀 自动兼容任意宽高比分辨率屏幕、自动精准等待网络请求,录制回放快、准、稳! + [apijson-doc](https://github.com/vincentCheng/apijson-doc) APIJSON 官方文档,提供排版清晰、搜索方便的文档内容展示,包括设计规范、图文教程等 [APIJSONdocs](https://github.com/ruoranw/APIJSONdocs) APIJSON 英文文档,提供排版清晰的文档内容展示,包括详细介绍、设计规范、使用方式等 @@ -680,7 +724,14 @@ Issue/问卷 一般解答顺序:贡献者 > 帮助他人的用户 > 提供任 [quick-boot](https://github.com/csx-bill/quick-boot) 基于 Spring Cloud 2022、Spring Boot 3、AMIS 和 APIJSON 的低代码系统。 [apijson-query-spring-boot-starter](https://gitee.com/mingbaobaba/apijson-query-spring-boot-starter) 一个快速构建 APIJSON 查询条件的插件 - + +[apijson-builder](https://github.com/yeli19950109/apijson-builder) 简单包装 APIJSON,相比直接构造查询 JSON 更好记,ts 编写,调整了一些参数和使用方式 + +[lanmuc](https://gitee.com/element-admin/lanmuc) 后端低代码生产接口的平台,兼容配置式接口和编写式接口,可做到快速生产接口,上线项目 + +[review_plan](https://gitee.com/PPXcodeTry/review_plan) 复习提醒Web版(Java技术练习项目) + +[apijson-nutz](https://github.com/vincent109/apijson-nutz) APIJSON + Nutz 框架 + NutzBoot 的 Demo 感谢热心的作者们的贡献,点 ⭐Star 支持下他们吧~