Server:解决包含选项 key<>:value 不兼容 PostgreSQL；Number或Boolean类型不用单引号包裹；完善默认数据库类型改为 PostgreSQL 的代码及注释

TommyLemon · TommyLemon · commit 44a2b6efa24e · 2019-02-17T12:01:00.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLConfig.java b/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLConfig.java
@@ -40,9 +40,11 @@ public class DemoSQLConfig extends AbstractSQLConfig {
 		TABLE_KEY_MAP.put(Privacy.class.getSimpleName(), "apijson_privacy");
 	}
 	
+	//取消注释后，默认的数据库类型会由 MySQL 改为 PostgreSQL
 //	@Override
 //	public String getDatabase() {
-//		return DATABASE_POSTGRESQL;
+//		String db = super.getDatabase();
+//		return db == null ? DATABASE_POSTGRESQL : db;
 //	}
 
 	@Override
diff --git a/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLExecutor.java b/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLExecutor.java
@@ -116,12 +116,12 @@ private PreparedStatement getStatement(@NotNull SQLConfig config) throws Excepti
 					else {
 						PGobject o = new PGobject();
 						o.setType("jsonb");
-						o.setValue(v.toString());
-						statement.setObject(i + 1, o); //PostgreSQL JDBC 不支持隐式类型转换 tinyint = varchar 报错
+						o.setValue(v == null ? null : v.toString());
+						statement.setObject(i + 1, o); //PostgreSQL 除了基本类型，其它的必须通过 PGobject 设置进去，否则 jsonb = varchar 等报错
 					}
 				}
 				else {
-					statement.setString(i + 1, v.toString()); //MySQL setObject 不支持 JSON 类型
+					statement.setString(i + 1, v == null ? null : v.toString()); //MySQL setObject 不支持 JSON 类型
 				}
 			}
 		}
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java
@@ -1227,7 +1227,7 @@ private Object getValue(@NotNull Object value) {
 			preparedValueList.add(value);
 			return "?";
 		}
-		return "'" + value + "'";
+		return value instanceof Number || value instanceof Boolean ? value :  "'" + value + "'";
 	}
 	@Override
 	public List<Object> getPreparedValueList() {
@@ -1588,13 +1588,10 @@ public String getContainString(String key, Object[] childs, int type) throws Ill
 					if (childs[i] instanceof JSON) {
 						throw new IllegalArgumentException(key + "<>:value 中value类型不能为JSON！");
 					}
-					if (childs[i] instanceof String) {
-						childs[i] = "\"" + childs[i] + "\"";
-					}
 					
 					if (DATABASE_POSTGRESQL.equalsIgnoreCase(getDatabase())) {
 						condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR))
-								+ getKey(key) + " @> " + getValue(childs[i]);
+								+ 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]) + ")";

Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,12 @@ private PreparedStatement getStatement(@NotNull SQLConfig config) throws Excepti`
`116`	`116`	`else {`
`117`	`117`	`PGobject o = new PGobject();`
`118`	`118`	`o.setType("jsonb");`
`119`		`- o.setValue(v.toString());`
`120`		`- statement.setObject(i + 1, o); //PostgreSQL JDBC 不支持隐式类型转换 tinyint = varchar 报错`
	`119`	`+ o.setValue(v == null ? null : v.toString());`
	`120`	`+ statement.setObject(i + 1, o); //PostgreSQL 除了基本类型，其它的必须通过 PGobject 设置进去，否则 jsonb = varchar 等报错`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`else {`
`124`		`- statement.setString(i + 1, v.toString()); //MySQL setObject 不支持 JSON 类型`
	`124`	`+ statement.setString(i + 1, v == null ? null : v.toString()); //MySQL setObject 不支持 JSON 类型`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`	`}`