HHH-15888 clean up exception reporting in Column

- and generally tidy up that class a bit - make state management in Column safer using assertions - fix minor potential bug spotted by CodeQL
hibernate · Dec 27, 2022 · b0479c5 · b0479c5
1 parent 109dac9
commit b0479c5
Show file tree

Hide file tree

Showing 7 changed files with 191 additions and 197 deletions.
diff --git a/...re/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalObjectBinder.java b/...re/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalObjectBinder.java
@@ -105,7 +105,7 @@ public void bindColumn(
 			SimpleValue simpleValue,
 			boolean areColumnsNullableByDefault,
 			ColumnNamingDelegate columnNamingDelegate) {
-		Table table = simpleValue.getTable();
+		final Table table = simpleValue.getTable();
 
 		final Column column = new Column();
 		column.setValue( simpleValue );

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java
@@ -187,8 +187,6 @@ public static TemporaryTable createIdTable(
 										column.getText( dialect ),
 										jdbcMapping,
 										column.getSqlType(
-												runtimeModelCreationContext.getTypeConfiguration(),
-												dialect,
 												runtimeModelCreationContext.getMetadata()
 										),
 										column.getColumnSize(
@@ -234,8 +232,6 @@ public static TemporaryTable createIdTable(
 																			column.getText( dialect ),
 																			selection.getJdbcMapping(),
 																			column.getSqlType(
-																					runtimeModelCreationContext.getTypeConfiguration(),
-																					dialect,
 																					runtimeModelCreationContext.getMetadata()
 																			),
 																			column.getColumnSize(
@@ -289,8 +285,6 @@ public static TemporaryTable createEntityTable(
 											ENTITY_TABLE_IDENTITY_COLUMN,
 											jdbcMapping,
 											column.getSqlType(
-													runtimeModelCreationContext.getTypeConfiguration(),
-													dialect,
 													runtimeModelCreationContext.getMetadata()
 											) + " " +
 											dialect.getIdentityColumnSupport().getIdentityColumnString( column.getSqlTypeCode( runtimeModelCreationContext.getMetadata() ) ),
@@ -325,8 +319,6 @@ public static TemporaryTable createEntityTable(
 										column.getText( dialect ),
 										jdbcMapping,
 										column.getSqlType(
-												runtimeModelCreationContext.getTypeConfiguration(),
-												dialect,
 												runtimeModelCreationContext.getMetadata()
 										),
 										column.getColumnSize(
@@ -349,8 +341,6 @@ public static TemporaryTable createEntityTable(
 										discriminator.getText( dialect ),
 										discriminatorMapping.getJdbcMapping(),
 										discriminator.getSqlType(
-												runtimeModelCreationContext.getTypeConfiguration(),
-												dialect,
 												runtimeModelCreationContext.getMetadata()
 										),
 										discriminator.getColumnSize(
@@ -381,8 +371,6 @@ public static TemporaryTable createEntityTable(
 																	selectable.getText( dialect ),
 																	selection.getJdbcMapping(),
 																	column.getSqlType(
-																			runtimeModelCreationContext.getTypeConfiguration(),
-																			dialect,
 																			runtimeModelCreationContext.getMetadata()
 																	),
 																	column.getColumnSize(

diff --git a/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java b/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java
@@ -13,7 +13,6 @@
 import org.hibernate.FetchMode;
 import org.hibernate.MappingException;
 import org.hibernate.boot.model.relational.Database;
-import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.engine.spi.Mapping;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.mapping.Column;