获取连接增加datasource参数 && 回包里移除@Datasource

iceewei · iceewei · commit f4e5ea487eb6 · 2021-06-29T11:06:21.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -70,6 +70,7 @@
 import apijson.orm.model.SysTable;
 import apijson.orm.model.Table;
 import apijson.orm.model.TestRecord;
+import org.omg.PortableServer.REQUEST_PROCESSING_POLICY_ID;
 
 /**config sql for JSON Request
  * @author Lemon
@@ -2965,6 +2966,7 @@ else if (id 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_SCHEMA);
 			request.remove(KEY_COMBINE);
@@ -3217,6 +3219,7 @@ else if (whereList != null && whereList.contains(key)) {
 			request.put(KEY_ROLE, role);
 			request.put(KEY_EXPLAIN, explain);
 			request.put(KEY_CACHE, cache);
+			request.put(KEY_DATASOURCE, datasource);
 			request.put(KEY_SCHEMA, schema);
 			request.put(KEY_COMBINE, combine);
 			request.put(KEY_FROM, from);
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
@@ -732,7 +732,7 @@ public PreparedStatement setArgument(@NotNull SQLConfig config, @NotNull Prepare
 	@NotNull
 	@Override
 	public Connection getConnection(@NotNull SQLConfig config) throws Exception {
-		String connectionKey = config.getDatasource() + "-" + config.getDatabase()
+		String connectionKey = config.getDatasource() + "-" + config.getDatabase();
 		connection = connectionMap.get(connectionKey);
 		if (connection == null || connection.isClosed()) {
 			Log.i(TAG, "select  connection " + (connection == null ? " = null" : ("isClosed = " + connection.isClosed()))) ;
