[teiid-commits] teiid SVN: r3611 - in trunk/connectors/translator-jdbc/src/main: resources/org/teiid/translator/jdbc and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-11-03 23:46:49 -0400 (Thu, 03 Nov 2011)
New Revision: 3611

Modified:
   trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java
   trunk/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties
Log:
TEIID-669 adding support for JDBC native queries in metadata

Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java	2011-11-04 02:53:58 UTC (rev 3610)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java	2011-11-04 03:46:49 UTC (rev 3611)
@@ -205,11 +205,11 @@
 	    				buffer.append(o);
 	    			} else {
 	    				Integer i = (Integer)o;
-	    				if (obj.getArguments().size() <= i) {
-	    					throw new IllegalArgumentException("Invalid parameter {0}.  Must be less than or equal to {1}.");
+	    				if (i < 0 || i >= obj.getArguments().size()) {
+	    					throw new IllegalArgumentException(JDBCPlugin.Util.getString("SQLConversionVisitor.invalid_parameter", i+1, obj.getArguments().size())); //$NON-NLS-1$
 	    				}
 	    				if (obj.getArguments().get(i).getDirection() != Direction.IN) {
-	    					throw new IllegalArgumentException("Native query procedures cannot use non IN parameters.");
+	    					throw new IllegalArgumentException(JDBCPlugin.Util.getString("SQLConversionVisitor.not_in_parameter", i+1)); //$NON-NLS-1$
 	    				}
 	    				visit(obj.getArguments().get(i));
 	    				if (this.prepared) {

Modified: trunk/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties
===================================================================
--- trunk/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties	2011-11-04 02:53:58 UTC (rev 3610)
+++ trunk/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties	2011-11-04 03:46:49 UTC (rev 3611)
@@ -26,7 +26,8 @@
 
 
 JDBCQueryExecution.Error_executing_query__1 = ''{0}'' error executing statement(s): {1}
+SQLConversionVisitor.invalid_parameter=Invalid parameter {0}.  Must be between 1 and {1}.
+SQLConversionVisitor.not_in_parameter=Invalid parameter {0}. Native query procedures cannot use non IN parameters.
 
-
 ConnectionListener.failed_to_report_jdbc_connection_details=Failed to report the JDBC driver and connection information
 JDBCMetadataProcessor.not_unique=Teiid runtime names, which are case insensitive, for the imported metadata are not unique.  If not already set, use the setting importer.useFullSchemaName to create Teiid names that include the source schema.
\ No newline at end of file