Server:判断数据库类型时忽略大小写

TommyLemon · TommyLemon · commit 694810bac1d2 · 2018-08-26T17:26:54.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/DemoSQLConfig.java b/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/DemoSQLConfig.java
@@ -45,15 +45,15 @@ public class DemoSQLConfig extends AbstractSQLConfig {
 	@Override
 	public String getDBUri() {
 		//TODO 改成你自己的
-		return DATABASE_POSTGRESQL.equals(getDatabase()) ? "jdbc:postgresql://localhost:5432" : "jdbc:mysql://localhost:3306";
+		return DATABASE_POSTGRESQL.equalsIgnoreCase(getDatabase()) ? "jdbc:postgresql://localhost:5432" : "jdbc:mysql://localhost:3306";
 	}
 	@Override
 	public String getDBAccount() {
-		return DATABASE_POSTGRESQL.equals(getDatabase()) ? "postgres" : "root"; //TODO 改成你自己的
+		return DATABASE_POSTGRESQL.equalsIgnoreCase(getDatabase()) ? "postgres" : "root"; //TODO 改成你自己的
 	}
 	@Override
 	public String getDBPassword() {
-		return DATABASE_POSTGRESQL.equals(getDatabase()) ? null : "apijson"; //TODO 改成你自己的
+		return DATABASE_POSTGRESQL.equalsIgnoreCase(getDatabase()) ? null : "apijson"; //TODO 改成你自己的
 	}
 	@Override
 	public String getSchema() {
@@ -63,8 +63,8 @@ public String getSchema() {
 	
 	@JSONField(serialize = false)
 	@Override
-	public String getTablePath() {
-		return DATABASE_POSTGRESQL.equals(getDatabase()) ? getSQLTable() : super.getTablePath();
+	public String getTablePath() { //PostgreSQL 不允许 cross-database
+		return DATABASE_POSTGRESQL.equalsIgnoreCase(getDatabase()) ? getSQLTable() : super.getTablePath();
 	}
 	
 
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
@@ -77,7 +77,7 @@ private PreparedStatement getStatement(@NotNull SQLConfig config) throws Excepti
 			Log.i(TAG, "select  connection " + (connection == null ? " = null" : ("isClosed = " + connection.isClosed()))) ;
 
 			
-			if (DemoSQLConfig.DATABASE_POSTGRESQL.equals(config.getDatabase())) {
+			if (DemoSQLConfig.DATABASE_POSTGRESQL.equalsIgnoreCase(config.getDatabase())) { //PostgreSQL 不允许 cross-database
 				connection = DriverManager.getConnection(config.getDBUri() + "/" + config.getSchema(), config.getDBAccount(), config.getDBPassword());
 			}
 			else {
@@ -93,7 +93,7 @@ private PreparedStatement getStatement(@NotNull SQLConfig config) throws Excepti
 			
 			for (int i = 0; i < valueList.size(); i++) {
 				
-				if (DemoSQLConfig.DATABASE_POSTGRESQL.equals(config.getDatabase())) {
+				if (DemoSQLConfig.DATABASE_POSTGRESQL.equalsIgnoreCase(config.getDatabase())) {
 					statement.setObject(i + 1, valueList.get(i)); //PostgreSQL JDBC 不支持隐式类型转换 tinyint = varchar 报错
 				}
 				else {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private PreparedStatement getStatement(@NotNull SQLConfig config) throws Excepti`
`77`	`77`	`Log.i(TAG, "select connection " + (connection == null ? " = null" : ("isClosed = " + connection.isClosed()))) ;`
`78`	`78`
`79`	`79`
`80`		`- if (DemoSQLConfig.DATABASE_POSTGRESQL.equals(config.getDatabase())) {`
	`80`	`+ if (DemoSQLConfig.DATABASE_POSTGRESQL.equalsIgnoreCase(config.getDatabase())) { //PostgreSQL 不允许 cross-database`
`81`	`81`	`connection = DriverManager.getConnection(config.getDBUri() + "/" + config.getSchema(), config.getDBAccount(), config.getDBPassword());`
`82`	`82`	`}`
`83`	`83`	`else {`
`@@ -93,7 +93,7 @@ private PreparedStatement getStatement(@NotNull SQLConfig config) throws Excepti`
`93`	`93`
`94`	`94`	`for (int i = 0; i < valueList.size(); i++) {`
`95`	`95`
`96`		`- if (DemoSQLConfig.DATABASE_POSTGRESQL.equals(config.getDatabase())) {`
	`96`	`+ if (DemoSQLConfig.DATABASE_POSTGRESQL.equalsIgnoreCase(config.getDatabase())) {`
`97`	`97`	`statement.setObject(i + 1, valueList.get(i)); //PostgreSQL JDBC 不支持隐式类型转换 tinyint = varchar 报错`
`98`	`98`	`}`
`99`	`99`	`else {`