Make use of JavaType in SqlSelection

Author: beikov

hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Expression.java

@@ -38,6 +38,7 @@ default SqlSelection createSqlSelection(
 		return new SqlSelectionImpl(
 				jdbcPosition,
 				valuesArrayPosition,
+				javaType,
 				this
 		);
 	}

hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java

@@ -68,6 +68,7 @@ public SqlSelection createSqlSelection(
 		return new SqlSelectionImpl(
 				jdbcPosition,
 				valuesArrayPosition,
+				javaType,
 				this
 		);
 	}

hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResolvedSqlSelection.java

@@ -27,7 +27,7 @@ public ResolvedSqlSelection(
 			int valuesArrayPosition,
 			Expression sqlExpression,
 			BasicType<Object> resolvedType) {
-		super( jdbcPosition, valuesArrayPosition, sqlExpression );
+		super( jdbcPosition, valuesArrayPosition, null, sqlExpression );
 		this.resolvedType = resolvedType;
 	}
 

hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java

@@ -9,6 +9,7 @@
 import java.util.Objects;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.metamodel.mapping.SqlExpressible;
 import org.hibernate.sql.ast.SqlAstWalker;
@@ -19,6 +20,7 @@
 import org.hibernate.type.BasicType;
 import org.hibernate.type.JavaObjectType;
 import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.java.JavaType;
 
 /**
  * @asciidoc
@@ -43,10 +45,16 @@ public class SqlSelectionImpl implements SqlSelection, SqlExpressionAccess {
 	private final int jdbcPosition;
 	private final int valuesArrayPosition;
 	private final Expression sqlExpression;
+	private final JavaType<?> jdbcJavaType;
 
 	public SqlSelectionImpl(int jdbcPosition, int valuesArrayPosition, Expression sqlExpression) {
+		this( jdbcPosition, valuesArrayPosition, null, sqlExpression );
+	}
+
+	public SqlSelectionImpl(int jdbcPosition, int valuesArrayPosition, JavaType<?> jdbcJavaType, Expression sqlExpression) {
 		this.jdbcPosition = jdbcPosition;
 		this.valuesArrayPosition = valuesArrayPosition;
+		this.jdbcJavaType = jdbcJavaType;
 		this.sqlExpression = sqlExpression;
 	}
 
@@ -57,7 +65,11 @@ public Expression getExpression() {
 
 	@Override
 	public ValueExtractor getJdbcValueExtractor() {
-		return ( (SqlExpressible) sqlExpression.getExpressionType() ).getJdbcMapping().getJdbcValueExtractor();
+		final JdbcMapping jdbcMapping = ( (SqlExpressible) sqlExpression.getExpressionType() ).getJdbcMapping();
+		if ( jdbcJavaType == null || jdbcMapping.getMappedJavaType() == jdbcJavaType ) {
+			return jdbcMapping.getJdbcValueExtractor();
+		}
+		return jdbcMapping.getJdbcType().getExtractor( jdbcJavaType );
 	}
 
 	@Override