Server:新增支持全局默认@database

TommyLemon · TommyLemon · commit e63c06685284 · 2018-08-26T17:45:33.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/DemoSQLExecutor.java b/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/DemoSQLExecutor.java
@@ -42,7 +42,7 @@ public class DemoSQLExecutor extends AbstractSQLExecutor {
 		} catch (ClassNotFoundException e) {
 			e.printStackTrace();
 		}
-		
+
 		try { //加载驱动程序
 			Class.forName("org.postgresql.Driver");
 			Log.d(TAG, "成功加载 PostgresSQL 驱动！");
@@ -65,6 +65,8 @@ public int executeUpdate(@NotNull SQLConfig config) throws Exception {
 	}
 
 
+	//TODO 根据不同数据库来分组存 connection 和 statement，例如 Map<database, connection>，
+	//	解决一次请求中有2个以上不同数据库类型导致后面的查询都用第一个的数据库类型
 	private Connection connection = null;
 	private PreparedStatement statement = null;
 	/**
@@ -76,7 +78,6 @@ private PreparedStatement getStatement(@NotNull SQLConfig config) throws Excepti
 		if (connection == null || connection.isClosed()) {
 			Log.i(TAG, "select  connection " + (connection == null ? " = null" : ("isClosed = " + connection.isClosed()))) ;
 
-			
 			if (DemoSQLConfig.DATABASE_POSTGRESQL.equalsIgnoreCase(config.getDatabase())) { //PostgreSQL 不允许 cross-database
 				connection = DriverManager.getConnection(config.getDBUri() + "/" + config.getSchema(), config.getDBAccount(), config.getDBPassword());
 			}
@@ -85,14 +86,14 @@ private PreparedStatement getStatement(@NotNull SQLConfig config) throws Excepti
 						+ config.getDBAccount() + "&password=" + config.getDBPassword());
 			}
 		}
-		
+
 		statement = connection.prepareStatement(config.getSQL(config.isPrepared())); //创建Statement对象
 		List<Object> valueList = config.isPrepared() ? config.getPreparedValueList() : null;
-		
+
 		if (valueList != null && valueList.isEmpty() == false) {
-			
+
 			for (int i = 0; i < valueList.size(); i++) {
-				
+
 				if (DemoSQLConfig.DATABASE_POSTGRESQL.equalsIgnoreCase(config.getDatabase())) {
 					statement.setObject(i + 1, valueList.get(i)); //PostgreSQL JDBC 不支持隐式类型转换 tinyint = varchar 报错
 				}
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java
@@ -131,6 +131,11 @@ public AbstractParser setGlobleRole(RequestRole globleRole) {
 		this.globleRole = globleRole;
 		return this;
 	}
+	protected String globleDatabase;
+	public AbstractParser setGlobleDatabase(String globleDatabase) {
+		this.globleDatabase = globleDatabase;
+		return this;
+	}
 
 	@Override
 	public boolean isNoVerify() {
@@ -257,6 +262,13 @@ public JSONObject parseResponse(JSONObject request) {
 				return extendErrorResult(requestObject, e);
 			}
 		}
+		
+		try {
+			setGlobleDatabase(requestObject.getString(JSONRequest.KEY_DATABASE));
+			requestObject.remove(JSONRequest.KEY_DATABASE);
+		} catch (Exception e) {
+			return extendErrorResult(requestObject, e);
+		}
 
 		final String requestString = JSON.toJSONString(request);//request传进去解析后已经变了
 
@@ -1096,6 +1108,11 @@ public synchronized JSONObject executeSQL(SQLConfig config) throws Exception {
 			}
 			verifier.verify(config);
 		}
+		
+		if (config.getDatabase() == null && globleDatabase != null) {
+			config.setDatabase(globleDatabase);
+		}
+		
 		return parseCorrectResponse(config.getTable(), sqlExecutor.execute(config));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,11 @@ public AbstractParser setGlobleRole(RequestRole globleRole) {`
`131`	`131`	`this.globleRole = globleRole;`
`132`	`132`	`return this;`
`133`	`133`	`}`
	`134`	`+ protected String globleDatabase;`
	`135`	`+ public AbstractParser setGlobleDatabase(String globleDatabase) {`
	`136`	`+ this.globleDatabase = globleDatabase;`
	`137`	`+ return this;`
	`138`	`+ }`
`134`	`139`
`135`	`140`	`@Override`
`136`	`141`	`public boolean isNoVerify() {`
`@@ -257,6 +262,13 @@ public JSONObject parseResponse(JSONObject request) {`
`257`	`262`	`return extendErrorResult(requestObject, e);`
`258`	`263`	`}`
`259`	`264`	`}`
	`265`	`+`
	`266`	`+ try {`
	`267`	`+ setGlobleDatabase(requestObject.getString(JSONRequest.KEY_DATABASE));`
	`268`	`+ requestObject.remove(JSONRequest.KEY_DATABASE);`
	`269`	`+ } catch (Exception e) {`
	`270`	`+ return extendErrorResult(requestObject, e);`
	`271`	`+ }`
`260`	`272`
`261`	`273`	`final String requestString = JSON.toJSONString(request);//request传进去解析后已经变了`
`262`	`274`
`@@ -1096,6 +1108,11 @@ public synchronized JSONObject executeSQL(SQLConfig config) throws Exception {`
`1096`	`1108`	`}`
`1097`	`1109`	`verifier.verify(config);`
`1098`	`1110`	`}`
	`1111`	`+`
	`1112`	`+ if (config.getDatabase() == null && globleDatabase != null) {`
	`1113`	`+ config.setDatabase(globleDatabase);`
	`1114`	`+ }`
	`1115`	`+`
`1099`	`1116`	`return parseCorrectResponse(config.getTable(), sqlExecutor.execute(config));`
`1100`	`1117`	`}`
`1101`	`1118`