Adapt to new internal contracts for parameter rendering

Author: Sanne

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveAbstractEntityPersister.java

@@ -27,7 +27,6 @@
 import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeLoadingInterceptor;
 import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
 import org.hibernate.collection.spi.PersistentCollection;
-import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.internal.ManagedTypeHelper;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.EntityKey;
@@ -114,14 +113,13 @@ boolean check(
 
 	default String generateSelectLockString(LockOptions lockOptions) {
 		final SessionFactoryImplementor factory = getFactory();
-		Dialect dialect = factory.getJdbcServices().getDialect();
-		final SimpleSelect select = new SimpleSelect(dialect)
+		final SimpleSelect select = new SimpleSelect( factory )
 				.setLockOptions( lockOptions )
 				.setTableName( getRootTableName() )
 				.addColumn( getRootTableIdentifierColumnNames()[0] )
-				.addCondition( getRootTableIdentifierColumnNames(), "=?" );
+				.addRestriction( getRootTableIdentifierColumnNames() );
 		if ( isVersioned() ) {
-			select.addCondition( getVersionColumnName(), "=?" );
+			select.addRestriction( getVersionColumnName() );
 		}
 		if ( factory.getSessionFactoryOptions().isCommentsEnabled() ) {
 			select.setComment( lockOptions.getLockMode() + " lock " + getEntityName() );
@@ -131,12 +129,11 @@ default String generateSelectLockString(LockOptions lockOptions) {
 
 	default String generateUpdateLockString(LockOptions lockOptions) {
 		final SessionFactoryImplementor factory = getFactory();
-		Dialect dialect = factory.getJdbcServices().getDialect();
-		final Update update = new Update(dialect);
+		final Update update = new Update( factory );
 		update.setTableName( getRootTableName() );
-		update.addPrimaryKeyColumns( getRootTableIdentifierColumnNames() );
-		update.setVersionColumnName( getVersionColumnName() );
-		update.addColumn( getVersionColumnName() );
+		update.addAssignment( getVersionColumnName() );
+		update.addRestriction( getRootTableIdentifierColumnNames() );
+		update.addRestriction( getVersionColumnName() );
 		if ( factory.getSessionFactoryOptions().isCommentsEnabled() ) {
 			update.setComment( lockOptions.getLockMode() + " lock " + getEntityName() );
 		}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveIdentityGenerator.java

@@ -14,6 +14,7 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.id.IdentityGenerator;
 import org.hibernate.id.PostInsertIdentityPersister;
 import org.hibernate.id.insert.IdentifierGeneratingInsert;
@@ -46,11 +47,13 @@ public static class ReactiveInsertAndSelectDelegate extends InsertReturningDeleg
 
 		private final PostInsertIdentityPersister persister;
 		private final Dialect dialect;
+		private final SessionFactoryImplementor factory;
 
 		public ReactiveInsertAndSelectDelegate(PostInsertIdentityPersister persister, Dialect dialect) {
 			super( persister, dialect );
 			this.persister = persister;
 			this.dialect = dialect;
+			this.factory = persister.getFactory();
 		}
 
 		@Override
@@ -62,13 +65,13 @@ public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert(SqlStringGen
 
 		private IdentifierGeneratingInsert createInsert(SqlStringGenerationContext context) {
 			if ( dialect instanceof PostgreSQLDialect || dialect instanceof CockroachDialect ) {
-				return new PostgresIdentifierGeneratingInsert( dialect );
+				return new PostgresIdentifierGeneratingInsert( factory );
 			}
 			if ( dialect instanceof SQLServerDialect ) {
-				return new SqlServerIdentifierGeneratingInsert( dialect );
+				return new SqlServerIdentifierGeneratingInsert( factory );
 			}
 			if ( dialect instanceof DB2Dialect ) {
-				return new Db2IdentifierGeneratingInsert( dialect );
+				return new Db2IdentifierGeneratingInsert( factory );
 			}
 			return super.prepareIdentifierGeneratingInsert( context );
 		}
@@ -78,8 +81,8 @@ public static class Db2IdentifierGeneratingInsert extends IdentifierGeneratingIn
 
 		private String identityColumnName;
 
-		public Db2IdentifierGeneratingInsert(Dialect dialect) {
-			super( dialect );
+		public Db2IdentifierGeneratingInsert(SessionFactoryImplementor sessionFactory) {
+			super( sessionFactory );
 		}
 
 		@Override
@@ -101,8 +104,8 @@ public static class PostgresIdentifierGeneratingInsert extends IdentifierGenerat
 
 		private String identityColumnName;
 
-		public PostgresIdentifierGeneratingInsert(Dialect dialect) {
-			super( dialect );
+		public PostgresIdentifierGeneratingInsert(SessionFactoryImplementor sessionFactory) {
+			super( sessionFactory );
 		}
 
 		@Override
@@ -120,8 +123,8 @@ public String toStatementString() {
 	public static class SqlServerIdentifierGeneratingInsert extends IdentifierGeneratingInsert {
 		private String identityColumnName;
 
-		public SqlServerIdentifierGeneratingInsert(Dialect dialect) {
-			super( dialect );
+		public SqlServerIdentifierGeneratingInsert(SessionFactoryImplementor sessionFactory) {
+			super( sessionFactory );
 		}
 
 		@Override

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

@@ -5,20 +5,29 @@
  */
 package org.hibernate.reactive.provider.service;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 
 import org.hibernate.boot.registry.StandardServiceInitiator;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.DialectDelegateWrapper;
+import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.reactive.logging.impl.Log;
+import org.hibernate.reactive.logging.impl.LoggerFactory;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.sql.ast.spi.JdbcParameterRenderer;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
 
 /**
  * Replaces the JdbcParameterRendererInitiator so to not require
  * users to set AvailableSettings.DIALECT_NATIVE_PARAM_MARKERS : this
  * gets enforces as the Vert.x SQL clients require it.
  */
 public class NativeParametersRendering implements StandardServiceInitiator<JdbcParameterRenderer> {
+
+	private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
+
 	/**
 	 * Singleton access
 	 */
@@ -27,12 +36,32 @@ public class NativeParametersRendering implements StandardServiceInitiator<JdbcP
 	@Override
 	public JdbcParameterRenderer initiateService(Map<String, Object> configurationValues, ServiceRegistryImplementor registry) {
 		final Dialect dialect = registry.getService( JdbcServices.class ).getDialect();
-		return dialect.getNativeParameterRenderer();
+		final Dialect realDialect = DialectDelegateWrapper.extractRealDialect( dialect );
+		final JdbcParameterRenderer renderer = recommendRendered( realDialect );
+		LOG.debug( "Initializing service JdbcParameterRenderer with implementation: " + renderer.getClass() );
+		return renderer;
+	}
+
+	private JdbcParameterRenderer recommendRendered(Dialect realDialect) {
+		if ( realDialect instanceof PostgreSQLDialect ) {
+			return new PostgreSQLNativeParameterMarkers();
+		}
+		//TBD : Implementations for other DBs
+		else {
+			return realDialect.getNativeParameterRenderer();
+		}
 	}
 
 	@Override
 	public Class<JdbcParameterRenderer> getServiceInitiated() {
 		return JdbcParameterRenderer.class;
 	}
 
+	private static class PostgreSQLNativeParameterMarkers implements JdbcParameterRenderer {
+		@Override
+		public String renderJdbcParameter(int position, JdbcType jdbcType) {
+			return "$" + position;
+		}
+	}
+
 }