HHH-15561 - Fixed and added test for issue

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java

@@ -20,6 +20,7 @@
 import org.hibernate.dialect.function.StandardSQLFunction;
 import org.hibernate.dialect.function.VarArgsSQLFunction;
 import org.hibernate.dialect.hint.IndexQueryHintHandler;
+import org.hibernate.dialect.identity.H2FinalTableIdentityColumnSupport;
 import org.hibernate.dialect.identity.H2IdentityColumnSupport;
 import org.hibernate.dialect.identity.IdentityColumnSupport;
 import org.hibernate.dialect.pagination.AbstractLimitHandler;
@@ -505,7 +506,7 @@ public boolean supportsIfExistsBeforeTableName() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return new H2IdentityColumnSupport();
+		return isVersion2 ? H2FinalTableIdentityColumnSupport.INSTANCE : H2IdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/dialect/identity/H2FinalTableIdentityColumnSupport.java

@@ -0,0 +1,29 @@
+/*
+ * 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.dialect.identity;
+
+/**
+ * Identity column support for H2 2+ versions
+ * @author Jan Schatteman
+ */
+public class H2FinalTableIdentityColumnSupport extends H2IdentityColumnSupport {
+
+	public static final H2FinalTableIdentityColumnSupport INSTANCE = new H2FinalTableIdentityColumnSupport();
+
+	private H2FinalTableIdentityColumnSupport() {
+	}
+
+	@Override
+	public boolean supportsInsertSelectIdentity() {
+		return true;
+	}
+
+	@Override
+	public String appendIdentitySelectToInsert(String identityColumnName, String insertString) {
+		return "select " + identityColumnName + " from final table ( " + insertString + " )";
+	}
+}

hibernate-core/src/main/java/org/hibernate/dialect/identity/H2IdentityColumnSupport.java

@@ -10,6 +10,12 @@
  * @author Andrea Boriero
  */
 public class H2IdentityColumnSupport extends IdentityColumnSupportImpl {
+
+	public static final H2IdentityColumnSupport INSTANCE = new H2IdentityColumnSupport();
+
+	protected H2IdentityColumnSupport() {
+	}
+
 	@Override
 	public boolean supportsIdentityColumns() {
 		return true;

hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java

@@ -56,6 +56,23 @@ public interface IdentityColumnSupport {
 	 */
 	String appendIdentitySelectToInsert(String insertString);
 
+	/**
+	 * Provided we {@link #supportsInsertSelectIdentity}, then attach the
+	 * "select identity" clause to the  insert statement.
+	 * <p/>
+	 * Note, if {@link #supportsInsertSelectIdentity} == false then
+	 * the insert-string should be returned without modification.
+	 *
+	 * @param identityColumnName The name of the identity column
+	 * @param insertString The insert command
+	 *
+	 * @return The insert command with any necessary identity select
+	 * clause attached.
+	 */
+	default String appendIdentitySelectToInsert(String identityColumnName, String insertString) {
+		return appendIdentitySelectToInsert( insertString );
+	}
+
 	/**
 	 * Get the select command to use to retrieve the last generated IDENTITY
 	 * value for a particular table

hibernate-core/src/main/java/org/hibernate/id/insert/InsertSelectIdentityInsert.java

@@ -6,6 +6,7 @@
  */
 package org.hibernate.id.insert;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.sql.Insert;
 
 /**
  * Specialized IdentifierGeneratingInsert which appends the database
@@ -15,11 +16,18 @@
  * @author Steve Ebersole
  */
 public class InsertSelectIdentityInsert extends IdentifierGeneratingInsert {
+	protected String identityColumnName;
+
+	public Insert addIdentityColumn(String columnName) {
+		identityColumnName = columnName;
+		return super.addIdentityColumn( columnName );
+	}
+
 	public InsertSelectIdentityInsert(Dialect dialect) {
 		super( dialect );
 	}
 
 	public String toStatementString() {
-		return getDialect().getIdentityColumnSupport().appendIdentitySelectToInsert( super.toStatementString() );
+		return getDialect().getIdentityColumnSupport().appendIdentitySelectToInsert( identityColumnName, super.toStatementString() );
 	}
 }

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -2941,7 +2941,7 @@ else if ( includeProperty[i] ) {
 
 		// append the SQL to return the generated identifier
 		if ( j == 0 && identityInsert && useInsertSelectIdentity() ) { //TODO: suck into Insert
-			result = getFactory().getDialect().getIdentityColumnSupport().appendIdentitySelectToInsert( result );
+			result = getFactory().getDialect().getIdentityColumnSupport().appendIdentitySelectToInsert( getKeyColumns( 0 )[0], result );
 		}
 
 		return result;

hibernate-core/src/test/java/org/hibernate/id/IdentityIdEntityTest.java

@@ -0,0 +1,122 @@
+/*
+ * 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;
+
+import java.util.Date;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.testing.RequiresDialect;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+
+import org.junit.Test;
+
+import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
+import static org.junit.Assert.fail;
+
+
+/**
+ * @author Jan Schatteman
+ */
+@TestForIssue(jiraKey = "HHH-15561")
+@RequiresDialect( value = { H2Dialect.class } )
+public class IdentityIdEntityTest extends BaseUnitTestCase {
+
+	@Test
+	public void testIdentityEntityWithDisabledGetGeneratedKeys() {
+		StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
+				.applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" )
+				.applySetting( AvailableSettings.USE_GET_GENERATED_KEYS, "false" )
+				.build();
+
+		Metadata metadata = new MetadataSources( serviceRegistry )
+				.addAnnotatedClass( IdentityEntity.class )
+				.buildMetadata();
+
+		SessionFactory sessionFactory = metadata.getSessionFactoryBuilder()
+				.build();
+
+		doInHibernate(
+				() -> sessionFactory,
+				session -> {
+					try {
+						IdentityEntity ie = new IdentityEntity();
+						ie.setTimestamp( new Date() );
+						session.persist( ie );
+					}
+					catch (Exception e) {
+						fail( "Creation of an IDENTITY-id-based entity failed when \"hibernate.jdbc.use_get_generated_keys\" was set to false (" + e.getMessage() + ")" );
+					}
+				}
+		);
+	}
+
+	@Test
+	public void testIdentityEntityWithDisabledJdbcMetadataDefaults() {
+		StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
+				.applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" )
+				.applySetting( "use_jdbc_metadata_defaults", "false" )
+				.build();
+
+		Metadata metadata = new MetadataSources( serviceRegistry )
+				.addAnnotatedClass( IdentityEntity.class )
+				.buildMetadata();
+
+		SessionFactory sessionFactory = metadata.getSessionFactoryBuilder()
+				.build();
+
+		doInHibernate(
+				() -> sessionFactory,
+				session -> {
+					try {
+						IdentityEntity ie = new IdentityEntity();
+						ie.setTimestamp( new Date() );
+						session.persist( ie );
+					}
+					catch (Exception e) {
+						fail( "Creation of an IDENTITY-id-based entity failed when \"use_jdbc_metadata_defaults\" was set to false (" + e.getMessage() + ")" );
+					}
+				}
+		);
+	}
+
+	@Entity(name = "id_entity")
+	public static class IdentityEntity {
+		@Id
+		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		private int id;
+
+		private Date timestamp;
+
+		public int getId() {
+			return id;
+		}
+
+		public void setId(int id) {
+			this.id = id;
+		}
+
+		public Date getTimestamp() {
+			return timestamp;
+		}
+
+		public void setTimestamp(Date timestamp) {
+			this.timestamp = timestamp;
+		}
+	}
+
+}