Server:避免全局默认的 @Schema 自动填充进来导致 Table,Column,PgClass,PgAttribute 的 schema 错误，查不到文档

TommyLemon · TommyLemon · commit a58d88588f43 · 2019-05-01T01:00:08.000+08:00
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
@@ -228,17 +228,17 @@ public String getSchema() {
 		return schema;
 	}
 	public String getSQLSchema(String sqlTable) {
+		//强制，避免因为全局默认的 @schema 自动填充进来，导致这几个类的 schema 为 sys 等其它值
+		if ((Table.TABLE_NAME.equals(sqlTable) || Column.TABLE_NAME.equals(sqlTable)) ) {
+			return SCHEMA_INFORMATION;
+		}
+		if ((PgAttribute.TABLE_NAME.equals(sqlTable) || PgClass.TABLE_NAME.equals(sqlTable)) ) {
+			return "";
+		}
+
 		String sch = getSchema();
 		if (sch == null) { //PostgreSQL 的 pg_class 和 pg_attribute 表好像不属于任何 Schema  StringUtil.isEmpty(sch, true)) {
-			if ((Table.TABLE_NAME.equals(sqlTable) || Column.TABLE_NAME.equals(sqlTable)) ) {
-				sch = SCHEMA_INFORMATION;
-			} 
-			else if ((PgAttribute.TABLE_NAME.equals(sqlTable) || PgClass.TABLE_NAME.equals(sqlTable)) ) {
-				sch = "";
-			}
-			else {
-				sch = DEFAULT_SCHEMA;
-			}
+			sch = DEFAULT_SCHEMA;
 		}
 		return sch;
 	}
