HHH-14407 NPE in Column.getSqlTypeCode(Mapping mapping) for column 'hib_sess_id' when using PersistentTableBulkIdStrategy

hibernate-core/src/main/java/org/hibernate/hql/spi/id/AbstractMultiTableBulkIdStrategyImpl.java

@@ -137,13 +137,13 @@ public abstract class AbstractMultiTableBulkIdStrategyImpl<TT extends IdTableInf
 				.append( jdbcEnvironment.getQualifiedObjectNameFormatter().format( idTable.getQualifiedTableName(), dialect ) )
 				.append( " (" );
 
-		Iterator itr = idTable.getColumnIterator();
+		Iterator<Column> itr = idTable.getColumnIterator();
 		while ( itr.hasNext() ) {
-			final Column column = (Column) itr.next();
+			final Column column = itr.next();
 			buffer.append( column.getQuotedName( dialect ) ).append( ' ' );
 			buffer.append( column.getSqlType( dialect, metadata ) );
 
-			final int sqlTypeCode = column.getSqlTypeCode( metadata );
+			final int sqlTypeCode = column.getSqlTypeCode() != null ? column.getSqlTypeCode() : column.getSqlTypeCode( metadata );
 			final String columnAnnotation = dialect.getCreateTemporaryTableColumnAnnotation( sqlTypeCode );
 			if ( !columnAnnotation.isEmpty() ) {
 				buffer.append(" ").append( columnAnnotation );

hibernate-core/src/main/java/org/hibernate/hql/spi/id/persistent/PersistentTableBulkIdStrategy.java

@@ -6,6 +6,8 @@
  */
 package org.hibernate.hql.spi.id.persistent;
 
+import java.sql.Types;
+
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.relational.QualifiedTableName;
 import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -111,6 +113,7 @@ public class PersistentTableBulkIdStrategy
 	protected void augmentIdTableDefinition(Table idTable) {
 		Column sessionIdColumn = new Column( Helper.SESSION_ID_COLUMN_NAME );
 		sessionIdColumn.setSqlType( "CHAR(36)" );
+		sessionIdColumn.setSqlTypeCode( Types.VARCHAR );
 		sessionIdColumn.setComment( "Used to hold the Hibernate Session identifier" );
 		idTable.addColumn( sessionIdColumn );
 	}

hibernate-core/src/test/java/org/hibernate/id/hhh14407/ChildEntity.java

@@ -0,0 +1,23 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.id.hhh14407;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+/**
+ * @author Sönke Reimer
+ */
+@Entity(name="ChildEntity")
+class ChildEntity extends ParentEntity {
+
+  @Basic
+  @Column(name="CHILD")
+  private String ivChild;
+
+}

hibernate-core/src/test/java/org/hibernate/id/hhh14407/ParentEntity.java

@@ -0,0 +1,34 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.id.hhh14407;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Version;
+
+/**
+ * @author Sönke Reimer
+ */
+@Entity(name="ParentEntity")
+@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
+class ParentEntity {
+
+  @Id
+  @Column(name = "ID", length = 32)
+  private String Id;
+
+  @Version
+  @Column(name = "LOCK_VERSION")
+  private int Lock_Version;
+  public String getId() {
+    return Id;
+  }
+  
+}

hibernate-core/src/test/java/org/hibernate/id/hhh14407/PersistentTableBulkIdStrategyNPETest.java

@@ -0,0 +1,58 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.id.hhh14407;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
+import org.hibernate.hql.spi.id.persistent.PersistentTableBulkIdStrategy;
+
+import org.hibernate.testing.RequiresDialect;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.Test;
+
+/**
+ * @author Nathan Xu
+ * @author Sönke Reimer
+ */
+@RequiresDialect( value = H2Dialect.class )
+@TestForIssue( jiraKey = "HHH14407" )
+public class PersistentTableBulkIdStrategyNPETest extends BaseCoreFunctionalTestCase {
+
+	@Override
+	protected void configure(Configuration configuration) {
+		configuration.setProperty(
+				Environment.DIALECT,
+				PersistentTableBulkIdH2Dialect.class.getName()
+		);
+	}
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] {
+				ParentEntity.class,
+				ChildEntity.class
+		};
+	}
+
+	@Test
+	public void hhh14407Test() {
+		// without fix of HHH14407, the test case will trigger exception due to NPE in PersistentTableBulkIdStrategy
+	}
+
+	public static class PersistentTableBulkIdH2Dialect extends H2Dialect {
+
+		@Override
+		public MultiTableBulkIdStrategy getDefaultMultiTableBulkIdStrategy() {
+			return new PersistentTableBulkIdStrategy();
+		}
+
+	}
+
+}