db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r424451 - in /db/derby/code/branches/10.1/java: drda/org/apache/derby/impl/drda/ engine/org/apache/derby/iapi/jdbc/ engine/org/apache/derby/impl/jdbc/
Date Fri, 21 Jul 2006 20:44:26 GMT
Author: mikem
Date: Fri Jul 21 13:44:25 2006
New Revision: 424451

URL: http://svn.apache.org/viewvc?rev=424451&view=rev
Log:
committing backport of fix from trunk to 10.1 on behalf of Sunitha Kambhampati

DERBY-1227 Network Server should not use the underlying embedded prepared statement when accessing
a BrokeredPreparedStatement

-- Added new interfaces EnginePreparedStatement and EngineParameterMetaData for use in network
server.
-- Made changes to server code to use these interfaces and thus have a consistent way of handling
the PreparedStatement whether it is a EmbedPreparedStatement or BrokeredPreparedStatement.

Backport from trunk, the original changes went as part of DERBY-1015.

svn merge -r 421434:421435 https://svn.apache.org/repos/asf/db/derby/code/trunk/
svn merge -r 421459:421460 https://svn.apache.org/repos/asf/db/derby/code/trunk/


Added:
    db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EngineParameterMetaData.java
  (with props)
    db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EnginePreparedStatement.java
  (with props)
Modified:
    db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
    db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
    db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java

Modified: db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=424451&r1=424450&r2=424451&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Fri
Jul 21 13:44:25 2006
@@ -54,7 +54,7 @@
 import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
-import org.apache.derby.impl.jdbc.EmbedParameterSetMetaData;
+import org.apache.derby.iapi.jdbc.EngineParameterMetaData;
 import org.apache.derby.impl.jdbc.EmbedPreparedStatement;
 import org.apache.derby.impl.jdbc.EmbedSQLException;
 import org.apache.derby.impl.jdbc.EmbedStatement;
