HHH-14772 InformationExtractorJdbcDatabaseMetaDataImpl#getCurrentSchema() method returns currentCatalog if schema == null

dreab8 · Sanne · commit c0041ba07350 · 2021-07-18T21:05:57.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
@@ -325,7 +325,7 @@ private Identifier getCurrentSchema(JdbcEnvironment jdbcEnvironment) {
 				log.sqlWarning( ignore.getErrorCode(), ignore.getSQLState() );
 			}
 		}
-		return currentCatalog;
+		return currentSchema;
 	}
 
 	private Identifier getCurrentCatalog(JdbcEnvironment jdbcEnvironment) {

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ private Identifier getCurrentSchema(JdbcEnvironment jdbcEnvironment) {`
`325`	`325`	`log.sqlWarning( ignore.getErrorCode(), ignore.getSQLState() );`
`326`	`326`	`}`
`327`	`327`	`}`
`328`		`- return currentCatalog;`
	`328`	`+ return currentSchema;`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`private Identifier getCurrentCatalog(JdbcEnvironment jdbcEnvironment) {`