From 36099deb2e180ecc3f2d8f1baaccab556782a486 Mon Sep 17 00:00:00 2001
From: Gavin <gavin@hibernate.org>
Date: Wed, 10 May 2023 15:15:42 +0200
Subject: [PATCH] make @Array apply to "implicit" columns

---
 .../boot/model/internal/AnnotatedColumn.java          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java
index e07eaaf93f..8bb42e27c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java
@@ -745,9 +745,7 @@ public class AnnotatedColumn {
 		annotatedColumn.setLength( (long) column.length() );
 		annotatedColumn.setPrecision( column.precision() );
 		annotatedColumn.setScale( column.scale() );
-		if ( inferredData.getProperty().isAnnotationPresent(Array.class) ) {
-			annotatedColumn.setArrayLength( inferredData.getProperty().getAnnotation(Array.class).length() );
-		}
+		annotatedColumn.handleArrayLength( inferredData );
 //		annotatedColumn.setPropertyHolder( propertyHolder );
 //		annotatedColumn.setPropertyName( getRelativePath( propertyHolder, inferredData.getPropertyName() ) );
 		annotatedColumn.setNullable( column.nullable() ); //TODO force to not null if available? This is a (bad) user choice.
@@ -769,6 +767,12 @@ public class AnnotatedColumn {
 		return annotatedColumn;
 	}
 
+	private void handleArrayLength(PropertyData inferredData) {
+		if ( inferredData.getProperty().isAnnotationPresent(Array.class) ) {
+			setArrayLength( inferredData.getProperty().getAnnotation(Array.class).length() );
+		}
+	}
+
 	private static String logicalColumnName(
 			PropertyData inferredData,
 			String suffixForDefaultColumnName,
@@ -917,6 +921,7 @@ public class AnnotatedColumn {
 		column.applyGeneratedAs( inferredData, 1 );
 		column.applyCheckConstraint( inferredData, 1 );
 		column.extractDataFromPropertyData( propertyHolder, inferredData );
+		column.handleArrayLength( inferredData );
 		column.bind();
 		return columns;
 	}