@@ -3759,7 +3759,6 @@
 	private void writeSQLRSLRD(DRDAStatement stmt) throws DRDAProtocolException,SQLException
 	{
 
-		EmbedPreparedStatement ps = (EmbedPreparedStatement) stmt.getPreparedStatement();
 		int numResults = stmt.getNumResultSets();
 
 		writer.createDssObject();
@@ -3831,7 +3830,7 @@
 		String strVal;
 		PreparedStatement ps = stmt.getPreparedStatement();
 		int codePoint;
-		EmbedParameterSetMetaData pmeta = null;
+		EngineParameterMetaData pmeta = null;
 		Vector paramDrdaTypes = new Vector();
 		Vector paramLens = new Vector();
 		ArrayList paramExtPositions = null;
@@ -3977,7 +3976,7 @@
 	 * @exception DRDAProtocolException, SQLException
 	 */
 	private ArrayList readAndSetParams(int i, DRDAStatement stmt, int
-									   drdaType, EmbedParameterSetMetaData pmeta,
+									   drdaType, EngineParameterMetaData pmeta,
 									   ArrayList paramExtPositions,
 									   int paramLenNumBytes)
 				throws DRDAProtocolException, SQLException
@@ -5588,7 +5587,7 @@
 	{
 		PreparedStatement ps = stmt.getPreparedStatement();
 		ResultSetMetaData rsmeta = ps.getMetaData();
-		EmbedParameterSetMetaData pmeta = stmt.getParameterMetaData();
+		EngineParameterMetaData pmeta = stmt.getParameterMetaData();
 		int numElems = 0;
 		if (e == null || e instanceof SQLWarning)
 		{
@@ -5639,7 +5638,7 @@
 
 		ResultSet rs = null;
 		ResultSetMetaData rsmeta = null;
-		EmbedParameterSetMetaData pmeta = null;
+		EngineParameterMetaData pmeta = null;
 		if (!stmt.needsToSendParamData)
 			rs = stmt.getResultSet();
 		if (rs == null)		// this is a CallableStatement, use parameter meta data
@@ -5734,7 +5733,7 @@
 	 * @exception DRDAProtocolException, SQLException
 	 */
 	private void writeSQLDTAGRP(DRDAStatement stmt, ResultSetMetaData rsmeta, 
-								EmbedParameterSetMetaData pmeta,
+								EngineParameterMetaData pmeta,
 								int colStart, int colEnd, boolean first)
 		throws DRDAProtocolException, SQLException
 	{
@@ -6435,7 +6434,7 @@
 	 *
 	 * @exception DRDAProtocolException, SQLException
 	 */
-	private void writeSQLDAGRP(ResultSetMetaData rsmeta, EmbedParameterSetMetaData pmeta, int
elemNum, boolean rtnOutput)
+	private void writeSQLDAGRP(ResultSetMetaData rsmeta, EngineParameterMetaData pmeta, int
elemNum, boolean rtnOutput)
 		throws DRDAProtocolException, SQLException
 	{
 		//jdbc uses offset of 1
@@ -6570,14 +6569,14 @@
 	}
 
   
-	private void writeSQLUDTGRP(ResultSetMetaData rsmeta, EmbedParameterSetMetaData pmeta, int
jdbcElemNum, boolean rtnOutput)
+	private void writeSQLUDTGRP(ResultSetMetaData rsmeta, EngineParameterMetaData pmeta, int
jdbcElemNum, boolean rtnOutput)
 		throws DRDAProtocolException,SQLException
 	{
 		writer.writeByte(CodePoint.NULLDATA);
 
 	}
 
-	private void writeSQLDOPTGRP(ResultSetMetaData rsmeta, EmbedParameterSetMetaData pmeta,
int jdbcElemNum, boolean rtnOutput)
+	private void writeSQLDOPTGRP(ResultSetMetaData rsmeta, EngineParameterMetaData pmeta, int
jdbcElemNum, boolean rtnOutput)
 		throws DRDAProtocolException,SQLException
 	{
 
@@ -6597,7 +6596,7 @@
 	}
 
 
-	private void writeSQLDXGRP(ResultSetMetaData rsmeta, EmbedParameterSetMetaData pmeta, int
jdbcElemNum, boolean rtnOutput)
+	private void writeSQLDXGRP(ResultSetMetaData rsmeta, EngineParameterMetaData pmeta, int
jdbcElemNum, boolean rtnOutput)
 		throws DRDAProtocolException,SQLException
 	{
 		// Null indicator indicates we have data

Modified: db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/DRDAStatement.java?rev=424451&r1=424450&r2=424451&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/DRDAStatement.java (original)
+++ db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/DRDAStatement.java Fri
Jul 21 13:44:25 2006
@@ -39,10 +39,11 @@
 import org.apache.derby.iapi.jdbc.BrokeredPreparedStatement;
 import org.apache.derby.iapi.jdbc.EngineConnection;
 import org.apache.derby.iapi.jdbc.EngineStatement;
+import org.apache.derby.iapi.jdbc.EnginePreparedStatement;
+import org.apache.derby.iapi.jdbc.EngineParameterMetaData;
 import org.apache.derby.iapi.reference.JDBC30Translation;
 import org.apache.derby.iapi.sql.execute.ExecutionContext;
 import org.apache.derby.iapi.util.StringUtil;
-import org.apache.derby.impl.jdbc.EmbedParameterSetMetaData;
 import org.apache.derby.impl.jdbc.Util;
 
 /**
@@ -81,7 +82,7 @@
 	protected byte [] rslsetflg;		// Result Set Flags
 	protected int maxrslcnt;			// Maximum Result set count
 	protected PreparedStatement ps;     // Prepared statement
-	protected EmbedParameterSetMetaData stmtPmeta; // param metadata
+	protected EngineParameterMetaData stmtPmeta; // param metadata
 	protected boolean isCall;
 	protected String procName;			// callable statement's method name
 	private   int[] outputTypes;		// jdbc type for output parameter or NOT_OUTPUT_PARAM
@@ -535,11 +536,7 @@
 	 */
 	protected PreparedStatement getPreparedStatement() throws SQLException
 	{
-		if (ps instanceof BrokeredPreparedStatement)
-			return (PreparedStatement)(
-						   ((BrokeredPreparedStatement) ps).getStatement());
-		else
-			return ps;
+		return ps;
 	}
 
 
@@ -1152,7 +1149,7 @@
 	{
 		if (ps != null && ps instanceof CallableStatement)
 		{
-			EmbedParameterSetMetaData pmeta = 	getParameterMetaData();
+			EngineParameterMetaData pmeta = 	getParameterMetaData();
 
 			return Math.min(pmeta.getPrecision(index),
 							FdocaConstants.NUMERIC_MAX_PRECISION);
@@ -1173,7 +1170,7 @@
 	{
 		if (ps != null && ps instanceof CallableStatement)
 		{
-			EmbedParameterSetMetaData pmeta = 	getParameterMetaData();
+			EngineParameterMetaData pmeta = 	getParameterMetaData();
 			return Math.min(pmeta.getScale(index),FdocaConstants.NUMERIC_MAX_PRECISION);
 		}
 		else 
@@ -1335,7 +1332,7 @@
 
 	private void setupCallableStatementParams(CallableStatement cs) throws SQLException
 	{
-		EmbedParameterSetMetaData pmeta = 	getParameterMetaData();
+		EngineParameterMetaData pmeta = 	getParameterMetaData();
 		int numElems = pmeta.getParameterCount();
 
 		for ( int i = 0; i < numElems; i ++)
@@ -1566,31 +1563,21 @@
 
 	
 	/** 
-	 * Get parameter metadata from EmbedPreparedStatement or 
-	 * BrokeredPreparedStatement. We use reflection because we don't know which
-	 * we have.
-	 * 
-	 * @return EmbedParameterSetMetaData for the prepared statement. 
+	 * Retrieve the ParameterMetaData for the prepared statement. 
+     * To do so, use the engine defined interfaces:
+     * @see org.apache.derby.iapi.jdbc.EnginePreparedStatement
+     * @see org.apache.derby.iapi.jdbc.EngineParameterMetaData 
+	 * @return EngineParameterMetaData for the prepared statement. 
 	 * Note: there is no separate BrokeredParameterSetMetaData.
 	 */
-	protected EmbedParameterSetMetaData getParameterMetaData() throws SQLException
+	protected EngineParameterMetaData getParameterMetaData() throws SQLException
 	{
 		if (stmtPmeta != null)
 			return stmtPmeta;
 
-		EmbedParameterSetMetaData pmeta = null;
-		Class[] getParameterMetaDataParam = {};
-		try {
-			Method sh =
-				getPreparedStatement().getClass().getMethod("getEmbedParameterSetMetaData", getParameterMetaDataParam);
-			pmeta = (EmbedParameterSetMetaData)
-				sh.invoke(getPreparedStatement(),null);
-			stmtPmeta = pmeta;
-		}
-		catch (Exception e) {
-			handleReflectionException(e);
-		}
-		return stmtPmeta;
+		stmtPmeta = ((EnginePreparedStatement)ps).getEmbedParameterSetMetaData();
+        
+        return stmtPmeta;
 	}
 	
 	/**

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java?rev=424451&r1=424450&r2=424451&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
(original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
Fri Jul 21 13:44:25 2006
@@ -32,7 +32,7 @@
 	obtained through the BrokeredStatementControl getRealPreparedStatement method.
  */
 public class BrokeredPreparedStatement extends BrokeredStatement
-	implements PreparedStatement
+	implements EnginePreparedStatement
 {
 
 	/**
@@ -46,6 +46,21 @@
 		this.sql = sql;
     }
 
+    /**
+     * Imitate the getParameterMetaData() function in JDBC 3.0
+     *
+     * Retrieves the number, types and properties of this PreparedStatement
+     * object's parameters.
+     *
+     * @return a EngineParameterMetaData object that contains information about the
+     * number, types and properties of this PreparedStatement object's parameters.
+     * @exception SQLException if a database access error occurs
+     */
+    public EngineParameterMetaData getEmbedParameterSetMetaData()
+    throws SQLException
+    {
+        return ((EnginePreparedStatement)getPreparedStatement()).getEmbedParameterSetMetaData();
+    }
 	/**
      * A prepared SQL query is executed and its ResultSet is returned.
      *

Added: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EngineParameterMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EngineParameterMetaData.java?rev=424451&view=auto
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EngineParameterMetaData.java
(added)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EngineParameterMetaData.java
Fri Jul 21 13:44:25 2006
@@ -0,0 +1,127 @@
+/*
+ 
+ Derby - Class org.apache.derby.iapi.jdbc.EngineParameterMetaData
+ 
+ Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ 
+ */
+package org.apache.derby.iapi.jdbc;
+
+import java.sql.SQLException;
+import java.sql.PreparedStatement;
+
+
+/**
+ * An internal api only, mainly for use in the network server. 
+ * 
+ * This interface imitates the ParameterMetaData interface from JDBC3.0
+ * We want to provide the ParameterMetaData functionality to JDKs before JDBC3.0. 
+ * org.apache.derby.iapi.jdbc.EnginePreparedStatement interface returns an object 
+ * of this type on a getEmbedParameterSetMetaData
+ * Once,JDK1.3 stops being supported, this interface can be removed and 
+ * instead the JDBC 3.0 Class ParameterMetaData can be used
+ */
+public interface EngineParameterMetaData  {
+    
+    /**
+     * Retrieves the number of parameters in the PreparedStatement object for which
+     * this ParameterMetaData object contains information.
+     *
+     * @return the number of parameters
+     */
+    public int getParameterCount();
+    
+    /**
+     * Retrieves whether null values are allowed in the designated parameter.
+     *
+     * @param param - the first parameter is 1, the second is 2, ...
+     * @return the nullability status of the given parameter; one of
+     * ParameterMetaData.parameterNoNulls, ParameterMetaData.parameterNullable, or
+     * ParameterMetaData.parameterNullableUnknown
+     * @exception SQLException if a database access error occurs
+     */
+    public int isNullable(int param) throws SQLException;
+    
+    /**
+     * Retrieves whether values for the designated parameter can be signed numbers.
+     *
+     * @param param - the first parameter is 1, the second is 2, ...
+     * @return true if it can be signed numbers
+     * @exception SQLException if a database access error occurs
+     */
+    public boolean isSigned(int param) throws SQLException;
+    
+    /**
+     * Retrieves the designated parameter's number of decimal digits.
+     *
+     * @param param - the first parameter is 1, the second is 2, ...
+     * @return precision
+     * @exception SQLException if a database access error occurs
+     */
+    public int getPrecision(int param) throws SQLException;        
+    
+    /**
+     * Retrieves the designated parameter's number of digits to right of the decimal point.
+     *
+     * @param param - the first parameter is 1, the second is 2, ...
+     * @return scale
+     * @exception SQLException if a database access error occurs
+     */
+    public int getScale(int param) throws SQLException;
+    /**
+     *
+     * Retrieves the designated parameter's SQL type.
+     *
+     * @param param - the first parameter is 1, the second is 2, ...
+     * @return SQL type from java.sql.Types
+     * @exception SQLException if a database access error occurs
+     */
+    public int getParameterType(int param) throws SQLException;
+    /**
+     *
+     * Retrieves the designated parameter's database-specific type name.
+     *
+     * @param param - the first parameter is 1, the second is 2, ...
+     * @return type the name used by the database. If the parameter
+     * type is a user-defined type, then a fully-qualified type name is returned.
+     * @exception SQLException if a database access error occurs
+     */
+    public String getParameterTypeName(int param) throws SQLException;
+    
+    /**
+     * Retrieves the fully-qualified name of the Java class whose instances should be
+     * passed to the method PreparedStatement.setObject.
+     *
+     * @param param - the first parameter is 1, the second is 2, ...
+     * @return the fully-qualified name of the class in the Java
+     * programming language that would be used by the method
+     * PreparedStatement.setObject to set the value in the specified parameter.
+     * This is the class name used for custom mapping.
+     * @exception SQLException if a database access error occurs
+     */
+    public String getParameterClassName(int param) throws SQLException;
+    
+    /**
+     * Retrieves the designated parameter's mode.
+     *
+     * @param param - the first parameter is 1, the second is 2, ...
+     * @return mode of the parameter; one of ParameterMetaData.parameterModeIn,
+     * ParameterMetaData.parameterModeOut, or ParameterMetaData.parameterModeInOut
+     * ParameterMetaData.parameterModeUnknown.
+     * @exception SQLException if a database access error occurs
+     */
+    public int getParameterMode(int param) throws SQLException;
+    
+}

Propchange: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EngineParameterMetaData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EnginePreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EnginePreparedStatement.java?rev=424451&view=auto
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EnginePreparedStatement.java
(added)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EnginePreparedStatement.java
Fri Jul 21 13:44:25 2006
@@ -0,0 +1,49 @@
+/*
+ 
+ Derby - Class org.apache.derby.iapi.jdbc.EnginePreparedStatement
+ 
+ Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ 
+ */
+package org.apache.derby.iapi.jdbc;
+
+import java.sql.SQLException;
+import java.sql.PreparedStatement;
+
+/**
+ * Additional methods the embedded engine exposes on its 
+ * PreparedStatement object implementations. An internal api only, mainly 
+ * for the network server. Allows consistent interaction between embedded 
+ * PreparedStatement and Brokered PreparedStatements.
+ * (DERBY-1015)
+ */
+public interface EnginePreparedStatement extends PreparedStatement {
+    
+    /**
+     * Imitate the getParameterMetaData() that is in JDBC 3.0
+     * Once,JDK1.3 stops being supported, instead of returning EngineParameterMetaData
+     * the JDBC 3.0 class - ParameterMetaData can be used.
+     *
+     * Retrieves the number, types and properties of this PreparedStatement
+     * object's parameters.
+     *
+     * @return a EngineParameterMetaData object that contains information about the
+     * number, types and properties of this PreparedStatement object's parameters.
+     * @exception SQLException if a database access error occurs
+     */
+    public EngineParameterMetaData getEmbedParameterSetMetaData()
+        throws SQLException;
+    
+}

Propchange: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/jdbc/EnginePreparedStatement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java?rev=424451&r1=424450&r2=424451&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
(original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
Fri Jul 21 13:44:25 2006
@@ -26,6 +26,7 @@
 import org.apache.derby.iapi.types.DataTypeUtilities;
 import org.apache.derby.iapi.reference.JDBC30Translation;
 import org.apache.derby.iapi.reference.SQLState;
+import org.apache.derby.iapi.jdbc.EngineParameterMetaData;
 
 import java.sql.SQLException;
 import java.sql.Types;
@@ -37,13 +38,12 @@
  * It provides the parameter meta data for callable & prepared statements.
  * The subclass in Local30 actually implements ParameterMetaData interface.
  *
- * Our middle-tier servers or tools (eg. drda network server) can use it this way:
- * import org.apache.derby.impl.jdbc.EmbedPreparedStatement;
- * import org.apache.derby.impl.jdbc.EmbedParameterSetMetaData;
- *
- *   EmbedParameterSetMetaData pmeta = ((EmbedPreparedStatement) ps).getEmbedParameterSetMetaData();
+ * For use of ParameterMetaData functionality in network server, please do not use
+ * this class directly. Instead use the method available on EnginePreparedStatement
+ * @see org.apache.derby.iapi.jdbc.EngineParameterMetaData
+ * @see org.apache.derby.iapi.jdbc.EnginePreparedStatement
  */
-public class EmbedParameterSetMetaData
+public class EmbedParameterSetMetaData implements EngineParameterMetaData
     {
 
     private final ParameterValueSet pvs;

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java?rev=424451&r1=424450&r2=424451&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
(original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
Fri Jul 21 13:44:25 2006
@@ -66,6 +66,8 @@
 import java.io.Reader;
 import java.sql.Types;
 
+import org.apache.derby.iapi.jdbc.EngineParameterMetaData;
+import org.apache.derby.iapi.jdbc.EnginePreparedStatement;
 
 /**
  *
@@ -77,7 +79,7 @@
  */
 public abstract class EmbedPreparedStatement
 	extends EmbedStatement
-	implements java.sql.PreparedStatement
+	implements EnginePreparedStatement
 {
 
 	//Moving jdbc2.0 batch related code in this class because callableStatement in jdbc 20 needs
@@ -1258,11 +1260,11 @@
     * Retrieves the number, types and properties of this PreparedStatement
     * object's parameters.
     *
-    * @return a EmbedParameterSetMetaData object that contains information about the
+    * @return a EngineParameterMetaData object that contains information about the
     * number, types and properties of this PreparedStatement object's parameters.
     * @exception SQLException if a database access error occurs
 	*/
-	public EmbedParameterSetMetaData getEmbedParameterSetMetaData()
+	public EngineParameterMetaData getEmbedParameterSetMetaData()
     	throws SQLException
 	{
 	  checkExecStatus();



Mime
View raw message