From ead0410b81a93266be0f999034e80e752387c59e Mon Sep 17 00:00:00 2001
From: teo_sarca <devnull@localhost>
Date: Sun, 4 Feb 2007 18:51:42 +0000
Subject: [PATCH] bug fix [ 1651801 ] GenerateModel: duplicate "getKeyNamePair"
 methods * added carlos suggestion: now if there are more then one primary
 identifiers for a table, entire generation will fail

---
 dbPort/src/org/compiere/util/GenerateModel.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dbPort/src/org/compiere/util/GenerateModel.java b/dbPort/src/org/compiere/util/GenerateModel.java
index 6c371bba6e..d6c8135fb9 100644
--- a/dbPort/src/org/compiere/util/GenerateModel.java
+++ b/dbPort/src/org/compiere/util/GenerateModel.java
@@ -278,9 +278,15 @@ public class GenerateModel
 					defaultValue, ValueMin, ValueMax, VFormat,
 					Callout, Name, Description, virtualColumn, IsEncrypted));
 				//	
-				if (!isKeyNamePairCreated && seqNo == 1 && "Y".equals(rs.getString("IsIdentifier"))) {
-					sb.append(createKeyNamePair(columnName, displayType));
-					isKeyNamePairCreated = true;
+				if (seqNo == 1 && "Y".equals(rs.getString("IsIdentifier"))) {
+					if (!isKeyNamePairCreated) {
+						sb.append(createKeyNamePair(columnName, displayType));
+						isKeyNamePairCreated = true;
+					}
+					else {
+						throw new RuntimeException("More than one primary identifier found "
+								+ " (AD_Table_ID=" + AD_Table_ID + ", ColumnName=" + columnName + ")");
+					}
 				}
 			}
 			rs.close();