Server: 完善 Oracle 和 SQL Server 的正则匹配、包含选项、子查询 等功能

Author: TommyLemon

APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/SQL.java

@@ -179,30 +179,39 @@ public static String subString(String s, int start, int end) {
 
 	/**
 	 * @param s
-	 * @param c -> 'c'
-	 * @return "instr(" + s + ", '" + c + "')"
+	 * @param c
+	 * @return "instr(" + s + ", " + c + ")"
 	 */
 	public static String indexOf(String s, String c) {
-		return "instr(" + s + ", '" + c + "')";
+		return "instr(" + s + ", " + c + ")";
 	}
 
 	/**
 	 * @param s
-	 * @param c1 -> 'c1'
-	 * @param c2 -> 'c2'
-	 * @return "replace(" + s + ", '" + c1 + "', '" + c2 + "')"
+	 * @param c1
+	 * @param c2
+	 * @return "replace(" + s + ", " + c1 + ", " + c2 + ")"
 	 */
 	public static String replace(String s, String c1, String c2) {
-		return "replace(" + s + ", '" + c1 + "', '" + c2 + "')";
+		return "replace(" + s + ", " + c1 + ", " + c2 + ")";
+	}
+	
+	/**
+	 * @param s1
+	 * @param s2
+	 * @return "concat(" + s1 + ", " + s2 + ")"
+	 */
+	public static String concat(String s1, String s2) {
+		return "concat(" + s1 + ", " + s2 + ")";
 	}
 
 	/**
 	 * @param s1
-	 * @param s2 -> 's2'
-	 * @return "strcmp(" + s1 + ", '" + s2 + "')"
+	 * @param s2
+	 * @return "strcmp(" + s1 + ", " + s2 + ")"
 	 */
 	public static String equals(String s1, String s2) {
-		return "strcmp(" + s1 + ", '" + s2 + "')";
+		return "strcmp(" + s1 + ", " + s2 + ")";
 	}
 
 	/**

APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java

@@ -600,10 +600,10 @@ public String getOrderString(boolean hasPrefix) {
 
 		String order = StringUtil.getTrimedString(getOrder());
 
-		if (isOracle() || isSQLServer()) { // Oracle 和 SQL Server 的 OFFSET 必须加 ORDER BY
+		if (getCount() > 0 && (isOracle() || isSQLServer())) { // Oracle 和 SQL Server 的 OFFSET 必须加 ORDER BY
 
 			//			String[] ss = StringUtil.split(order);
-			if (StringUtil.isEmpty(order, true)) {
+			if (StringUtil.isEmpty(order, true)) {  //SQL Server 子查询内必须指定 OFFSET 才能用 ORDER BY
 				String idKey = getIdKey();
 				if (StringUtil.isEmpty(idKey, true)) {
 					idKey = "id"; //ORDER BY NULL 不行，SQL Server 会报错，必须要有排序，才能使用 OFFSET FETCH，如果没有 idKey，请求中指定 @order 即可
@@ -1657,6 +1657,9 @@ public String getRegExpString(String key, String value, boolean ignoreCase) {
 		if (isPostgreSQL()) {
 			return getKey(key) + " ~" + (ignoreCase ? "* " : " ") + getValue(value);
 		}
+		if (isOracle()) {
+			return "regexp_like(" + getKey(key) + ", " + getValue(value) + (ignoreCase ? ", 'i'" : ", 'c'") + ")";
+		}
 		return getKey(key) + " REGEXP " + (ignoreCase ? "" : "BINARY ") + getValue(value);
 	}
 	//~ regexp >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -1889,12 +1892,15 @@ public String getContainString(String key, Object[] childs, int type) throws Ill
 						throw new IllegalArgumentException(key + "<>:value 中value类型不能为JSON！");
 					}
 
+					condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR));
 					if (isPostgreSQL()) {
-						condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR))
-								+ getKey(key) + " @> " + getValue(newJSONArray(childs[i])); //operator does not exist: jsonb @> character varying  "[" + childs[i] + "]"); 
-					} else {
-						condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR))
-								+ "json_contains(" + getKey(key) + ", " + getValue(childs[i].toString()) + ")";
+						condition += (getKey(key) + " @> " + getValue(newJSONArray(childs[i]))); //operator does not exist: jsonb @> character varying  "[" + childs[i] + "]"); 
+					}
+					else if (isOracle()) {
+						condition += ("json_textcontains(" + getKey(key) + ", '$', " + getValue(childs[i].toString()) + ")");
+					}
+					else {
+						condition += ("json_contains(" + getKey(key) + ", " + getValue(childs[i].toString()) + ")");
 					}
 				}
 			}
@@ -2004,7 +2010,7 @@ public String getSetString(RequestMethod method, Map<String, Object> content, bo
 				value = content.get(key);
 				key = getRealKey(method, key, false, true, verifyName, quote);
 
-				setString += (isFirst ? "" : ", ") + (getKey(key) + "=" + (keyType == 1 ? getAddString(key, value) : (keyType == 2
+				setString += (isFirst ? "" : ", ") + (getKey(key) + " = " + (keyType == 1 ? getAddString(key, value) : (keyType == 2
 						? getRemoveString(key, value) : getValue(value)) ) );
 
 				isFirst = false;
@@ -2017,10 +2023,10 @@ public String getSetString(RequestMethod method, Map<String, Object> content, bo
 		return " SET " + setString;
 	}
 
-	/**SET key = CONCAT (key, 'value')
+	/**SET key = concat(key, 'value')
 	 * @param key
 	 * @param value
-	 * @return CONCAT (key, 'value')
+	 * @return concat(key, 'value')
 	 * @throws IllegalArgumentException
 	 */
 	@JSONField(serialize = false)
@@ -2029,7 +2035,7 @@ public String getAddString(String key, Object value) throws IllegalArgumentExcep
 			return getKey(key) + " + " + value;
 		}
 		if (value instanceof String) {
-			return " CONCAT (" + getKey(key) + ", " + getValue(value) + ") ";
+			return SQL.concat(getKey(key), (String) getValue(value));
 		}
 		throw new IllegalArgumentException(key + "+ 对应的值 " + value + " 不是Number,String,Array中的任何一种！");
 	}
@@ -2045,7 +2051,7 @@ public String getRemoveString(String key, Object value) throws IllegalArgumentEx
 			return getKey(key) + " - " + value;
 		}
 		if (value instanceof String) {
-			return SQL.replace(getKey(key), (String) getValue(value), "");// " replace(" + key + ", '" + value + "', '') ";
+			return SQL.replace(getKey(key), (String) getValue(value), "''");// " replace(" + key + ", '" + value + "', '') ";
 		}
 		throw new IllegalArgumentException(key + "- 对应的值 " + value + " 不是Number,String,Array中的任何一种！");
 	}

APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java

@@ -176,7 +176,7 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
 		Log.d(TAG, "\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
 				+ "\n已生成 " + generatedSQLCount + " 条 SQL"
 				+ "\nselect  startTime = " + startTime
-				+ "\n database = " + StringUtil.getString(config.getDatabase())
+				+ "\ndatabase = " + StringUtil.getString(config.getDatabase())
 				+ "; schema = " + StringUtil.getString(config.getSchema())
 				+ "; sql = \n" + sql
 				+ "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");