Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into wip/6.0_merge

This commit is contained in:
Andrea Boriero 2021-11-24 16:48:43 +01:00
parent 39dae088ec f604e8fa33
commit bdc1e4103d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java
View File

@ -309,6 +309,9 @@ public class SybaseDialect extends AbstractTransactSQLDialect {
@Override
public NameQualifierSupport getNameQualifierSupport() {
if ( version >= 1500 ) {
return NameQualifierSupport.BOTH;
}
return NameQualifierSupport.CATALOG;
}

8
hibernate-testing/src/main/java/org/hibernate/testing/cleaner/JdbcConnectionContext.java
View File

@ -38,8 +38,12 @@ public final class JdbcConnectionContext {
password = connectionProperties.getProperty(
AvailableSettings.PASS );
Properties p = new Properties();
p.put( "user", user );
p.put( "password", password );
if ( user != null ) {
p.put( "user", user );
}
if ( password != null ) {
p.put( "password", password );
}
properties = p;
}
catch (Exception e) {