[hibernate-commits] Hibernate SVN: r11619 - branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg.

[hibernate-commits at lists.jboss.org]

Author: max.andersen at jboss.com
Date: 2007-06-04 08:56:41 -0400 (Mon, 04 Jun 2007)
New Revision: 11619

Modified:
   branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java
Log:
better info 

Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java	2007-06-04 12:54:49 UTC (rev 11618)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java	2007-06-04 12:56:41 UTC (rev 11619)
@@ -423,6 +423,7 @@
 		boolean naturalId;
 		
 		if (keyColumns.size()>1) {
+			log.debug("id strategy for " + rc.getEntityName() + " since it has a multiple column primary key");
 			tableIdentifierStrategyName = "assigned";
 			naturalId = true;
 			
@@ -441,7 +442,9 @@
 					suggestedStrategy = "assigned";
 				}
 				tableIdentifierStrategyName = suggestedStrategy;
-			}			
+			} else {
+				tableIdentifierStrategyName = suggestedStrategy;
+			}
 			
 			naturalId = "assigned".equals( tableIdentifierStrategyName );
 			Column pkc = (Column) keyColumns.get(0);
@@ -457,7 +460,7 @@
 			processed.add(pkc);
 		} 
 		id.setIdentifierGeneratorStrategy(tableIdentifierStrategyName);
-		id.setIdentifierGeneratorProperties(revengStrategy.getTableIdentifierProperties(tableIdentifier));
+		id.setIdentifierGeneratorProperties(revengStrategy.getTableIdentifierProperties(tableIdentifier));		
 		if(naturalId) {
 			id.setNullValue("undefined");
 		}