[Hibernate-commits] Hibernate Code SVN: r9603 - trunk/HibernateExt/metadata/src/java/org/hibernate/cfg

[<hib...@li...>]

Author: epbernard
Date: 2006-03-11 14:13:47 -0500 (Sat, 11 Mar 2006)
New Revision: 9603

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
Log:
ANN-258

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2006-03-11 18:52:32 UTC (rev 9602)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2006-03-11 19:13:47 UTC (rev 9603)
@@ -1600,8 +1600,12 @@
 
 		//value.createForeignKey();
 		String path = propertyHolder.getPath() + "." + propertyName;
-		mappings.addSecondPass( new FkSecondPass( value, columns, unique, path, mappings ) );
-
+		mappings.addSecondPass(
+				new FkSecondPass(
+						value, columns,
+					!optional && unique, //cannot have nullabe and unique on certain DBs
+					path, mappings )
+		);
 		Ejb3Column.checkPropertyConsistency( columns, propertyHolder.getEntityName() + propertyName );
 		PropertyBinder binder = new PropertyBinder();
 		binder.setName( propertyName );