[teiid-commits] teiid SVN: r4395 - in trunk/api/src/main: java/org/teiid/metadata and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-09-04 07:53:12 -0400 (Tue, 04 Sep 2012)
New Revision: 4395

Modified:
   trunk/api/src/main/java/org/teiid/connector/DataPlugin.java
   trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java
   trunk/api/src/main/resources/org/teiid/connector/i18n.properties
Log:
TEIID-2183 fixing duplicate column message

Modified: trunk/api/src/main/java/org/teiid/connector/DataPlugin.java
===================================================================
--- trunk/api/src/main/java/org/teiid/connector/DataPlugin.java	2012-09-03 11:25:19 UTC (rev 4394)
+++ trunk/api/src/main/java/org/teiid/connector/DataPlugin.java	2012-09-04 11:53:12 UTC (rev 4395)
@@ -45,6 +45,7 @@
 		TEIID60012,
 		TEIID60013,
 		TEIID60014,
-		TEIID60015
+		TEIID60015, 
+		TEIID60016
 	}
 }

Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java	2012-09-03 11:25:19 UTC (rev 4394)
+++ trunk/api/src/main/java/org/teiid/metadata/MetadataFactory.java	2012-09-04 11:53:12 UTC (rev 4395)
@@ -144,7 +144,7 @@
 			 throw new TranslatorException(DataPlugin.Event.TEIID60008, DataPlugin.Util.gs(DataPlugin.Event.TEIID60008, name));
 		}
 		if (table.getColumnByName(name) != null) {
-			throw new DuplicateRecordException(DataPlugin.Util.gs(DataPlugin.Event.TEIID60013, table.getFullName() + AbstractMetadataRecord.NAME_DELIM_CHAR + name));
+			throw new DuplicateRecordException(DataPlugin.Util.gs(DataPlugin.Event.TEIID60016, table.getFullName() + AbstractMetadataRecord.NAME_DELIM_CHAR + name));
 		}
 		Column column = new Column();
 		column.setName(name);

Modified: trunk/api/src/main/resources/org/teiid/connector/i18n.properties
===================================================================
--- trunk/api/src/main/resources/org/teiid/connector/i18n.properties	2012-09-03 11:25:19 UTC (rev 4394)
+++ trunk/api/src/main/resources/org/teiid/connector/i18n.properties	2012-09-04 11:53:12 UTC (rev 4395)
@@ -25,8 +25,8 @@
 TEIID60013=Duplicate Table {0}
 TEIID60014=Duplicate Procedure {0}
 TEIID60015=Duplicate Function {0}
+TEIID60016=Duplicate Column {0}
 
-
 TEIID60009=Unknown datatype {0}
 TEIID60011=No column found with name {0}
 TEIID60008=Invalid column name ''{0}'', cannot contain the . character.