You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2006/04/07 01:36:04 UTC
svn commit: r392120 - in
/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc:
EmbedPreparedStatement.java EmbedStatement.java
Author: djd
Date: Thu Apr 6 16:36:02 2006
New Revision: 392120
URL: http://svn.apache.org/viewcvs?rev=392120&view=rev
Log:
DERBY-1158 (partial) Some method protection cleanup on EmbedStatement and EmbedPreparedStatement
Merge of 389822 from trunk.
Modified:
db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java?rev=392120&r1=392119&r2=392120&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 Thu Apr 6 16:36:02 2006
@@ -737,7 +737,7 @@
}
}
- protected boolean executeBatchElement(Object batchElement) throws SQLException, StandardException {
+ boolean executeBatchElement(Object batchElement) throws SQLException, StandardException {
ParameterValueSet temp = (ParameterValueSet) batchElement;
@@ -1314,7 +1314,7 @@
}
}
- protected boolean executeStatement(Activation a,
+ boolean executeStatement(Activation a,
boolean executeQuery, boolean executeUpdate)
throws SQLException {
@@ -1324,7 +1324,7 @@
return super.executeStatement(a, executeQuery, executeUpdate);
}
- protected final SQLException dataTypeConversion(int column, String sourceType)
+ final SQLException dataTypeConversion(int column, String sourceType)
throws SQLException {
SQLException se = newSQLException(SQLState.LANG_DATA_TYPE_GET_MISMATCH, getEmbedParameterSetMetaData().getParameterTypeName(column),
sourceType);
Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java?rev=392120&r1=392119&r2=392120&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java Thu Apr 6 16:36:02 2006
@@ -62,32 +62,32 @@
private final java.sql.Connection applicationConnection;
- protected int updateCount = -1;
- protected java.sql.ResultSet results;
+ int updateCount = -1;
+ java.sql.ResultSet results;
//for jdbc3.0 feature, where you can get a resultset of rows inserted
//for auto generated columns after an insert
private java.sql.ResultSet autoGeneratedKeysResultSet;
- protected String cursorName;
+ private String cursorName;
- protected final boolean forMetaData;
+ private final boolean forMetaData;
final int resultSetType;
private final int resultSetConcurrency;
private final int resultSetHoldability;
- protected final LanguageConnectionContext lcc;
+ final LanguageConnectionContext lcc;
private SQLWarning warnings;
- protected String SQLText;
+ String SQLText;
private int fetchSize = 1;
private int fetchDirection = JDBC20Translation.FETCH_FORWARD;
int MaxFieldSize;
//the state of this statement, set to false when close() is called
- protected boolean active = true;
+ private boolean active = true;
//in case of batch update, save the individual statements in the batch in this vector
//this is only used by JDBC 2.0
- protected Vector batchStatements;
+ Vector batchStatements;
// The maximum # of rows to return per result set.
// (0 means no limit.)
@@ -218,7 +218,7 @@
throw Util.notImplemented("executeUpdate(String, String[])");
}
- protected final void checkIfInMiddleOfBatch() throws SQLException {
+ final void checkIfInMiddleOfBatch() throws SQLException {
/* If batchStatements is not null then we are in the middle
* of a batch. That's an invalid state. We need to finish the
* batch either by clearing the batch or executing the batch.
@@ -475,7 +475,7 @@
return execute(sql, false, false, JDBC30Translation.NO_GENERATED_KEYS, null, null);
}
- protected boolean execute(String sql, boolean executeQuery, boolean executeUpdate,
+ private boolean execute(String sql, boolean executeQuery, boolean executeUpdate,
int autoGeneratedKeys, int[] columnIndexes, String[] columnNames) throws SQLException
{
@@ -890,7 +890,7 @@
/**
Execute a single element of the batch. Overridden by EmbedPreparedStatement
*/
- protected boolean executeBatchElement(Object batchElement) throws SQLException, StandardException {
+ boolean executeBatchElement(Object batchElement) throws SQLException, StandardException {
return execute((String)batchElement, false, true, JDBC30Translation.NO_GENERATED_KEYS, null, null);
}
@@ -1031,7 +1031,7 @@
Execute the current statement.
@exception SQLException thrown on failure.
*/
- protected boolean executeStatement(Activation a,
+ boolean executeStatement(Activation a,
boolean executeQuery, boolean executeUpdate)
throws SQLException {
@@ -1239,7 +1239,7 @@
Close and clear all result sets associated with this statement
from the last execution.
*/
- protected void clearResultSets() throws SQLException {
+ void clearResultSets() throws SQLException {
SQLException sqle = null;
@@ -1302,7 +1302,7 @@
/**
Check to see if a statement requires to be executed via a callable statement.
*/
- protected void checkRequiresCallableStatement(Activation activation) throws SQLException {
+ void checkRequiresCallableStatement(Activation activation) throws SQLException {
ParameterValueSet pvs = activation.getParameterValueSet();