Server:避免全局默认的 @schema 自动填充进来导致 Table,Column,PgClass,PgAttribute 的 sc… · androidxu/APIJSON@a58d885 · GitHub

androidxu / APIJSON Public

forked from APIJSON/APIJSON

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 1

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit a58d885

Browse filesBrowse the repository at this point in the historyBrowse files

TommyLemon

committed

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

1 parent 0816d98 commit a58d885
Copy full SHA for a58d885

1 file changed

+9-9Lines changed: 9 additions & 9 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server
  • AbstractSQLConfig.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java‎

Copy file name to clipboardExpand all lines: APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java

+9-9Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
@@ -228,17 +228,17 @@ public String getSchema() {
228	228	return schema;
229	229	}
230	230	public String getSQLSchema(String sqlTable) {
	231	+ //强制，避免因为全局默认的 @schema 自动填充进来，导致这几个类的 schema 为 sys 等其它值
	232	+ if ((Table.TABLE_NAME.equals(sqlTable) || Column.TABLE_NAME.equals(sqlTable)) ) {
	233	+ return SCHEMA_INFORMATION;
	234	+ }
	235	+ if ((PgAttribute.TABLE_NAME.equals(sqlTable) || PgClass.TABLE_NAME.equals(sqlTable)) ) {
	236	+ return "";
	237	+ }
	238	+
231	239	String sch = getSchema();
232	240	if (sch == null) { //PostgreSQL 的 pg_class 和 pg_attribute 表好像不属于任何 Schema StringUtil.isEmpty(sch, true)) {
233		- if ((Table.TABLE_NAME.equals(sqlTable) || Column.TABLE_NAME.equals(sqlTable)) ) {
234		- sch = SCHEMA_INFORMATION;
235		- }
236		- else if ((PgAttribute.TABLE_NAME.equals(sqlTable) || PgClass.TABLE_NAME.equals(sqlTable)) ) {
237		- sch = "";
238		- }
239		- else {
240		- sch = DEFAULT_SCHEMA;
241		- }
	241	+ sch = DEFAULT_SCHEMA;
242	242	}
243	243	return sch;
244	244	}

0 commit comments

Comments

0 (0)