Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 43C2BCF58 for ; Mon, 3 Jun 2013 09:14:25 +0000 (UTC) Received: (qmail 6130 invoked by uid 500); 3 Jun 2013 09:14:25 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 6105 invoked by uid 500); 3 Jun 2013 09:14:24 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 6082 invoked by uid 99); 3 Jun 2013 09:14:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jun 2013 09:14:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jun 2013 09:14:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 62C9623888E3; Mon, 3 Jun 2013 09:13:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1488929 - in /db/derby/code/trunk/java: client/org/apache/derby/client/am/ drda/org/apache/derby/impl/drda/ engine/org/apache/derby/catalog/ engine/org/apache/derby/catalog/types/ engine/org/apache/derby/iapi/reference/ engine/org/apache/d... Date: Mon, 03 Jun 2013 09:13:49 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130603091351.62C9623888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Mon Jun 3 09:13:48 2013 New Revision: 1488929 URL: http://svn.apache.org/r1488929 Log: DERBY-2438: Remove JDBC30Translation and most of JDBC40Translation - Replace references to JDBC30Translation constants with direct references to the corresponding constants in java.sql.ParameterMetaData where possible. - Replace references to JDBC40Translation constants with direct references to the corresponding constants in java.sql.DatabaseMetaData and java.sql.Types where possible. - Move the non-JDBC constants in JDBC30Translation to JDBC40Translation. - Remove JDBC30Translation. Removed: db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/JDBC30Translation.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC40TranslationTest.java Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Agent.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientTypes.java db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/JDBC40Translation.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java db/derby/code/trunk/java/tools/org/apache/derby/tools/SignatureChecker.java Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Agent.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Agent.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/Agent.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Agent.java Mon Jun 3 09:13:48 2013 @@ -82,16 +82,16 @@ public abstract class Agent { case Types.ARRAY: case Types.DATALINK: case Types.DISTINCT: - case JDBC40Translation.NCHAR: - case JDBC40Translation.NCLOB: - case JDBC40Translation.NVARCHAR: - case JDBC40Translation.LONGNVARCHAR: + case Types.NCHAR: + case Types.NCLOB: + case Types.NVARCHAR: + case Types.LONGNVARCHAR: case Types.NULL: case Types.OTHER: case Types.REF: case JDBC40Translation.REF_CURSOR: - case JDBC40Translation.ROWID: - case JDBC40Translation.SQLXML: + case Types.ROWID: + case Types.SQLXML: case Types.STRUCT: throw new SqlException (logWriter_, Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientTypes.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientTypes.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientTypes.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientTypes.java Mon Jun 3 09:13:48 2013 @@ -22,7 +22,6 @@ package org.apache.derby.client.am; import java.sql.Types; import org.apache.derby.iapi.reference.DRDAConstants; -import org.apache.derby.iapi.reference.JDBC40Translation; // This enumeration of types represents the typing scheme used by our jdbc driver. // Once this is finished, we need to review our switches to make sure they are exhaustive @@ -110,8 +109,8 @@ public class ClientTypes { case Types.ARRAY: return "ARRAY"; case Types.DATALINK: return "DATALINK"; case Types.REF: return "REF"; - case JDBC40Translation.ROWID: return "ROWID"; - case JDBC40Translation.SQLXML: return "SQLXML"; + case Types.ROWID: return "ROWID"; + case Types.SQLXML: return "SQLXML"; case Types.STRUCT: return "STRUCT"; // Unknown type: default: return ""; Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java Mon Jun 3 09:13:48 2013 @@ -27,7 +27,7 @@ import java.sql.SQLException; import java.sql.Types; import java.util.Hashtable; import org.apache.derby.iapi.reference.DRDAConstants; -import org.apache.derby.iapi.reference.JDBC30Translation; +import org.apache.derby.iapi.reference.JDBC40Translation; import org.apache.derby.shared.common.reference.SQLState; // Under JDBC 2, we must new up our parameter meta data as column meta data instances @@ -313,7 +313,7 @@ public class ColumnMetaData implements R case ClientTypes.TIMESTAMP: return 29; case ClientTypes.JAVA_OBJECT: - return JDBC30Translation.DEFAULT_COLUMN_DISPLAY_SIZE; + return JDBC40Translation.DEFAULT_COLUMN_DISPLAY_SIZE; case ClientTypes.BINARY: case ClientTypes.VARBINARY: case ClientTypes.LONGVARBINARY: @@ -447,7 +447,7 @@ public class ColumnMetaData implements R case ClientTypes.TIMESTAMP: return 29; case ClientTypes.JAVA_OBJECT: - return JDBC30Translation.UNKNOWN_PRECISION; + return JDBC40Translation.UNKNOWN_PRECISION; default: throw new SqlException(logWriter_, new ClientMessageId (SQLState.UNSUPPORTED_TYPE)); Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java (original) +++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java Mon Jun 3 09:13:48 2013 @@ -38,8 +38,6 @@ import java.util.Hashtable; import org.apache.derby.iapi.jdbc.EngineStatement; import org.apache.derby.iapi.jdbc.EnginePreparedStatement; import org.apache.derby.iapi.jdbc.EngineResultSet; -import org.apache.derby.iapi.reference.JDBC30Translation; -import org.apache.derby.iapi.sql.execute.ExecutionContext; import org.apache.derby.iapi.transaction.TransactionControl; import org.apache.derby.iapi.util.StringUtil; import org.apache.derby.impl.jdbc.Util; @@ -1439,13 +1437,13 @@ class DRDAStatement int parameterScale = pmeta.getScale(i + 1); switch (parameterMode) { - case JDBC30Translation.PARAMETER_MODE_IN: + case (ParameterMetaData.parameterModeIn): break; - case JDBC30Translation.PARAMETER_MODE_OUT: - case JDBC30Translation.PARAMETER_MODE_IN_OUT: + case (ParameterMetaData.parameterModeOut): + case (ParameterMetaData.parameterModeInOut): outputFlag = true; break; - case JDBC30Translation.PARAMETER_MODE_UNKNOWN: + case (ParameterMetaData.parameterModeUnknown): // It's only unknown if array String objectType = pmeta.getParameterClassName(i+1); parameterType = Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java Mon Jun 3 09:13:48 2013 @@ -22,11 +22,9 @@ package org.apache.derby.catalog; import java.sql.Types; -import java.lang.reflect.*; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.DatabaseMetaData; -import org.apache.derby.catalog.TypeDescriptor; import org.apache.derby.iapi.types.DataTypeDescriptor; import org.apache.derby.iapi.types.DataTypeUtilities; @@ -35,7 +33,6 @@ import org.apache.derby.impl.jdbc.EmbedR import org.apache.derby.impl.jdbc.EmbedResultSetMetaData40; import org.apache.derby.catalog.types.RoutineAliasInfo; -import org.apache.derby.shared.common.reference.JDBC40Translation; /**

