Skip to content

Commit 0615078

Browse files
TommyLemonTommyLemon
committed
FunctionsAndRaws 代码移回 AbstractSQLConfig 兼容现有用户代码；完成 PostgreSQL 的窗口函数；解决 PUT "blance+": 1 未加到 update set 导致报错；解决 @column 在 OVER, MATCH 等函数内部分字段解析出错以及可能的 SQL 注入
1 parent 532054a commit 0615078

4 files changed

Lines changed: 660 additions & 604 deletions

File tree

‎APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ public AbstractObjectParser parse(String name, boolean isReuse) throws Exception
224224
whereList = new ArrayList<String>(Arrays.asList(combine != null ? combine : new String[]{}));
225225
whereList.add(apijson.JSONRequest.KEY_ID);
226226
whereList.add(apijson.JSONRequest.KEY_ID_IN);
227+
// whereList.add(apijson.JSONRequest.KEY_USER_ID);
228+
// whereList.add(apijson.JSONRequest.KEY_USER_ID_IN);
227229
}
228230
//条件>>>>>>>>>>>>>>>>>>>
229231

@@ -261,8 +263,8 @@ else if ((method == POST || method == PUT) && value instanceof JSONArray
261263
&& JSONRequest.isTableArray(key)) { // JSONArray，批量新增或修改，往下一级提取
262264
onTableArrayParse(key, (JSONArray) value);
263265
}
264-
else if (method == PUT && value instanceof JSONArray && (whereList == null || whereList.contains(key) == false) && StringUtil.isName(key.replaceFirst("[+-]$", "")))
265-
{ // PUT JSONArray
266+
else if (method == PUT && value instanceof JSONArray && (whereList == null || whereList.contains(key) == false)
267+
&& StringUtil.isName(key.replaceFirst("[+-]$", ""))) { // PUT JSONArray
266268
onPUTArrayParse(key, (JSONArray) value);
267269
}
268270
else { // JSONArray或其它Object，直接填充

0 commit comments

Comments
 (0)