svn commit: r711279 - in /jakarta/jmeter/trunk: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java xdocs/changes.xml xdocs/usermanual/component_reference.xml

[se...@apache.org]

Author: sebb
Date: Tue Nov  4 07:55:01 2008
New Revision: 711279

URL: http://svn.apache.org/viewvc?rev=711279&view=rev
Log:
JDBC Request now handles arbitray variable types

Modified:
    jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
    jakarta/jmeter/trunk/xdocs/changes.xml
    jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java?rev=711279&r1=711278&r2=711279&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java Tue Nov  4 07:55:01 2008
@@ -346,7 +346,11 @@
     private static int getJdbcType(String jdbcType) throws SQLException {
         Integer entry = (Integer)mapJdbcNameToInt.get(jdbcType.toLowerCase(java.util.Locale.ENGLISH));
         if (entry == null) {
-            throw new SQLException("Invalid data type: "+jdbcType);
+            try {
+                entry = Integer.decode(jdbcType);
+            } catch (NumberFormatException e) {
+                throw new SQLException("Invalid data type: "+jdbcType);
+            }
         }
         return (entry).intValue();
     }

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=711279&r1=711278&r2=711279&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Nov  4 07:55:01 2008
@@ -172,6 +172,7 @@
 <li>Use Script to evaluate __jexl() function so can have multiple statements.</li>
 <li>JDBC Request can optionally save the results of Select statements to variables.</li>
 <li>JDBC Request now handles quoted strings.</li>
+<li>JDBC Request now handles arbitray variable types.</li>
 </ul>
 
 <h3>Non-functional changes</h3>

Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=711279&r1=711278&r2=711279&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Tue Nov  4 07:55:01 2008
@@ -389,6 +389,9 @@
         appropriate parameter types, e.g. instead of "INTEGER", use "INOUT INTEGER".
         If not specified, "IN" is assumed, i.e. "DATE" is the same as "IN DATE".
         <br></br>
+        If the type is not one of the standard Java SQL types, versions of JMeter after 2.3.2 also
+        accept the corresponding integer number, e.g. INTEGER == 4.
+        <br></br>
         There must be as many types as there are placeholders in the statement.
         </property>
         <property name="Variable Names" required="No">Comma-separated list of variable names to hold values returned by Select statements</property>



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org