HHH-17276 Be more forgiving when determining lobness

beikov · beikov · commit 1b789ff3c467 · 2023-10-11T18:47:42.000+02:00
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java
@@ -242,7 +242,7 @@ private boolean supportsWindowFunctions() {
 
 	@Override
 	public void visitCastTarget(CastTarget castTarget) {
-		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, dialect );
+		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );
 		if ( sqlType != null ) {
 			appendSql( sqlType );
 		}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java
@@ -250,7 +250,7 @@ public MySQLLegacyDialect getDialect() {
 
 	@Override
 	public void visitCastTarget(CastTarget castTarget) {
-		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getDialect() );
+		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );
 		if ( sqlType != null ) {
 			appendSql( sqlType );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java
@@ -236,7 +236,7 @@ private boolean supportsWindowFunctions() {
 
 	@Override
 	public void visitCastTarget(CastTarget castTarget) {
-		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, dialect );
+		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );
 		if ( sqlType != null ) {
 			appendSql( sqlType );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java
@@ -37,9 +37,20 @@ public MySQLSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement
 		super( sessionFactory, statement );
 	}
 
+	/**
+	 * @deprecated Use {@link #getSqlType(CastTarget, SessionFactoryImplementor)} instead
+	 */
+	@Deprecated(forRemoval = true)
 	public static String getSqlType(CastTarget castTarget, Dialect dialect) {
-		final String sqlType = castTarget.getSqlType();
+		return getSqlType( castTarget, castTarget.getSqlType(), dialect );
+	}
+
+	public static String getSqlType(CastTarget castTarget, SessionFactoryImplementor factory) {
+		final String sqlType = getSqlTypeName( castTarget, factory );
+		return getSqlType( castTarget, sqlType, factory.getJdbcServices().getDialect() );
+	}
 
+	private static String getSqlType(CastTarget castTarget, String sqlType, Dialect dialect) {
 		if ( sqlType != null ) {
 			int parenthesesIndex = sqlType.indexOf( '(' );
 			final String baseName = parenthesesIndex == -1 ? sqlType : sqlType.substring( 0, parenthesesIndex );
@@ -63,10 +74,14 @@ public static String getSqlType(CastTarget castTarget, Dialect dialect) {
 				case "varchar":
 				case "nchar":
 				case "nvarchar":
-					return "char";
+					return castTarget.getLength() == null
+							? "char"
+							: ( "char(" + castTarget.getLength() + ")" );
 				case "binary":
 				case "varbinary":
-					return "binary";
+					return castTarget.getLength() == null
+							? "binary"
+							: ( "binary(" + castTarget.getLength() + ")" );
 			}
 		}
 		return sqlType;
@@ -286,7 +301,7 @@ public MySQLDialect getDialect() {
 
 	@Override
 	public void visitCastTarget(CastTarget castTarget) {
-		String sqlType = getSqlType( castTarget, getDialect() );
+		String sqlType = getSqlType( castTarget, getSessionFactory() );
 		if ( sqlType != null ) {
 			appendSql( sqlType );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TiDBSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/TiDBSqlAstTranslator.java
@@ -193,7 +193,7 @@ public TiDBDialect getDialect() {
 
 	@Override
 	public void visitCastTarget(CastTarget castTarget) {
-		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, dialect );
+		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );
 		if ( sqlType != null ) {
 			appendSql( sqlType );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
@@ -21,6 +21,7 @@
 import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
+import org.hibernate.type.descriptor.sql.DdlType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.type.SqlTypes.BIGINT;
@@ -232,7 +233,7 @@ public WriteExpressionRenderer aggregateCustomWriteExpressionRenderer(
 		final int aggregateSqlTypeCode = aggregateColumn.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode();
 		switch ( aggregateSqlTypeCode ) {
 			case JSON:
-				return jsonAggregateColumnWriter( aggregateColumn, columnsToUpdate );
+				return jsonAggregateColumnWriter( aggregateColumn, columnsToUpdate, typeConfiguration );
 		}
 		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateSqlTypeCode );
 	}
@@ -270,8 +271,9 @@ enum JsonSupport {
 
 	private WriteExpressionRenderer jsonAggregateColumnWriter(
 			SelectableMapping aggregateColumn,
-			SelectableMapping[] columns) {
-		return new RootJsonWriteExpression( aggregateColumn, columns, this );
+			SelectableMapping[] columns,
+			TypeConfiguration typeConfiguration) {
+		return new RootJsonWriteExpression( aggregateColumn, columns, this, typeConfiguration );
 	}
 
 	interface JsonWriteExpression {
@@ -294,7 +296,10 @@ public AggregateJsonWriteExpression(
 			this.ddlTypeName = aggregateSupport.determineJsonTypeName( selectableMapping );
 		}
 
-		protected void initializeSubExpressions(SelectableMapping[] columns, OracleAggregateSupport aggregateSupport) {
+		protected void initializeSubExpressions(
+				SelectableMapping[] columns,
+				OracleAggregateSupport aggregateSupport,
+				TypeConfiguration typeConfiguration) {
 			for ( SelectableMapping column : columns ) {
 				final SelectablePath selectablePath = column.getSelectablePath();
 				final SelectablePath[] parts = selectablePath.getParts();
@@ -319,13 +324,33 @@ protected void initializeSubExpressions(SelectableMapping[] columns, OracleAggre
 								aggregateSupport.jsonCustomWriteExpression(
 										customWriteExpression,
 										sqlTypeCode,
-										column.getColumnDefinition()
+										determineTypeName( column, typeConfiguration )
 								)
 						)
 				);
 			}
 		}
 
+		private static String determineTypeName(SelectableMapping column, TypeConfiguration typeConfiguration) {
+			final String typeName;
+			if ( column.getColumnDefinition() == null ) {
+				final DdlType ddlType = typeConfiguration.getDdlTypeRegistry().getDescriptor(
+						column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode()
+				);
+				return ddlType.getCastTypeName(
+						column.getJdbcMapping().getJdbcType(),
+						column.getJdbcMapping().getJavaTypeDescriptor(),
+						column.getLength(),
+						column.getPrecision(),
+						column.getScale()
+				);
+			}
+			else{
+				typeName = column.getColumnDefinition();
+			}
+			return typeName;
+		}
+
 		@Override
 		public void append(
 				SqlAppender sb,
@@ -364,11 +389,12 @@ private static class RootJsonWriteExpression extends AggregateJsonWriteExpressio
 		RootJsonWriteExpression(
 				SelectableMapping aggregateColumn,
 				SelectableMapping[] columns,
-				OracleAggregateSupport aggregateSupport) {
+				OracleAggregateSupport aggregateSupport,
+				TypeConfiguration typeConfiguration) {
 			super( aggregateColumn, aggregateSupport );
 			this.nullable = aggregateColumn.isNullable();
 			this.path = aggregateColumn.getSelectionExpression();
-			initializeSubExpressions( columns, aggregateSupport );
+			initializeSubExpressions( columns, aggregateSupport, typeConfiguration );
 		}
 
 		@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java
@@ -32,6 +32,7 @@
 import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.jdbc.ArrayJdbcType;
 import org.hibernate.type.descriptor.JdbcTypeNameMapper;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.sql.DdlType;
 import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import org.hibernate.type.spi.TypeConfiguration;
@@ -60,7 +61,7 @@ public class Column implements Selectable, Serializable, Cloneable, ColumnTypeIn
 	private boolean unique;
 	private String sqlTypeName;
 	private Integer sqlTypeCode;
-	private boolean sqlTypeLob;
+	private Boolean sqlTypeLob;
 	private boolean quoted;
 	int uniqueInteger;
 	private String comment;
@@ -494,6 +495,46 @@ public void setSqlType(String typeName) {
 	}
 
 	public boolean isSqlTypeLob() {
+		return sqlTypeLob != null && sqlTypeLob;
+	}
+
+	public boolean isSqlTypeLob(Metadata mapping) {
+		final Database database = mapping.getDatabase();
+		final DdlTypeRegistry ddlTypeRegistry = database.getTypeConfiguration().getDdlTypeRegistry();
+		final Dialect dialect = database.getDialect();
+		if ( sqlTypeLob == null ) {
+			final Type type = getValue().getType();
+			try {
+				if ( isArray( type ) ) {
+					sqlTypeLob = false;
+				}
+				else {
+					final int typeCode = getSqlTypeCode( mapping );
+					final DdlType descriptor = ddlTypeRegistry.getDescriptor( typeCode );
+					if ( descriptor == null ) {
+						sqlTypeLob = JdbcType.isLob( typeCode );
+					}
+					else {
+						final Size size = getColumnSize( dialect, mapping );
+						sqlTypeLob = descriptor.isLob( size );
+					}
+				}
+			}
+			catch ( MappingException cause ) {
+				throw cause;
+			}
+			catch ( Exception cause ) {
+				throw new MappingException(
+						String.format(
+								Locale.ROOT,
+								"Unable to determine SQL type name for column '%s' of table '%s'",
+								getName(),
+								getValue().getTable().getName()
+						),
+						cause
+				);
+			}
+		}
 		return sqlTypeLob;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java
@@ -287,12 +287,12 @@ protected boolean finishInitialization(
 				final boolean nullable;
 				if ( selectable instanceof Column ) {
 					final Column column = (Column) selectable;
-					columnDefinition = column.getSqlType( creationProcess.getCreationContext().getMetadata() );
+					columnDefinition = column.getSqlType();
 					length = column.getLength();
 					precision = column.getPrecision();
 					scale = column.getScale();
 					nullable = column.isNullable();
-					isLob = column.isSqlTypeLob();
+					isLob = column.isSqlTypeLob( creationProcess.getCreationContext().getMetadata() );
 					selectablePath = basicValue.createSelectablePath( column.getQuotedName( dialect ) );
 				}
 				else {
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java
@@ -87,7 +87,7 @@ public static DiscriminatedAssociationMapping from(
 				declaringModelPart,
 				tableName,
 				metaColumn.getText( dialect ),
-				metaColumn.getSqlType( creationProcess.getCreationContext().getMetadata() ),
+				metaColumn.getSqlType(),
 				metaColumn.getLength(),
 				metaColumn.getPrecision(),
 				metaColumn.getScale(),
@@ -106,7 +106,7 @@ public static DiscriminatedAssociationMapping from(
 				declaringModelPart,
 				tableName,
 				keyColumn.getText( dialect ),
-				keyColumn.getSqlType( creationProcess.getCreationContext().getMetadata() ),
+				keyColumn.getSqlType(),
 				keyColumn.getLength(),
 				keyColumn.getPrecision(),
 				keyColumn.getScale(),
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java
@@ -383,11 +383,11 @@ private boolean finishInitialization(
 				final boolean nullable;
 				if ( selectable instanceof Column ) {
 					final Column column = (Column) selectable;
-					columnDefinition = column.getSqlType( creationProcess.getCreationContext().getMetadata() );
+					columnDefinition = column.getSqlType();
 					length = column.getLength();
 					precision = column.getPrecision();
 					scale = column.getScale();
-					isLob = column.isSqlTypeLob();
+					isLob = column.isSqlTypeLob( creationProcess.getCreationContext().getMetadata() );
 					nullable = bootPropertyDescriptor.isOptional() && column.isNullable() ;
 					selectablePath = basicValue.createSelectablePath( column.getQuotedName( dialect ) );
 				}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java
@@ -184,13 +184,13 @@ public static SelectableMapping from(
 		else {
 			Column column = (Column) selectable;
 			columnExpression = selectable.getText( dialect );
-			columnDefinition = column.getSqlType( creationContext.getMetadata() );
+			columnDefinition = column.getSqlType();
 			length = column.getLength();
 			precision = column.getPrecision();
 			scale = column.getScale();
 
 			isNullable = forceNotNullable ? false : column.isNullable();
-			isLob = column.isSqlTypeLob();
+			isLob = column.isSqlTypeLob( creationContext.getMetadata() );
 			selectableName = column.getQuotedName( dialect );
 		}
 		return new SelectableMappingImpl(
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -5037,7 +5037,7 @@ protected EntityDiscriminatorMapping generateDiscriminatorMapping(
 					scale = null;
 				}
 				else {
-					columnDefinition = column.getSqlType( modelCreationProcess.getCreationContext().getMetadata() );
+					columnDefinition = column.getSqlType();
 					length = column.getLength();
 					precision = column.getPrecision();
 					scale = column.getScale();
@@ -5214,7 +5214,7 @@ protected EntityIdentifierMapping generateIdentifierMapping(
 		}
 		else {
 			Column column = bootEntityDescriptor.getIdentifier().getColumns().get( 0 );
-			columnDefinition = column.getSqlType( creationProcess.getCreationContext().getMetadata() );
+			columnDefinition = column.getSqlType();
 			length = column.getLength();
 			precision = column.getPrecision();
 			scale = column.getScale();
@@ -5273,7 +5273,7 @@ protected static EntityVersionMapping generateVersionMapping(
 				bootModelRootEntityDescriptor.getVersion().getName(),
 				entityPersister.getTableName(),
 				column.getText( dialect ),
-				column.getSqlType( creationProcess.getCreationContext().getMetadata() ),
+				column.getSqlType(),
 				column.getLength(),
 				column.getPrecision(),
 				column.getScale(),
@@ -5318,11 +5318,11 @@ protected AttributeMapping generateNonIdAttributeMapping(
 					false,
 					null,
 					"?",
-					column.getSqlType( creationProcess.getCreationContext().getMetadata() ),
+					column.getSqlType(),
 					column.getLength(),
 					column.getPrecision(),
 					column.getScale(),
-					column.isSqlTypeLob(),
+					column.isSqlTypeLob( creationProcess.getCreationContext().getMetadata() ),
 					column.isNullable(),
 					value.isColumnInsertable( 0 ),
 					value.isColumnUpdateable( 0 ),
@@ -5350,11 +5350,11 @@ protected AttributeMapping generateNonIdAttributeMapping(
 				customReadExpr = null;
 				customWriteExpr = "?";
 				Column column = value.getColumns().get( 0 );
-				columnDefinition = column.getSqlType( creationProcess.getCreationContext().getMetadata() );
+				columnDefinition = column.getSqlType();
 				length = column.getLength();
 				precision = column.getPrecision();
 				scale = column.getScale();
-				isLob = column.isSqlTypeLob();
+				isLob = column.isSqlTypeLob( creationProcess.getCreationContext().getMetadata() );
 				nullable = column.isNullable();
 			}
 			else {
@@ -5377,12 +5377,12 @@ protected AttributeMapping generateNonIdAttributeMapping(
 					);
 					customWriteExpr = selectable.getWriteExpr( (JdbcMapping) attrType, creationContext.getDialect() );
 					Column column = value.getColumns().get( 0 );
-					columnDefinition = column.getSqlType( creationContext.getMetadata() );
+					columnDefinition = column.getSqlType();
 					length = column.getLength();
 					precision = column.getPrecision();
 					scale = column.getScale();
 					nullable = column.isNullable();
-					isLob = column.isSqlTypeLob();
+					isLob = column.isSqlTypeLob( creationContext.getMetadata() );
 				}
 				else {
 					final String[] attrColumnFormulaTemplate = propertyColumnFormulaTemplates[ propertyIndex ];
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
@@ -1186,7 +1186,7 @@ protected EntityIdentifierMapping generateIdentifierMapping(
 		}
 		else {
 			final Column column = bootEntityDescriptor.getIdentifier().getColumns().get( 0 );
-			columnDefinition = column.getSqlType( creationProcess.getCreationContext().getMetadata() );
+			columnDefinition = column.getSqlType();
 			length = column.getLength();
 			precision = column.getPrecision();
 			scale = column.getScale();
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ private boolean supportsWindowFunctions() {`
`242`	`242`
`243`	`243`	`@Override`
`244`	`244`	`public void visitCastTarget(CastTarget castTarget) {`
`245`		`- String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, dialect );`
	`245`	`+ String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );`
`246`	`246`	`if ( sqlType != null ) {`
`247`	`247`	`appendSql( sqlType );`
`248`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ public MySQLLegacyDialect getDialect() {`
`250`	`250`
`251`	`251`	`@Override`
`252`	`252`	`public void visitCastTarget(CastTarget castTarget) {`
`253`		`- String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getDialect() );`
	`253`	`+ String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );`
`254`	`254`	`if ( sqlType != null ) {`
`255`	`255`	`appendSql( sqlType );`
`256`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ private boolean supportsWindowFunctions() {`
`236`	`236`
`237`	`237`	`@Override`
`238`	`238`	`public void visitCastTarget(CastTarget castTarget) {`
`239`		`- String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, dialect );`
	`239`	`+ String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );`
`240`	`240`	`if ( sqlType != null ) {`
`241`	`241`	`appendSql( sqlType );`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public TiDBDialect getDialect() {`
`193`	`193`
`194`	`194`	`@Override`
`195`	`195`	`public void visitCastTarget(CastTarget castTarget) {`
`196`		`- String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, dialect );`
	`196`	`+ String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );`
`197`	`197`	`if ( sqlType != null ) {`
`198`	`198`	`appendSql( sqlType );`
`199`	`199`	`}`