Use of VirtualTableInterface to provide support for DatabaseMetaData.getProcedureColumns(). @@ -89,17 +86,17 @@ public class GetProcedureColumns extends if (!isFunction) { return val; } switch (val) { case DatabaseMetaData.procedureColumnUnknown: - return JDBC40Translation.FUNCTION_PARAMETER_UNKNOWN; + return DatabaseMetaData.functionColumnUnknown; case DatabaseMetaData.procedureColumnIn: - return JDBC40Translation.FUNCTION_PARAMETER_IN; + return DatabaseMetaData.functionColumnIn; case DatabaseMetaData.procedureColumnInOut: - return JDBC40Translation.FUNCTION_PARAMETER_INOUT; + return DatabaseMetaData.functionColumnInOut; case DatabaseMetaData.procedureColumnOut: - return JDBC40Translation.FUNCTION_PARAMETER_OUT; + return DatabaseMetaData.functionColumnOut; case DatabaseMetaData.procedureColumnReturn: - return JDBC40Translation.FUNCTION_RETURN; + return DatabaseMetaData.functionReturn; default: - return JDBC40Translation.FUNCTION_PARAMETER_UNKNOWN; + return DatabaseMetaData.functionColumnUnknown; } } @@ -156,10 +153,10 @@ public class GetProcedureColumns extends } if (isFunction) { - nullable = (short) JDBC40Translation.FUNCTION_NULLABLE; + nullable = (short) DatabaseMetaData.functionNullable; sqlType = procedure.getReturnType(); columnName = ""; // COLUMN_NAME is VARCHAR NOT NULL - columnType = (short) JDBC40Translation.FUNCTION_RETURN; + columnType = (short) DatabaseMetaData.functionReturn; paramCursor = functionParamCursor; return; } @@ -177,7 +174,7 @@ public class GetProcedureColumns extends sqlType = tableFunctionReturnType.getRowTypes()[ idx ]; columnName = tableFunctionReturnType.getRowColumnNames()[ idx ]; - columnType = (short) JDBC40Translation.FUNCTION_COLUMN_RESULT; + columnType = (short) DatabaseMetaData.functionColumnResult; } else if (paramCursor > -1) { sqlType = procedure.getParameterTypes()[paramCursor]; Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java Mon Jun 3 09:13:48 2013 @@ -30,7 +30,6 @@ import org.apache.derby.iapi.services.io import org.apache.derby.iapi.types.TypeId; import org.apache.derby.iapi.services.i18n.MessageService; -import org.apache.derby.iapi.reference.JDBC40Translation; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.util.IdUtil; @@ -467,7 +466,7 @@ public class BaseTypeIdImpl implements F case StoredFormatIds.XML_TYPE_ID_IMPL: schemaName = null; unqualifiedName = TypeId.XML_NAME; - JDBCTypeId = JDBC40Translation.SQLXML; + JDBCTypeId = Types.SQLXML; break; default: Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java Mon Jun 3 09:13:48 2013 @@ -23,11 +23,11 @@ package org.apache.derby.catalog.types; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.io.ArrayUtil; -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.catalog.TypeDescriptor; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.sql.ParameterMetaData; import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.types.DataTypeDescriptor; import org.apache.derby.iapi.util.IdUtil; @@ -459,11 +459,11 @@ public class RoutineAliasInfo extends Me public static String parameterMode(int parameterMode) { switch (parameterMode) { - case JDBC30Translation.PARAMETER_MODE_IN: + case (ParameterMetaData.parameterModeIn): return "IN"; - case JDBC30Translation.PARAMETER_MODE_OUT: + case (ParameterMetaData.parameterModeOut): return "OUT"; - case JDBC30Translation.PARAMETER_MODE_IN_OUT: + case (ParameterMetaData.parameterModeInOut): return "INOUT"; default: return "UNKNOWN"; Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java Mon Jun 3 09:13:48 2013 @@ -27,11 +27,11 @@ import java.io.ObjectOutput; import java.sql.Types; import org.apache.derby.catalog.TypeDescriptor; +import org.apache.derby.iapi.reference.JDBC40Translation; import org.apache.derby.iapi.services.io.Formatable; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.types.StringDataValue; -import org.apache.derby.shared.common.reference.JDBC30Translation; - + public class TypeDescriptorImpl implements TypeDescriptor, Formatable { /******************************************************** @@ -137,8 +137,8 @@ public class TypeDescriptorImpl implemen this.isNullable = isNullable; this.maximumWidth = maximumWidth; - this.scale = JDBC30Translation.UNKNOWN_SCALE; - this.precision = JDBC30Translation.UNKNOWN_PRECISION; + this.scale = JDBC40Translation.UNKNOWN_SCALE; + this.precision = JDBC40Translation.UNKNOWN_PRECISION; } /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java Mon Jun 3 09:13:48 2013 @@ -21,11 +21,7 @@ package org.apache.derby.iapi.types; -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.iapi.reference.JDBC40Translation; -import org.apache.derby.iapi.services.io.StoredFormatIds; import java.sql.Timestamp; import java.sql.Types; @@ -59,7 +55,7 @@ public abstract class DataTypeUtilities case Types.VARBINARY: case Types.LONGVARBINARY: case Types.BLOB: - case JDBC40Translation.SQLXML: + case Types.SQLXML: return dtd.getMaximumWidth(); case Types.SMALLINT: return 5; @@ -113,7 +109,7 @@ public abstract class DataTypeUtilities typeId == Types.VARCHAR || typeId == Types.CLOB || typeId == Types.LONGVARCHAR || - typeId == JDBC40Translation.SQLXML); + typeId == Types.SQLXML); } /** Is the data type nullable. @@ -209,7 +205,7 @@ public abstract class DataTypeUtilities default: // MaximumWidth is -1 when it is unknown. int w = storageLength; - size = (w > 0 ? w : JDBC30Translation.DEFAULT_COLUMN_DISPLAY_SIZE); + size = (w > 0 ? w : JDBC40Translation.DEFAULT_COLUMN_DISPLAY_SIZE); break; } return size; Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java Mon Jun 3 09:13:48 2013 @@ -29,7 +29,6 @@ import org.apache.derby.catalog.types.De import org.apache.derby.catalog.types.TypeDescriptorImpl; import org.apache.derby.catalog.types.UserDefinedTypeIdImpl; import org.apache.derby.iapi.reference.DRDAConstants; -import org.apache.derby.iapi.reference.JDBC40Translation; import org.apache.derby.iapi.reference.Limits; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.loader.ClassFactory; @@ -410,7 +409,7 @@ public final class TypeId case Types.CLOB: return CLOB_ID; - case JDBC40Translation.SQLXML: + case Types.SQLXML: return XML_ID; default: Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java Mon Jun 3 09:13:48 2013 @@ -22,12 +22,9 @@ package org.apache.derby.impl.jdbc; import org.apache.derby.jdbc.InternalDriver; -import org.apache.derby.iapi.reference.JDBC40Translation; -import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.util.InterruptStatus; import java.sql.SQLException; -import java.sql.Types; /** Any class in the embedded JDBC driver (ie this package) that needs to Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java Mon Jun 3 09:13:48 2013 @@ -28,7 +28,6 @@ import org.apache.derby.iapi.types.DataV import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.iapi.reference.SQLState; import java.math.BigDecimal; @@ -38,6 +37,7 @@ import java.sql.CallableStatement; import java.sql.Clob; import java.sql.SQLException; import java.sql.Date; +import java.sql.ParameterMetaData; import java.sql.Statement; import java.sql.Time; import java.sql.Timestamp; @@ -656,11 +656,11 @@ public abstract class EmbedCallableState for (int j=1; j<=numberOfParameters; j++) { switch (pvs.getParameterMode(j)) { - case JDBC30Translation.PARAMETER_MODE_IN: - case JDBC30Translation.PARAMETER_MODE_UNKNOWN: + case (ParameterMetaData.parameterModeIn): + case (ParameterMetaData.parameterModeUnknown): break; - case JDBC30Translation.PARAMETER_MODE_OUT: - case JDBC30Translation.PARAMETER_MODE_IN_OUT: + case (ParameterMetaData.parameterModeOut): + case (ParameterMetaData.parameterModeInOut): throw newSQLException(SQLState.OUTPUT_PARAMS_NOT_ALLOWED); } } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java Mon Jun 3 09:13:48 2013 @@ -22,7 +22,6 @@ package org.apache.derby.impl.jdbc; import java.math.BigDecimal; -import java.sql.CallableStatement; import java.sql.SQLException; import java.sql.Date; import java.sql.Time; @@ -43,23 +42,15 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.StringReader; import java.io.UnsupportedEncodingException; +import java.sql.ParameterMetaData; import java.util.Calendar; -import org.apache.derby.iapi.error.StandardException; - import org.apache.derby.iapi.jdbc.CharacterStreamDescriptor; -import org.apache.derby.iapi.services.io.StreamStorable; -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.types.DataValueDescriptor; import org.apache.derby.iapi.types.StringDataValue; -import org.apache.derby.impl.jdbc.Util; -import org.apache.derby.impl.jdbc.EmbedConnection; -import org.apache.derby.impl.jdbc.EmbedResultSet; - - /** * This class extends the EmbedCallableStatement class in order to support new * methods and classes that come with JDBC 2.0. @@ -1029,8 +1020,8 @@ public abstract class EmbedCallableState checkStatus(); // Make sure the specified parameter has mode OUT or IN/OUT. switch (getParms().getParameterMode(parameterIndex)) { - case JDBC30Translation.PARAMETER_MODE_IN: - case JDBC30Translation.PARAMETER_MODE_UNKNOWN: + case (ParameterMetaData.parameterModeIn): + case (ParameterMetaData.parameterModeUnknown): throw newSQLException(SQLState.LANG_NOT_OUTPUT_PARAMETER, Integer.toString(parameterIndex)); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java Mon Jun 3 09:13:48 2013 @@ -21,16 +21,14 @@ package org.apache.derby.impl.jdbc; -import org.apache.derby.iapi.sql.Activation; import org.apache.derby.iapi.sql.ParameterValueSet; import org.apache.derby.iapi.types.DataTypeDescriptor; 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.ParameterMetaData; import java.sql.SQLException; -import java.sql.Types; /** * This class immitates to implement the ParameterMetaData interface from JDBC3.0 @@ -88,9 +86,9 @@ public class EmbedParameterSetMetaData i checkPosition(param); if (types[param - 1].isNullable()) - return JDBC30Translation.PARAMETER_NULLABLE; + return (ParameterMetaData.parameterNullable); else - return JDBC30Translation.PARAMETER_NO_NULLS; + return (ParameterMetaData.parameterNoNulls); } /** @@ -213,7 +211,7 @@ public class EmbedParameterSetMetaData i //bug 4857 - only the return parameter is of type OUT. All the other output //parameter are IN_OUT (it doesn't matter if their value is set or not). if ((param == 1) && pvs.hasReturnOutputParameter())//only the first parameter can be of return type - return JDBC30Translation.PARAMETER_MODE_OUT; + return (ParameterMetaData.parameterModeOut); return pvs.getParameterMode(param); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java Mon Jun 3 09:13:48 2013 @@ -45,8 +45,6 @@ import java.sql.BatchUpdateException; import java.sql.SQLException; import java.sql.Types; import java.io.IOException; -import java.io.PrintStream; -import java.io.PrintWriter; /** This class understands the message protocol and looks up @@ -255,16 +253,16 @@ public abstract class Util { case Types.ARRAY: case Types.DATALINK: case Types.DISTINCT: - case JDBC40Translation.NCHAR: - case JDBC40Translation.NCLOB: - case JDBC40Translation.NVARCHAR: - case JDBC40Translation.LONGNVARCHAR: + case Types.NCHAR: + case Types.NCLOB: + case Types.NVARCHAR: + case Types.LONGNVARCHAR: case Types.NULL: case Types.OTHER: case Types.REF: case JDBC40Translation.REF_CURSOR: - case JDBC40Translation.ROWID: - case JDBC40Translation.SQLXML: + case Types.ROWID: + case Types.SQLXML: case Types.STRUCT: return false; } @@ -511,10 +509,10 @@ public abstract class Util { case Types.JAVA_OBJECT : return "Types.JAVA_OBJECT"; case Types.REF : return TypeId.REF_NAME; case JDBC40Translation.REF_CURSOR: return TypeId.REF_CURSOR; - case JDBC40Translation.ROWID: return TypeId.ROWID_NAME; + case Types.ROWID: return TypeId.ROWID_NAME; case Types.STRUCT: return TypeId.STRUCT_NAME; case StoredFormatIds.XML_TYPE_ID : return TypeId.XML_NAME; - case JDBC40Translation.SQLXML: return TypeId.SQLXML_NAME; + case Types.SQLXML: return TypeId.SQLXML_NAME; default : return String.valueOf(jdbcType); } } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java Mon Jun 3 09:13:48 2013 @@ -22,17 +22,12 @@ package org.apache.derby.impl.load; import org.apache.derby.iapi.util.IdUtil; -import org.apache.derby.iapi.reference.JDBC40Translation; -import org.apache.derby.iapi.services.io.StoredFormatIds; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.Statement; -import java.sql.PreparedStatement; import java.sql.Connection; -import java.sql.ResultSetMetaData; import java.sql.DatabaseMetaData; +import java.sql.Types; import java.util.*; import org.apache.derby.iapi.jdbc.EngineConnection; @@ -255,7 +250,7 @@ class ColumnInfo { return !(type == java.sql.Types.BIT || type == java.sql.Types.OTHER || - type == JDBC40Translation.SQLXML ); + type == Types.SQLXML ); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java Mon Jun 3 09:13:48 2013 @@ -22,7 +22,6 @@ package org.apache.derby.impl.sql; import org.apache.derby.iapi.reference.SQLState; -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.iapi.error.StandardException; @@ -30,6 +29,7 @@ import org.apache.derby.iapi.types.DataT import org.apache.derby.iapi.types.DataValueDescriptor; import org.apache.derby.iapi.types.TypeId; +import java.sql.ParameterMetaData; import java.sql.Types; /** @@ -111,7 +111,7 @@ final class GenericParameter { this.pvs = pvs; parameterMode = (this.isReturnOutputParameter = isReturnOutputParameter) - ? (short) JDBC30Translation.PARAMETER_MODE_OUT : (short) JDBC30Translation.PARAMETER_MODE_IN; + ? (short) (ParameterMetaData.parameterModeOut) : (short) (ParameterMetaData.parameterModeIn); } /** @@ -191,13 +191,13 @@ final class GenericParameter } switch (parameterMode) { - case JDBC30Translation.PARAMETER_MODE_IN: - case JDBC30Translation.PARAMETER_MODE_UNKNOWN: + case (ParameterMetaData.parameterModeIn): + case (ParameterMetaData.parameterModeUnknown): default: throw StandardException.newException(SQLState.LANG_NOT_OUT_PARAM, getJDBCParameterNumberStr()); - case JDBC30Translation.PARAMETER_MODE_IN_OUT: - case JDBC30Translation.PARAMETER_MODE_OUT: + case (ParameterMetaData.parameterModeInOut): + case (ParameterMetaData.parameterModeOut): // Declared/Java procedure parameter. if (!DataTypeDescriptor.isJDBCTypeEquivalent(jdbcTypeId, sqlType)) throw throwInvalidOutParamMap(sqlType); @@ -244,12 +244,12 @@ final class GenericParameter void validate() throws StandardException { switch (parameterMode) { - case JDBC30Translation.PARAMETER_MODE_UNKNOWN: + case (ParameterMetaData.parameterModeUnknown): break; - case JDBC30Translation.PARAMETER_MODE_IN: + case (ParameterMetaData.parameterModeIn): break; - case JDBC30Translation.PARAMETER_MODE_IN_OUT: - case JDBC30Translation.PARAMETER_MODE_OUT: + case (ParameterMetaData.parameterModeInOut): + case (ParameterMetaData.parameterModeOut): if (registerOutType == Types.NULL) { throw StandardException.newException(SQLState.NEED_TO_REGISTER_PARAM, getJDBCParameterNumberStr(), Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java Mon Jun 3 09:13:48 2013 @@ -24,18 +24,15 @@ package org.apache.derby.impl.sql; import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.services.loader.ClassInspector; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.sql.ParameterValueSet; import org.apache.derby.iapi.types.DataTypeDescriptor; import org.apache.derby.iapi.types.DataValueDescriptor; import org.apache.derby.iapi.types.UserDataValue; -import org.apache.derby.iapi.types.SQLBit; -import org.apache.derby.iapi.types.SQLBlob; -import org.apache.derby.iapi.types.SQLChar; import org.apache.derby.impl.jdbc.Util; import java.io.InputStream; +import java.sql.ParameterMetaData; import java.sql.Types; /** @@ -157,7 +154,7 @@ final class GenericParameterValueSet imp try { GenericParameter gp = parms[position]; - if (gp.parameterMode == JDBC30Translation.PARAMETER_MODE_OUT) + if (gp.parameterMode == (ParameterMetaData.parameterModeOut)) throw StandardException.newException(SQLState.LANG_RETURN_OUTPUT_PARAM_CANNOT_BE_SET); gp.isSet = true; @@ -177,8 +174,8 @@ final class GenericParameterValueSet imp GenericParameter gp = parms[position]; switch (gp.parameterMode) { - case JDBC30Translation.PARAMETER_MODE_IN: - case JDBC30Translation.PARAMETER_MODE_UNKNOWN: + case (ParameterMetaData.parameterModeIn): + case (ParameterMetaData.parameterModeUnknown): throw StandardException.newException(SQLState.LANG_NOT_OUTPUT_PARAMETER, Integer.toString(position + 1)); } @@ -229,11 +226,11 @@ final class GenericParameterValueSet imp if (!gp.isSet) { switch (gp.parameterMode) { - case JDBC30Translation.PARAMETER_MODE_OUT: + case (ParameterMetaData.parameterModeOut): break; - case JDBC30Translation.PARAMETER_MODE_IN_OUT: - case JDBC30Translation.PARAMETER_MODE_UNKNOWN: - case JDBC30Translation.PARAMETER_MODE_IN: + case (ParameterMetaData.parameterModeInOut): + case (ParameterMetaData.parameterModeUnknown): + case (ParameterMetaData.parameterModeIn): return false; } } @@ -410,14 +407,14 @@ final class GenericParameterValueSet imp GenericParameter gp = parms[i]; switch (gp.parameterMode) { - case JDBC30Translation.PARAMETER_MODE_IN: + case (ParameterMetaData.parameterModeIn): break; - case JDBC30Translation.PARAMETER_MODE_IN_OUT: - case JDBC30Translation.PARAMETER_MODE_OUT: + case (ParameterMetaData.parameterModeInOut): + case (ParameterMetaData.parameterModeOut): hasDeclaredOutputParameter = true; break; - case JDBC30Translation.PARAMETER_MODE_UNKNOWN: - gp.parameterMode = JDBC30Translation.PARAMETER_MODE_IN; + case (ParameterMetaData.parameterModeUnknown): + gp.parameterMode = (ParameterMetaData.parameterModeIn); break; } } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Mon Jun 3 09:13:48 2013 @@ -24,7 +24,6 @@ package org.apache.derby.impl.sql.catalo import java.io.File; import org.apache.derby.iapi.reference.Attribute; import org.apache.derby.iapi.reference.EngineType; -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.iapi.reference.Property; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.reference.Limits; @@ -180,6 +179,7 @@ import java.io.IOException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.sql.ParameterMetaData; import java.sql.Types; import java.util.Map; import org.apache.derby.iapi.store.access.FileResource; @@ -7841,7 +7841,7 @@ public final class DataDictionaryImpl details[SYSFUN_FIRST_PARAMETER_INDEX +i]).getCatalogType(); paramNames[i] = "P" + (i +1); // Dummy names // All parameters must be IN. - paramModes[i] = JDBC30Translation.PARAMETER_MODE_IN; + paramModes[i] = (ParameterMetaData.parameterModeIn); } // details[3] = java method @@ -10758,9 +10758,9 @@ public final class DataDictionaryImpl arg_modes = new int[num_args]; int num_in_param = num_args - num_out_param; for (int i = 0; i < num_in_param; i++) - arg_modes[i] = JDBC30Translation.PARAMETER_MODE_IN; + arg_modes[i] = (ParameterMetaData.parameterModeIn); for (int i = 0; i < num_out_param; i++) - arg_modes[num_in_param + i] = JDBC30Translation.PARAMETER_MODE_OUT; + arg_modes[num_in_param + i] = (ParameterMetaData.parameterModeOut); } RoutineAliasInfo routine_alias_info = Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java Mon Jun 3 09:13:48 2013 @@ -21,7 +21,6 @@ package org.apache.derby.impl.sql.catalog; -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.iapi.sql.dictionary.SystemColumn; import org.apache.derby.iapi.sql.dictionary.TupleDescriptor; import org.apache.derby.iapi.sql.dictionary.RoutinePermsDescriptor; @@ -35,10 +34,8 @@ import org.apache.derby.iapi.sql.execute import org.apache.derby.iapi.sql.execute.ExecIndexRow; import org.apache.derby.iapi.sql.execute.ExecutionFactory; import org.apache.derby.iapi.types.DataValueFactory; -import org.apache.derby.iapi.types.RowLocation; import org.apache.derby.iapi.types.DataValueDescriptor; import org.apache.derby.iapi.types.SQLChar; -import org.apache.derby.iapi.types.StringDataValue; import org.apache.derby.iapi.services.uuid.UUIDFactory; import org.apache.derby.catalog.UUID; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java Mon Jun 3 09:13:48 2013 @@ -29,12 +29,12 @@ import org.apache.derby.iapi.services.co import org.apache.derby.iapi.services.compiler.LocalField; import java.lang.reflect.Modifier; +import java.sql.Types; import java.util.List; import org.apache.derby.iapi.types.TypeId; import org.apache.derby.iapi.types.DataTypeDescriptor; import org.apache.derby.iapi.reference.ClassName; -import org.apache.derby.iapi.reference.JDBC40Translation; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.util.JBitSet; @@ -379,7 +379,7 @@ public class BinaryOperatorNode extends // XML data value, per SQL/XML spec 6.17: "...yielding a value // X1 of an XML type." setType(DataTypeDescriptor.getBuiltInDataTypeDescriptor( - JDBC40Translation.SQLXML)); + Types.SQLXML)); } return genSQLJavaSQLTree(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java Mon Jun 3 09:13:48 2013 @@ -21,6 +21,7 @@ package org.apache.derby.impl.sql.compile; +import java.sql.Types; import java.util.List; import org.apache.derby.catalog.AliasInfo; import org.apache.derby.catalog.TypeDescriptor; @@ -29,7 +30,6 @@ import org.apache.derby.catalog.types.Ro import org.apache.derby.catalog.types.SynonymAliasInfo; import org.apache.derby.catalog.types.UDTAliasInfo; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.reference.JDBC40Translation; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.sql.dictionary.AliasDescriptor; @@ -151,8 +151,8 @@ public class CreateAliasNode extends DDL // XML not allowed because SQLXML support has not been implemented if ( - (aggForType.getJDBCTypeId() == JDBC40Translation.SQLXML) || - (aggReturnType.getJDBCTypeId() == JDBC40Translation.SQLXML) + (aggForType.getJDBCTypeId() == Types.SQLXML) || + (aggReturnType.getJDBCTypeId() == Types.SQLXML) ) { throw StandardException.newException( SQLState.LANG_XML_NOT_ALLOWED_DJRS ); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java Mon Jun 3 09:13:48 2013 @@ -47,7 +47,6 @@ import org.apache.derby.catalog.types.Ty import org.apache.derby.catalog.types.UserDefinedTypeIdImpl; import org.apache.derby.iapi.reference.SQLState; -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.iapi.store.access.Qualifier; @@ -58,8 +57,8 @@ import org.apache.derby.catalog.types.Ro import java.lang.reflect.Member; import java.lang.reflect.Modifier; +import java.sql.ParameterMetaData; import java.sql.ResultSet; -import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; @@ -649,7 +648,7 @@ abstract class MethodCallNode extends Ja // must strip another array level off of out and in/out parameters if ( routineInfo != null ) { - if ( routineInfo.getParameterModes()[ firstVarargIdx ] != JDBC30Translation.PARAMETER_MODE_IN ) + if ( routineInfo.getParameterModes()[ firstVarargIdx ] != (ParameterMetaData.parameterModeIn) ) { varargType = stripOneArrayLevel( varargType ); } @@ -979,15 +978,15 @@ abstract class MethodCallNode extends Ja int parameterMode = routineInfo.getParameterModes()[ getRoutineArgIdx( i ) ]; switch (parameterMode) { - case JDBC30Translation.PARAMETER_MODE_IN: + case (ParameterMetaData.parameterModeIn): break; - case JDBC30Translation.PARAMETER_MODE_IN_OUT: + case (ParameterMetaData.parameterModeInOut): // we need to see if the type of the array is // primitive, not the array itself. methodParameter = stripOneArrayLevel( methodParameter ); break; - case JDBC30Translation.PARAMETER_MODE_OUT: + case (ParameterMetaData.parameterModeOut): // value is not obtained *from* parameter. continue; } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java Mon Jun 3 09:13:48 2013 @@ -32,7 +32,6 @@ import org.apache.derby.catalog.types.Us import org.apache.derby.iapi.services.i18n.MessageService; import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.reference.ClassName; -import org.apache.derby.iapi.reference.JDBC40Translation; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.services.classfile.VMOpcode; import org.apache.derby.iapi.services.compiler.MethodBuilder; @@ -883,7 +882,7 @@ public abstract class QueryTreeNode impl constantNodeType = C_NodeTypes.BLOB_CONSTANT_NODE; break; - case JDBC40Translation.SQLXML: + case Types.SQLXML: constantNodeType = C_NodeTypes.XML_CONSTANT_NODE; break; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java Mon Jun 3 09:13:48 2013 @@ -39,7 +39,6 @@ import org.apache.derby.iapi.sql.diction import org.apache.derby.iapi.reference.ClassName; import org.apache.derby.iapi.reference.SQLState; -import org.apache.derby.iapi.reference.JDBC30Translation; import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.services.compiler.LocalField; @@ -54,6 +53,7 @@ import org.apache.derby.catalog.TypeDesc import org.apache.derby.catalog.types.RoutineAliasInfo; import java.lang.reflect.Modifier; +import java.sql.ParameterMetaData; import java.util.List; /** @@ -544,7 +544,7 @@ public class StaticMethodCallNode extend // if it's an OUT or INOUT parameter we need an array. int parameterMode = rai.getParameterModes()[ getRoutineArgIdx( rai, p ) ]; - if (parameterMode != JDBC30Translation.PARAMETER_MODE_IN) { + if (parameterMode != (ParameterMetaData.parameterModeIn)) { String arrayType; switch (typeId.getJDBCTypeId()) { @@ -695,7 +695,7 @@ public class StaticMethodCallNode extend boolean isParameterMarker = true; if ((sqlParamNode == null) || !sqlParamNode.requiresTypeFromContext()) { - if (parameterMode != JDBC30Translation.PARAMETER_MODE_IN) + if (parameterMode != (ParameterMetaData.parameterModeIn)) { throw StandardException.newException ( @@ -777,7 +777,7 @@ public class StaticMethodCallNode extend // correctly as 10 characters long. if (parameterTypeId.variableLength()) { - if (parameterMode != JDBC30Translation.PARAMETER_MODE_OUT) + if (parameterMode != (ParameterMetaData.parameterModeOut)) { needCast = true; } } } @@ -907,7 +907,7 @@ public class StaticMethodCallNode extend // may be registered as an IN OUT parameter. For a static method argument to be // a dynmaically registered out parameter it must be a simple ? parameter - parameterMode = JDBC30Translation.PARAMETER_MODE_IN; + parameterMode = (ParameterMetaData.parameterModeIn); if (sql2j != null) { if (sql2j.getSQLValueNode().requiresTypeFromContext()) { @@ -931,7 +931,7 @@ public class StaticMethodCallNode extend "getParameterValueSet", ClassName.ParameterValueSet, 0); constructor.push(applicationParameterNumber); - constructor.push(JDBC30Translation.PARAMETER_MODE_UNKNOWN); + constructor.push(ParameterMetaData.parameterModeUnknown); constructor.callMethod(VMOpcode.INVOKEINTERFACE, null, "setParameterMode", "void", 2); constructor.endStatement(); @@ -941,27 +941,27 @@ public class StaticMethodCallNode extend } switch (parameterMode) { - case JDBC30Translation.PARAMETER_MODE_IN: - case JDBC30Translation.PARAMETER_MODE_IN_OUT: - case JDBC30Translation.PARAMETER_MODE_UNKNOWN: + case (ParameterMetaData.parameterModeIn): + case (ParameterMetaData.parameterModeInOut): + case (ParameterMetaData.parameterModeUnknown): if (sql2j != null) sql2j.returnsNullOnNullState = returnsNullOnNullState; super.generateOneParameter(acb, mb, parameterNumber); break; - case JDBC30Translation.PARAMETER_MODE_OUT: + case (ParameterMetaData.parameterModeOut): // For an OUT parameter we require nothing to be pushed into the // method call from the parameter node. break; } switch (parameterMode) { - case JDBC30Translation.PARAMETER_MODE_IN: - case JDBC30Translation.PARAMETER_MODE_UNKNOWN: + case (ParameterMetaData.parameterModeIn): + case (ParameterMetaData.parameterModeUnknown): break; - case JDBC30Translation.PARAMETER_MODE_IN_OUT: - case JDBC30Translation.PARAMETER_MODE_OUT: + case (ParameterMetaData.parameterModeInOut): + case (ParameterMetaData.parameterModeOut): { // Create the array used to pass into the method. We create a // new array for each call as there is a small chance the @@ -989,7 +989,7 @@ public class StaticMethodCallNode extend mb.putField(lf); // set the IN part of the parameter into the INOUT parameter. - if (parameterMode != JDBC30Translation.PARAMETER_MODE_OUT) { + if (parameterMode != (ParameterMetaData.parameterModeOut)) { mb.swap(); mb.setArrayElement(0); mb.getField(lf); @@ -1352,7 +1352,7 @@ public class StaticMethodCallNode extend int parameterMode = parameterModes[ getRoutineArgIdx( i ) ]; - if (parameterMode != JDBC30Translation.PARAMETER_MODE_IN) { + if (parameterMode != (ParameterMetaData.parameterModeIn)) { // must be a parameter if it is INOUT or OUT. ValueNode sqlParamNode = ((SQLToJavaValueNode) methodParms[i]).getSQLValueNode(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java Mon Jun 3 09:13:48 2013 @@ -27,8 +27,6 @@ import org.apache.derby.iapi.types.TypeI import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.reference.JDBC40Translation; - import java.sql.Types; public class TypeCompilerFactoryImpl implements TypeCompilerFactory @@ -215,7 +213,7 @@ public class TypeCompilerFactoryImpl imp return btc; } - case JDBC40Translation.SQLXML: + case Types.SQLXML: return xmlTypeCompiler = getAnInstance(PACKAGE_NAME + "XMLTypeCompiler", xmlTypeCompiler, Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java Mon Jun 3 09:13:48 2013 @@ -25,7 +25,6 @@ import org.apache.derby.iapi.store.acces import org.apache.derby.iapi.sql.compile.Visitor; -import org.apache.derby.iapi.reference.JDBC40Translation; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.reference.ClassName; import org.apache.derby.iapi.error.StandardException; @@ -381,7 +380,7 @@ public class UnaryOperatorNode extends O // The result type of XMLParse() is always an XML type. setType(DataTypeDescriptor.getBuiltInDataTypeDescriptor( - JDBC40Translation.SQLXML)); + Types.SQLXML)); } /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Mon Jun 3 09:13:48 2013 @@ -50,7 +50,6 @@ import org.apache.derby.iapi.sql.diction import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; import org.apache.derby.iapi.sql.conn.Authorizer; -import org.apache.derby.iapi.sql.execute.ExecutionContext; import org.apache.derby.iapi.types.TypeId; import org.apache.derby.iapi.sql.compile.TypeCompiler; @@ -67,8 +66,6 @@ import org.apache.derby.iapi.error.Stand import org.apache.derby.iapi.reference.Property; import org.apache.derby.iapi.reference.SQLState; -import org.apache.derby.iapi.reference.JDBC30Translation; -import org.apache.derby.iapi.reference.JDBC40Translation; import org.apache.derby.iapi.reference.Limits; import org.apache.derby.iapi.sql.compile.CompilerContext; @@ -89,6 +86,7 @@ import org.apache.derby.iapi.util.ReuseF import org.apache.derby.iapi.util.StringUtil; import org.apache.derby.iapi.util.IdUtil; +import java.sql.ParameterMetaData; import java.sql.Types; import java.util.List; import java.util.ArrayList; @@ -4466,8 +4464,7 @@ XMLType() throws StandardException : { checkVersion(DataDictionary.DD_VERSION_DERBY_10_1, "XML"); - return DataTypeDescriptor.getBuiltInDataTypeDescriptor( - JDBC40Translation.SQLXML); + return DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.SQLXML); } } @@ -10893,13 +10890,13 @@ procedureParameterDefinition Integer inoutParameter() : { - int mode = JDBC30Translation.PARAMETER_MODE_IN; + int mode = ParameterMetaData.parameterModeIn; } { [ { } - | { mode = JDBC30Translation.PARAMETER_MODE_OUT; } - | { mode = JDBC30Translation.PARAMETER_MODE_IN_OUT; } + | { mode = ParameterMetaData.parameterModeOut; } + | { mode = ParameterMetaData.parameterModeInOut; } ] { return ReuseFactory.getInteger(mode); } } @@ -11005,7 +11002,7 @@ functionParameterDefinition { names.add(parameterName); types.add(typeDescriptor.getCatalogType()); - inOut.add(ReuseFactory.getInteger(JDBC30Translation.PARAMETER_MODE_IN)); + inOut.add(ReuseFactory.getInteger(ParameterMetaData.parameterModeIn)); } } @@ -11063,7 +11060,7 @@ functionTableType() throws StandardExcep // for ( int i = 0; i < columnCount; i++ ) { - if ( typeArray[ i ].getJDBCTypeId() == JDBC40Translation.SQLXML ) + if ( typeArray[ i ].getJDBCTypeId() == Types.SQLXML ) { throw StandardException.newException( SQLState.LANG_XML_NOT_ALLOWED_DJRS ); } } Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/JDBC40Translation.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/JDBC40Translation.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/JDBC40Translation.java (original) +++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/JDBC40Translation.java Mon Jun 3 09:13:48 2013 @@ -28,44 +28,26 @@ package org.apache.derby.shared.common.r will be available in jdbc 4.0, it becomes possible to refer to these constants when compiling against older jdk versions. -

The test jdbc4/JDBC40TranslationTest.junit, - which is compiled against jdk16, contains tests that verifies - that these hard coded constants are in fact equal to those - found in jdk16. +

+ This class also contains some constants shared by the network server and client. +

-

+

This class should not be shipped with the product. +

-

+

This class has no methods, all it contains are constants are public, static and final since they are declared in an interface. +

*/ public interface JDBC40Translation { - /* - ** public statics from 4.0 version of java.sql.DatabaseMetaData - */ - public static final int FUNCTION_PARAMETER_UNKNOWN = 0; - public static final int FUNCTION_PARAMETER_IN = 1; - public static final int FUNCTION_PARAMETER_INOUT = 2; - public static final int FUNCTION_PARAMETER_OUT = 3; - public static final int FUNCTION_RETURN = 4; - public static final int FUNCTION_COLUMN_RESULT = 5; - - public static final int FUNCTION_NO_NULLS = 0; - public static final int FUNCTION_NULLABLE = 1; - public static final int FUNCTION_NULLABLE_UNKNOWN = 2; - - public static final int FUNCTION_RESULT_UNKNOWN = 0; - public static final int FUNCTION_NO_TABLE = 1; - public static final int FUNCTION_RETURNS_TABLE = 2; + // Constants shared by network client and server + public static final int DEFAULT_COLUMN_DISPLAY_SIZE = 15; + public static final int UNKNOWN_SCALE = 0; + public static final int UNKNOWN_PRECISION = 0; // constants from java.sql.Types - public static final int NCHAR = -15; - public static final int NVARCHAR = -9; - public static final int LONGNVARCHAR = -16; - public static final int NCLOB = 2011; - public static final int ROWID = -8; public static final int REF_CURSOR = 2012; - public static final int SQLXML = 2009; } Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java Mon Jun 3 09:13:48 2013 @@ -55,7 +55,6 @@ public class _Suite extends BaseTestCase suite.addTest(ClobTest.suite()); suite.addTest(ConnectionTest.suite()); suite.addTest(DataSourceTest.suite()); - suite.addTest(JDBC40TranslationTest.suite()); suite.addTest(ParameterMetaDataWrapperTest.suite()); suite.addTest(PreparedStatementTest.suite()); suite.addTest(ResultSetMetaDataTest.suite()); Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java Mon Jun 3 09:13:48 2013 @@ -26,7 +26,6 @@ import java.sql.*; import java.text.NumberFormat; import java.util.Arrays; -import org.apache.derby.shared.common.reference.JDBC40Translation; import org.apache.derbyTesting.junit.BaseJDBCTestCase; import org.apache.derbyTesting.junit.Decorator; import org.apache.derbyTesting.junit.JDBC; @@ -238,11 +237,11 @@ public class TableFunctionTest extends B private static final String SFT_RETURN_TYPE = "TABLE ( \"INTCOL\" INTEGER, \"VARCHARCOL\" VARCHAR(10) )"; private static final String RADT_RETURN_TYPE = "TABLE ( \"COLUMN0\" BIGINT, \"COLUMN1\" BLOB(2147483647), \"COLUMN2\" CHAR(10), \"COLUMN3\" CHAR (10) FOR BIT DATA, \"COLUMN4\" CLOB(2147483647), \"COLUMN5\" DATE, \"COLUMN6\" DECIMAL(5,0), \"COLUMN7\" DOUBLE, \"COLUMN8\" DOUBLE, \"COLUMN9\" REAL, \"COLUMN10\" DOUBLE, \"COLUMN11\" INTEGER, \"COLUMN12\" LONG VARCHAR, \"COLUMN13\" LONG VARCHAR FOR BIT DATA, \"COLUMN14\" NUMERIC(5,0), \"COLUMN15\" REAL, \"COLUMN16\" SMALLINT, \"COLUMN17\" TIME, \"COLUMN18\" TIMESTAMP, \"COLUMN19\" VARCHAR(10), \"COLUMN20\" VARCHAR (10) FOR BIT DATA, \"COLUMN21\" BOOLEAN )"; - private static final Integer FUNCTION_COLUMN_IN = new Integer( JDBC40Translation.FUNCTION_PARAMETER_IN ); - private static final Integer FUNCTION_RETURN_VALUE = new Integer( JDBC40Translation.FUNCTION_RETURN ); - private static final Integer FUNCTION_RESULT_COLUMN = new Integer( JDBC40Translation.FUNCTION_COLUMN_RESULT ); + private static final Integer FUNCTION_COLUMN_IN = DatabaseMetaData.functionColumnIn; + private static final Integer FUNCTION_RETURN_VALUE = DatabaseMetaData.functionReturn; + private static final Integer FUNCTION_RESULT_COLUMN = DatabaseMetaData.functionColumnResult; - private static final Integer FUNCTION_RETURNS_TABLE = new Integer( JDBC40Translation.FUNCTION_RETURNS_TABLE ); + private static final Integer FUNCTION_RETURNS_TABLE = DatabaseMetaData.functionReturnsTable; private static final Integer JDBC_TYPE_OTHER = new Integer( Types.OTHER ); @@ -284,7 +283,7 @@ public class TableFunctionTest extends B private static final Object NO_CATALOG = null; private static final String RETURN_VALUE_NAME = ""; - private static final Integer ALLOWS_NULLS = new Integer( JDBC40Translation.FUNCTION_NULLABLE ); + private static final Integer ALLOWS_NULLS = DatabaseMetaData.functionNullable; private static final Object EMPTY_REMARKS = null; private static final Object UNDEFINED_CHAR_OCTET_LENGTH = null; private static final String IS_NULLABLE = "YES"; Modified: db/derby/code/trunk/java/tools/org/apache/derby/tools/SignatureChecker.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/tools/SignatureChecker.java?rev=1488929&r1=1488928&r2=1488929&view=diff ============================================================================== --- db/derby/code/trunk/java/tools/org/apache/derby/tools/SignatureChecker.java (original) +++ db/derby/code/trunk/java/tools/org/apache/derby/tools/SignatureChecker.java Mon Jun 3 09:13:48 2013 @@ -29,9 +29,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import org.apache.derby.iapi.services.info.JVMInfo; import org.apache.derby.jdbc.EmbeddedDataSource40; -import org.apache.derby.shared.common.reference.JDBC40Translation; import org.apache.derby.iapi.tools.i18n.LocalizedResource; /** @@ -350,7 +348,7 @@ public class SignatureChecker if ( isSystemSchema( schema ) ) { continue; } boolean isTableFunction; - if ( functionType == JDBC40Translation.FUNCTION_RETURNS_TABLE ) { isTableFunction = true; } + if ( functionType == DatabaseMetaData.functionReturnsTable ) { isTableFunction = true; } else { isTableFunction = false; } putFunction( schema, name, isTableFunction ); @@ -392,8 +390,8 @@ public class SignatureChecker // Skip all columns in the returned result set if this is a // table function. // - if ( columnType == JDBC40Translation.FUNCTION_RETURN ) { continue; } - if ( columnType == JDBC40Translation.FUNCTION_COLUMN_RESULT ) { continue; } + if ( columnType == DatabaseMetaData.functionReturn ) { continue; } + if ( columnType == DatabaseMetaData.functionColumnResult ) { continue; } function.addArg( rs.getString( 7 ) ); }