[teiid-commits] teiid SVN: r2960 - in trunk/engine/src/main: resources/org/teiid/query and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-03-03 14:29:04 -0500 (Thu, 03 Mar 2011)
New Revision: 2960

Modified:
   trunk/engine/src/main/java/org/teiid/query/validator/UpdateValidator.java
   trunk/engine/src/main/resources/org/teiid/query/i18n.properties
Log:
TEIID-1483 updating several validation messages

Modified: trunk/engine/src/main/java/org/teiid/query/validator/UpdateValidator.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/validator/UpdateValidator.java	2011-03-02 20:41:34 UTC (rev 2959)
+++ trunk/engine/src/main/java/org/teiid/query/validator/UpdateValidator.java	2011-03-03 19:29:04 UTC (rev 2960)
@@ -426,9 +426,9 @@
     	}
     	
     	if (query.getFrom().getClauses().size() > 1 || (!(query.getFrom().getClauses().get(0) instanceof UnaryFromClause))) {
-    	    String warning = QueryPlugin.Util.getString("ERR.015.012.0009", query.getFrom());
-    		updateReport.handleValidationWarning(warning); //$NON-NLS-1$
-    		deleteReport.handleValidationWarning(warning); //$NON-NLS-1$
+    	    String warning = QueryPlugin.Util.getString("ERR.015.012.0009", query.getFrom()); //$NON-NLS-1$
+    		updateReport.handleValidationWarning(warning); 
+    		deleteReport.handleValidationWarning(warning);
     		updateInfo.isSimple = false;
     	}
     	List<GroupSymbol> allGroups = query.getFrom().getGroups();

Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/org/teiid/query/i18n.properties	2011-03-02 20:41:34 UTC (rev 2959)
+++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties	2011-03-03 19:29:04 UTC (rev 2960)
@@ -168,7 +168,7 @@
 ERR.015.012.0006 = The updatable view query must not use aggregates or grouping.
 ERR.015.012.0007 = The updatable view query has a non-updatable expression {0} for view column {1}.
 ERR.015.012.0008 = The updatable view query cannot use SELECT DISTINCT.
-ERR.015.012.0009 = The updatable view query has a join, pass-through processing will not be used for UPDATE/DELETE operations.
+ERR.015.012.0009 = The updatable view query has a FROM clause that is not a single table, pass-through processing will not be used for UPDATE/DELETE operations.
 ERR.015.012.0010 = The updatable view query does not project the column {0}, which is required to make {1} a target of INSERT operations.
 ERR.015.012.0011 = There must be exactly one projected symbol in the subcommand of an IN clause.
 ERR.015.012.0012 = An AssignmentStatement cannot change the value of a {0} or {1} variable.
@@ -177,7 +177,7 @@
 ERR.015.012.0015 = The query defining an updatable view has no valid target for INSERTs.
 ERR.015.012.0016 = Variable {0} not assigned any value in this procedure.
 ERR.015.012.0017 = Variables declared the procedure''s DeclareStatement cannot be one of the special variables: {0}, {1} and {2}.
-ERR.015.012.0018 = Inherent INSERT is not possible on a view defined by a UNION.
+ERR.015.012.0018 = Inherent INSERT is not possible on a view defined by a non-partitioned UNION.
 ERR.015.012.0019 = Translate/HasCriteria cannot be used in a non-update procedure.
 ERR.015.012.0021 = Element being translated in the WITH clause not among the elements on the ON clause of the TranslateCriteria.
 ERR.015.012.0022 = Unable to translate criteria on the update command against the virtual group, the element {0} is mapped to an aggregate symbol in the virtual group''s query transform, and cannot be translated.