Branch: refs/heads/wip/6.0 Home: https://github.com/hibernate/hibernate-orm Commit: 95c9526ddabcbbdd543532394b010fc466dc0bc2 https://github.com/hibernate/hibernate-orm/commit/95c9526ddabcbbdd5435323... Author: Jonathan Bregler <jonathan.bregler(a)sap.com&gt; Date: 2020-04-17 (Fri, 17 Apr 2020) Changed paths: M documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java M gradle/databases.gradle M hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java M hibernate-core/src/main/java/org/hibernate/dialect/Database.java A hibernate-core/src/main/java/org/hibernate/dialect/HANACloudColumnStoreDialect.java M hibernate-core/src/main/java/org/hibernate/dialect/HANAColumnStoreDialect.java M hibernate-core/src/main/java/org/hibernate/dialect/HANARowStoreDialect.java M hibernate-core/src/test/java/org/hibernate/test/converter/AttributeConverterTest.java M hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANASearchTest.java M hibernate-core/src/test/java/org/hibernate/test/ops/HANANoColumnInsertTest.java M hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java M hibernate-core/src/test/java/org/hibernate/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java Log Message: ----------- HHH-13917: Add support for HANA Cloud Commit: 7ced01d303c46325f4fdffb404d0c248d1a35772 https://github.com/hibernate/hibernate-orm/commit/7ced01d303c46325f4fdffb... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2020-04-17 (Fri, 17 Apr 2020) Changed paths: M documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java M gradle/databases.gradle M hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java A hibernate-core/src/main/java/org/hibernate/dialect/HANACloudColumnStoreDialect.java M hibernate-core/src/main/java/org/hibernate/dialect/HANAColumnStoreDialect.java M hibernate-core/src/main/java/org/hibernate/dialect/HANARowStoreDialect.java M hibernate-core/src/test/java/org/hibernate/test/converter/AttributeConverterTest.java M hibernate-core/src/test/java/org/hibernate/test/dialect/functional/HANASearchTest.java M hibernate-core/src/test/java/org/hibernate/test/ops/HANANoColumnInsertTest.java M hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java M hibernate-core/src/test/java/org/hibernate/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java Log Message: ----------- Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_32 Commit: 32e4a16623cbef687ea3fd6876b370d0aedf34a0 https://github.com/hibernate/hibernate-orm/commit/32e4a16623cbef687ea3fd6... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2020-04-17 (Fri, 17 Apr 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/dialect/Database.java M hibernate-core/src/main/java/org/hibernate/dialect/HANACloudColumnStoreDialect.java M hibernate-core/src/main/java/org/hibernate/dialect/HANAColumnStoreDialect.java Log Message: ----------- Fix merge issues Compare: https://github.com/hibernate/hibernate-orm/compare/9547c9ca09f5...32e4a16...