db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From be...@apache.org
Subject svn commit: r551878 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
Date Fri, 29 Jun 2007 13:01:02 GMT
Author: bernt
Date: Fri Jun 29 06:01:01 2007
New Revision: 551878

URL: http://svn.apache.org/viewvc?view=rev&rev=551878
Log:
DERBY-2145 Fixed EmbedDatabaseMetaData.getFunctionColumns to match the changed numbers of
parameters in the query

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?view=diff&rev=551878&r1=551877&r2=551878
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
Fri Jun 29 06:01:01 2007
@@ -1633,17 +1633,11 @@
 		throws SQLException {
 		PreparedStatement s = getPreparedQuery("getFunctionColumns");
 
-		// Cannot use doGetProcCols() because our query requires
-		// parameterNamePattern twice, because both LIKE and = is
-		// required to select parameters with an empty parameter
-		// name. That is, WHERE paramName LIKE ? will not match an
-		// empty paramName, but WHERE paramName LIKE ? OR paramName =
-		// ? will.
-		s.setString(1, swapNull(schemaPattern));
-		s.setString(2, swapNull(functionNamePattern));
-		s.setString(3, swapNull(parameterNamePattern));
-		s.setString(4, swapNull(parameterNamePattern));
-		return s.executeQuery();
+        return doGetProcCols(catalog, 
+                             schemaPattern,
+                             functionNamePattern, 
+                             parameterNamePattern,	
+                             "getFunctionColumns");
 	}
 
 	/**



Mime
View raw message