Skip to content

Commit c0704aa

Browse files
committed
[#1935] Fixes for Hibernate ORM 6.5.3.Final
1 parent 4ffe4c8 commit c0704aa

File tree

3 files changed

+30
-0
lines changed

3 files changed

+30
-0
lines changed

hibernate-reactive-core/src/main/java/org/hibernate/reactive/metamodel/mapping/internal/ReactiveToOneAttributeMapping.java

+5
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,9 @@ public ReactiveToOneAttributeMapping copy(
9797
TableGroupProducer declaringTableGroupProducer) {
9898
return new ReactiveToOneAttributeMapping( super.copy( declaringType, declaringTableGroupProducer ) );
9999
}
100+
101+
@Override
102+
protected Object lazyInitialize(Object domainValue) {
103+
return domainValue;
104+
}
100105
}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/AbstractReactiveInformationSchemaBasedExtractorImpl.java

+19
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package org.hibernate.reactive.provider.service;
77

8+
import java.lang.invoke.MethodHandles;
89
import java.sql.ResultSet;
910
import java.sql.SQLException;
1011
import java.util.ArrayList;
@@ -14,6 +15,8 @@
1415
import org.hibernate.boot.model.TruthValue;
1516
import org.hibernate.boot.model.naming.DatabaseIdentifier;
1617
import org.hibernate.boot.model.naming.Identifier;
18+
import org.hibernate.reactive.logging.impl.Log;
19+
import org.hibernate.reactive.logging.impl.LoggerFactory;
1720
import org.hibernate.tool.schema.extract.internal.AbstractInformationExtractorImpl;
1821
import org.hibernate.tool.schema.extract.internal.ColumnInformationImpl;
1922
import org.hibernate.tool.schema.extract.spi.ColumnInformation;
@@ -29,6 +32,8 @@
2932
*/
3033
public abstract class AbstractReactiveInformationSchemaBasedExtractorImpl extends AbstractInformationExtractorImpl {
3134

35+
private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
36+
3237
public AbstractReactiveInformationSchemaBasedExtractorImpl(ExtractionContext extractionContext) {
3338
super( extractionContext );
3439
}
@@ -154,6 +159,20 @@ protected <T> T processCatalogsResultSet(ExtractionContext.ResultSetProcessor<T>
154159
);
155160
}
156161

162+
@Override
163+
protected <T> T processCrossReferenceResultSet(
164+
String parentCatalog,
165+
String parentSchema,
166+
String parentTable,
167+
String foreignCatalog,
168+
String foreignSchema,
169+
String foreignTable,
170+
ExtractionContext.ResultSetProcessor<T> processor) {
171+
// This method has been added as fix for https://hibernate.atlassian.net/browse/HHH-18221
172+
// The issue is only for Informix that we don't currently support.
173+
throw LOG.notYetImplemented();
174+
}
175+
157176
@Override
158177
protected <T> T processSchemaResultSet(
159178
String catalog,

hibernate-reactive-core/src/test/java/org/hibernate/reactive/configuration/ReactiveConnectionPoolTest.java

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import org.hibernate.engine.jdbc.internal.JdbcServicesImpl;
1414
import org.hibernate.engine.jdbc.spi.JdbcServices;
15+
import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
1516
import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
1617
import org.hibernate.reactive.containers.DatabaseConfiguration;
1718
import org.hibernate.reactive.pool.ReactiveConnectionPool;
@@ -64,6 +65,11 @@ private ReactiveConnectionPool configureAndStartPool(Map<String, Object> config)
6465
public SqlStatementLogger getSqlStatementLogger() {
6566
return new SqlStatementLogger();
6667
}
68+
69+
@Override
70+
public SqlExceptionHelper getSqlExceptionHelper() {
71+
return new SqlExceptionHelper( true );
72+
}
6773
} );
6874
DefaultSqlClientPool reactivePool = new DefaultSqlClientPool();
6975
reactivePool.injectServices( registryExtension.getServiceRegistry() );

0 commit comments

Comments
 (0)