TEIIDDES-2287 Added check for parameter names against reserved words …

…and d-quoting them
Teiid-Designer · Oct 3, 2014 · 6a73660 · 6a73660
1 parent 3af86d6
commit 6a73660
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...ns/teiid/org.teiid.runtime.client/src/org/teiid/runtime/client/proc/ProcedureService.java b/...ns/teiid/org.teiid.runtime.client/src/org/teiid/runtime/client/proc/ProcedureService.java
@@ -25,6 +25,7 @@
 import org.teiid.designer.query.proc.wsdl.IWsdlWrapperInfo;
 import org.teiid.designer.query.sql.ISQLConstants;
 import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
+import org.teiid.language.SQLConstants;
 import org.teiid.query.proc.wsdl.WsdlRequestProcedureHelper;
 import org.teiid.query.proc.wsdl.WsdlResponseProcedureHelper;
 import org.teiid.query.proc.wsdl.WsdlWrapperHelper;
@@ -311,7 +312,12 @@ public String getSQLStatement(ITeiidXmlFileInfo xmlFileInfo,
         	 if (param.getType().equals(Parameter.Type.Query)) {
         		 isQueryParm=true;
         		 if (c==1) tokens.add(xmlFileInfo.getXmlFileUrl());
-        		 sb.append(relationalViewModelName).append(DOT).append(virtualProcedureName).append(DOT).append(param.getName()).append(SPACE).append(AS).append(SPACE).append(param.getName());
+        		 // Check for Reserved Word
+        		 String paramName = param.getName();
+        		 if( SQLConstants.isReservedWord(teiidVersion, paramName) ) {
+        			 paramName = D_QUOTE + paramName + D_QUOTE;
+        		 }
+        		 sb.append(relationalViewModelName).append(DOT).append(virtualProcedureName).append(DOT).append(paramName).append(SPACE).append(AS).append(SPACE).append(paramName);
         		 if(c < (parameters.size())) {
                      sb.append(COMMA).append(SPACE);
                  }