HHH-8263 secondary table's primary key is not created

hibernate · May 23, 2013 · cc5b4b2 · cc5b4b2
1 parent 3e59f96
commit cc5b4b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java
@@ -900,6 +900,8 @@ private void bindSecondaryTables(
 									entityBinding.getPrimaryTable().getLogicalName().getText()
 							)
 					);
+					joinColumn.setNullable( false );
+					table.getPrimaryKey().addColumn( joinColumn );
 					joinRelationalValueBindings.add( new RelationalValueBinding( entityBinding.getPrimaryTable(), joinColumn, true, false ) );
 				}
 			}
@@ -926,6 +928,8 @@ private void bindSecondaryTables(
 						if ( joinColumnSource.getSqlType() != null ) {
 							column.setSqlType( joinColumnSource.getSqlType() );
 						}
+						column.setNullable( false );
+						table.getPrimaryKey().addColumn( column );
 					}
 					joinRelationalValueBindings.add( new RelationalValueBinding( table, column, true, false ) );
 				}
@@ -953,6 +957,9 @@ private void bindSecondaryTables(
 			secondaryTable.setInverse( secondaryTableSource.isInverse() );
 			secondaryTable.setOptional( secondaryTableSource.isOptional() );
 			secondaryTable.setCascadeDeleteEnabled( secondaryTableSource.isCascadeDeleteEnabled() );
+			if ( secondaryTable.isCascadeDeleteEnabled() ) {
+				foreignKey.setDeleteRule( ForeignKey.ReferentialAction.CASCADE );
+			}
 			entityBinding.addSecondaryTable( secondaryTable );
 		}
 	}

diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCTest.java
@@ -92,7 +92,6 @@ public void testHigherLevelIndexDefinition() throws Throwable {
 	}
 
 	@Test
-	@FailureExpectedWithNewMetamodel
 	public void testSubclassing() throws Exception {
 		Session s = openSession();
 		Transaction t = s.beginTransaction();