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

Make use of JavaType in SqlSelection

This commit is contained in:
Christian Beikov 2022-11-22 18:15:03 +01:00
parent 30bb01d0fa
commit 92d447cddd
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ public interface Expression extends SqlAstNode, SqlSelectionProducer {
return new SqlSelectionImpl(
jdbcPosition,
valuesArrayPosition,
javaType,
this
);
}

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

@ -68,6 +68,7 @@ public abstract class AbstractJdbcParameter
return new SqlSelectionImpl(
jdbcPosition,
valuesArrayPosition,
javaType,
this
);
}

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

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

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

@ -9,6 +9,7 @@ package org.hibernate.sql.results.internal;
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.sql.results.jdbc.spi.JdbcValuesMetadata;
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 class SqlSelectionImpl implements SqlSelection, SqlExpressionAccess {
@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