Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 87104 invoked from network); 10 Jul 2007 20:45:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Jul 2007 20:45:03 -0000 Received: (qmail 54400 invoked by uid 500); 10 Jul 2007 20:45:06 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 54377 invoked by uid 500); 10 Jul 2007 20:45:06 -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 54366 invoked by uid 99); 10 Jul 2007 20:45:05 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jul 2007 13:45:05 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jul 2007 13:45:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A12D81A981A; Tue, 10 Jul 2007 13:44:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r555074 - in /db/derby/code/trunk/java/engine/org/apache/derby: catalog/SystemProcedures.java catalog/TypeDescriptor.java iapi/types/DataTypeDescriptor.java impl/sql/catalog/DataDictionaryImpl.java Date: Tue, 10 Jul 2007 20:44:41 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070710204441.A12D81A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djd Date: Tue Jul 10 13:44:40 2007 New Revision: 555074 URL: http://svn.apache.org/viewvc?view=rev&rev=555074 Log: DERBY-2917 DERBY-2775 Modify creating of system routines to use TypeDescriptors consistently and not DataTypedDescriptors. Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java db/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java?view=diff&rev=555074&r1=555073&r2=555074 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java Tue Jul 10 13:44:40 2007 @@ -725,8 +725,10 @@ " compress" + (sequential != 0 ? " sequential" : ""); Connection conn = getDefaultConn(); - - conn.prepareStatement(query).executeUpdate(); + + PreparedStatement ps = conn.prepareStatement(query); + ps.executeUpdate(); + ps.close(); conn.close(); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java?view=diff&rev=555074&r1=555073&r2=555074 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java Tue Jul 10 13:44:40 2007 @@ -21,6 +21,9 @@ package org.apache.derby.catalog; +import java.sql.Types; + +import org.apache.derby.iapi.types.DataTypeDescriptor; import org.apache.derby.iapi.types.StringDataValue; /** @@ -43,7 +46,27 @@ */ public static int MAXIMUM_WIDTH_UNKNOWN = -1; + + /** + * Catalog type for nullable INTEGER + */ + TypeDescriptor INTEGER = DataTypeDescriptor.INTEGER.getCatalogType(); + /** + * Catalog type for nullable SMALLINT + */ + TypeDescriptor SMALLINT = + DataTypeDescriptor.getBuiltInDataTypeDescriptor( + Types.SMALLINT).getCatalogType(); + + + /** + * Catalog type for nullable VARCHAR(128) used for types representing + * system catalogs. + */ + TypeDescriptor VARCHAR128 = + DataTypeDescriptor.getBuiltInDataTypeDescriptor( + Types.VARCHAR, 128).getCatalogType(); /////////////////////////////////////////////////////////////////////// // Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java?view=diff&rev=555074&r1=555073&r2=555074 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java Tue Jul 10 13:44:40 2007 @@ -89,6 +89,21 @@ { return DataTypeDescriptor.getBuiltInDataTypeDescriptor(jdbcType, true, length); } + + /** + * Return a nullable catalog type for a JDBC builtin type and length. + */ + public static TypeDescriptor getCatalogType(int jdbcType, int length) + { + return getBuiltInDataTypeDescriptor(jdbcType, length).getCatalogType(); + } + /** + * Return a nullable catalog type for a fixed length JDBC builtin type. + */ + public static TypeDescriptor getCatalogType(int jdbcType) + { + return getBuiltInDataTypeDescriptor(jdbcType).getCatalogType(); + } /** * Get a descriptor that corresponds to a builtin JDBC type. 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?view=diff&rev=555074&r1=555073&r2=555074 ============================================================================== --- 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 Tue Jul 10 13:44:40 2007 @@ -6186,7 +6186,7 @@ { // details[1] Return type TypeDescriptor rt = - DataTypeDescriptor.getBuiltInDataTypeDescriptor(details[1]); + DataTypeDescriptor.getBuiltInDataTypeDescriptor(details[1]).getCatalogType(); // details[4] - zero or single argument type String paramType = details[4]; @@ -6201,7 +6201,7 @@ paramModes = DataDictionaryImpl.SYSFUN_PMODE; pt = new TypeDescriptor[1]; pt[0] = - DataTypeDescriptor.getBuiltInDataTypeDescriptor(paramType); + DataTypeDescriptor.getBuiltInDataTypeDescriptor(paramType).getCatalogType(); } else { @@ -8740,9 +8740,9 @@ TransactionController tc) throws StandardException { - TypeDescriptor integerType = DataTypeDescriptor.INTEGER.getCatalogType(); - TypeDescriptor varchar128Type = - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128).getCatalogType(); + // Types used for routine parameters and return types, all nullable. + TypeDescriptor varchar32672Type = DataTypeDescriptor.getCatalogType( + Types.VARCHAR, 32672); /* ** SYSCS_UTIL routines. */ @@ -8763,8 +8763,8 @@ // procedure argument types TypeDescriptor[] arg_types = { - varchar128Type, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType( Types.VARCHAR, Limits.DB2_VARCHAR_MAXWIDTH) }; @@ -8788,10 +8788,9 @@ // procedure argument types TypeDescriptor[] arg_types = { - varchar128Type, - varchar128Type, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT) + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.SMALLINT }; @@ -8858,7 +8857,7 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, Limits.DB2_VARCHAR_MAXWIDTH) }; @@ -8882,10 +8881,9 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, Limits.DB2_VARCHAR_MAXWIDTH), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT) + TypeDescriptor.SMALLINT }; createSystemProcedureOrFunction( @@ -8906,10 +8904,7 @@ String[] arg_names = {"DELETE_ARCHIVED_LOG_FILES"}; // procedure argument types - TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT) - }; + TypeDescriptor[] arg_types = {TypeDescriptor.SMALLINT}; createSystemProcedureOrFunction( "SYSCS_DISABLE_LOG_ARCHIVE_MODE", @@ -8929,10 +8924,7 @@ String[] arg_names = {"ENABLE"}; // procedure argument types - TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT) - }; + TypeDescriptor[] arg_types = {TypeDescriptor.SMALLINT}; routine_uuid = createSystemProcedureOrFunction( "SYSCS_SET_RUNTIMESTATISTICS", @@ -8954,10 +8946,7 @@ String[] arg_names = {"ENABLE"}; // procedure argument types - TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT) - }; + TypeDescriptor[] arg_types = {TypeDescriptor.SMALLINT}; routine_uuid = createSystemProcedureOrFunction( "SYSCS_SET_STATISTICS_TIMING", @@ -8988,9 +8977,7 @@ String[] arg_names = {"KEY"}; // procedure argument types - TypeDescriptor[] arg_types = { - varchar128Type - }; + TypeDescriptor[] arg_types = {TypeDescriptor.VARCHAR128}; createSystemProcedureOrFunction( "SYSCS_GET_DATABASE_PROPERTY", @@ -9000,7 +8987,7 @@ 0, 0, RoutineAliasInfo.READS_SQL_DATA, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, Limits.DB2_VARCHAR_MAXWIDTH), tc); } @@ -9012,8 +8999,8 @@ // procedure argument types TypeDescriptor[] arg_types = { - varchar128Type, - varchar128Type + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128 }; createSystemProcedureOrFunction( @@ -9024,8 +9011,7 @@ 0, 0, RoutineAliasInfo.READS_SQL_DATA, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), + TypeDescriptor.INTEGER, tc); } @@ -9040,13 +9026,13 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, Limits.DB2_VARCHAR_MAXWIDTH), /* TODO - mikem, wants to be a CLOB, but don't know how to do that yet. Testing it with varchar for now. - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CLOB, Limits.DB2_LOB_MAXWIDTH), */ tc); @@ -9068,10 +9054,10 @@ String[] arg_names = {"URL", "JAR", "DEPLOY"}; TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 256), - varchar128Type, - integerType + TypeDescriptor.VARCHAR128, + TypeDescriptor.INTEGER }; createSystemProcedureOrFunction( @@ -9091,9 +9077,9 @@ String[] arg_names = {"URL", "JAR"}; TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 256), - varchar128Type + TypeDescriptor.VARCHAR128 }; createSystemProcedureOrFunction( @@ -9113,8 +9099,8 @@ String[] arg_names = {"JAR", "UNDEPLOY"}; TypeDescriptor[] arg_types = { - varchar128Type, - integerType + TypeDescriptor.VARCHAR128, + TypeDescriptor.INTEGER }; createSystemProcedureOrFunction( @@ -9144,15 +9130,14 @@ // procedure argument types TypeDescriptor[] arg_types = { - varchar128Type, - varchar128Type, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + varchar32672Type, + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - varchar128Type + TypeDescriptor.VARCHAR128 }; createSystemProcedureOrFunction( @@ -9181,15 +9166,13 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + varchar32672Type, + varchar32672Type, + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - varchar128Type + TypeDescriptor.VARCHAR128 }; createSystemProcedureOrFunction( @@ -9220,17 +9203,15 @@ // procedure argument types TypeDescriptor[] arg_types = { - varchar128Type, - varchar128Type, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + varchar32672Type, + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - varchar128Type, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT), + TypeDescriptor.VARCHAR128, + TypeDescriptor.SMALLINT, }; @@ -9263,21 +9244,17 @@ // procedure argument types TypeDescriptor[] arg_types = { - varchar128Type, - varchar128Type, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + varchar32672Type, + varchar32672Type, + varchar32672Type, + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - varchar128Type, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT), + TypeDescriptor.VARCHAR128, + TypeDescriptor.SMALLINT, }; @@ -9308,12 +9285,10 @@ // procedure argument types TypeDescriptor[] arg_types = { - varchar128Type, - varchar128Type, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 32672), + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + varchar32672Type, + varchar32672Type, }; @@ -9386,23 +9361,23 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.SMALLINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + TypeDescriptor.SMALLINT, + DataTypeDescriptor.getCatalogType( Types.VARCHAR, Limits.DB2_JCC_MAX_EXCEPTION_PARAM_LENGTH), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.CHAR, 8), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.CHAR, 11), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.CHAR, 5), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 50), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.CHAR, 5), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 2400), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER) + DataTypeDescriptor.getCatalogType(Types.CHAR, 8), + TypeDescriptor.INTEGER, + TypeDescriptor.INTEGER, + TypeDescriptor.INTEGER, + TypeDescriptor.INTEGER, + TypeDescriptor.INTEGER, + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType(Types.CHAR, 11), + DataTypeDescriptor.getCatalogType(Types.CHAR, 5), + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 50), + DataTypeDescriptor.getCatalogType(Types.CHAR, 5), + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 2400), + TypeDescriptor.INTEGER }; createSystemProcedureOrFunction( @@ -9429,10 +9404,10 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLPROCEDURES", @@ -9458,10 +9433,10 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLTABLEPRIVILEGES", @@ -9487,10 +9462,10 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLPRIMARYKEYS", @@ -9517,11 +9492,11 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000), + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLTABLES", @@ -9549,11 +9524,11 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLPROCEDURECOLS", @@ -9580,11 +9555,11 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLCOLUMNS", @@ -9611,11 +9586,11 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLCOLPRIVILEGES", @@ -9642,11 +9617,11 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLUDTS", @@ -9676,13 +9651,13 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLFOREIGNKEYS", @@ -9712,13 +9687,13 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.SMALLINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.SMALLINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.SMALLINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.SMALLINT, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.SMALLINT, + TypeDescriptor.SMALLINT, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLSPECIALCOLUMNS", @@ -9742,8 +9717,8 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.SMALLINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.SMALLINT, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLGETTYPEINFO", @@ -9772,12 +9747,12 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.SMALLINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.SMALLINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.SMALLINT, + TypeDescriptor.SMALLINT, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLSTATISTICS", @@ -9926,8 +9901,7 @@ TransactionController tc, UUID sysUtilUUID) throws StandardException - { - + { UUID routine_uuid = null; // void SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE( @@ -9948,16 +9922,11 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT) + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.SMALLINT, + TypeDescriptor.SMALLINT, + TypeDescriptor.SMALLINT }; routine_uuid = createSystemProcedureOrFunction( @@ -10003,7 +9972,7 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, Limits.DB2_VARCHAR_MAXWIDTH) }; @@ -10031,10 +10000,9 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, Limits.DB2_VARCHAR_MAXWIDTH), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT) + TypeDescriptor.SMALLINT }; createSystemProcedureOrFunction( @@ -10062,10 +10030,10 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLFUNCTIONS", @@ -10093,11 +10061,11 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR, 4000)}; + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType(Types.VARCHAR, 4000)}; createSystemProcedureOrFunction( "SQLFUNCTIONPARAMS", @@ -10141,8 +10109,7 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER, Integer.MAX_VALUE), + TypeDescriptor.INTEGER, tc, "org.apache.derby.impl.jdbc.LOBStoredProcedure"); } @@ -10150,9 +10117,7 @@ UUID routine_uuid = null; String[] arg_names = {"LOCATOR"}; - TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER)}; + TypeDescriptor[] arg_types = {TypeDescriptor.INTEGER}; routine_uuid = createSystemProcedureOrFunction( "CLOBRELEASELOCATOR", @@ -10172,11 +10137,10 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.VARCHAR), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.BIGINT) }; routine_uuid = createSystemProcedureOrFunction( @@ -10187,8 +10151,8 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.BIGINT, Limits.DB2_LOB_MAXWIDTH), + DataTypeDescriptor.getCatalogType( + Types.BIGINT), tc, "org.apache.derby.impl.jdbc.LOBStoredProcedure"); } @@ -10198,11 +10162,9 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.BIGINT) }; routine_uuid = createSystemProcedureOrFunction( @@ -10213,8 +10175,8 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.BIGINT, Limits.DB2_LOB_MAXWIDTH), + DataTypeDescriptor.getCatalogType( + Types.BIGINT), tc, "org.apache.derby.impl.jdbc.LOBStoredProcedure"); } @@ -10223,10 +10185,7 @@ String[] arg_names = {"LOCATOR"}; // procedure argument types - TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER) - }; + TypeDescriptor[] arg_types = {TypeDescriptor.INTEGER}; routine_uuid = createSystemProcedureOrFunction( "CLOBGETLENGTH", schema_uuid, @@ -10235,8 +10194,8 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.BIGINT, Limits.DB2_LOB_MAXWIDTH), + DataTypeDescriptor.getCatalogType( + Types.BIGINT), tc, "org.apache.derby.impl.jdbc.LOBStoredProcedure"); } @@ -10246,12 +10205,10 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.BIGINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER) + TypeDescriptor.INTEGER }; routine_uuid = createSystemProcedureOrFunction( "CLOBGETSUBSTRING", @@ -10261,7 +10218,7 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, Limits.DB2_VARCHAR_MAXWIDTH), tc, "org.apache.derby.impl.jdbc.LOBStoredProcedure"); @@ -10272,13 +10229,11 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.BIGINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.VARCHAR) }; routine_uuid = createSystemProcedureOrFunction( @@ -10299,9 +10254,8 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.BIGINT) }; routine_uuid = createSystemProcedureOrFunction( @@ -10332,8 +10286,7 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER, Integer.MAX_VALUE), + TypeDescriptor.INTEGER, tc, "org.apache.derby.impl.jdbc.LOBStoredProcedure"); } @@ -10341,9 +10294,7 @@ UUID routine_uuid = null; String[] arg_names = {"LOCATOR"}; - TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER)}; + TypeDescriptor[] arg_types = {TypeDescriptor.INTEGER}; routine_uuid = createSystemProcedureOrFunction( "BLOBRELEASELOCATOR", @@ -10363,11 +10314,10 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.VARBINARY), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.BIGINT) }; routine_uuid = createSystemProcedureOrFunction( @@ -10378,8 +10328,8 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.BIGINT, Limits.DB2_LOB_MAXWIDTH), + DataTypeDescriptor.getCatalogType( + Types.BIGINT), tc, "org.apache.derby.impl.jdbc.LOBStoredProcedure"); } @@ -10389,11 +10339,9 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.BIGINT) }; routine_uuid = createSystemProcedureOrFunction( @@ -10404,8 +10352,8 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.BIGINT, Limits.DB2_LOB_MAXWIDTH), + DataTypeDescriptor.getCatalogType( + Types.BIGINT), tc, "org.apache.derby.impl.jdbc.LOBStoredProcedure"); } @@ -10415,8 +10363,7 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER) + TypeDescriptor.INTEGER }; routine_uuid = createSystemProcedureOrFunction( "BLOBGETLENGTH", @@ -10426,8 +10373,8 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.BIGINT, Limits.DB2_LOB_MAXWIDTH), + DataTypeDescriptor.getCatalogType( + Types.BIGINT), tc, "org.apache.derby.impl.jdbc.LOBStoredProcedure"); } @@ -10437,12 +10384,10 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.BIGINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER) + TypeDescriptor.INTEGER }; routine_uuid = createSystemProcedureOrFunction( "BLOBGETBYTES", @@ -10452,7 +10397,7 @@ 0, 0, RoutineAliasInfo.CONTAINS_SQL, - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARBINARY, Limits.DB2_VARCHAR_MAXWIDTH), tc, "org.apache.derby.impl.jdbc.LOBStoredProcedure"); @@ -10463,13 +10408,11 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.BIGINT), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.VARBINARY) }; routine_uuid = createSystemProcedureOrFunction( @@ -10490,9 +10433,8 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.INTEGER), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.INTEGER, + DataTypeDescriptor.getCatalogType( Types.BIGINT) }; routine_uuid = createSystemProcedureOrFunction( @@ -10537,12 +10479,6 @@ TransactionController tc) throws StandardException { - // Safe to re-use a TypeDescriptor here as they are - // not modified during the creation of the routine - TypeDescriptor varchar128 = - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128); - UUID sysUtilUUID = getSystemUtilSchemaDescriptor().getUUID(); /* SYSCS_EXPORT_TABLE_LOBS_TO_EXTFILE(IN SCHEMANAME VARCHAR(128), * IN TABLENAME VARCHAR(128), IN FILENAME VARCHAR(32672) , @@ -10559,19 +10495,16 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672) }; @@ -10602,17 +10535,16 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672) }; @@ -10642,20 +10574,16 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT), + TypeDescriptor.VARCHAR128, + TypeDescriptor.SMALLINT, }; createSystemProcedureOrFunction( @@ -10686,24 +10614,20 @@ // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + TypeDescriptor.VARCHAR128, + TypeDescriptor.VARCHAR128, + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( + DataTypeDescriptor.getCatalogType( Types.CHAR, 1), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.VARCHAR, 128), - DataTypeDescriptor.getBuiltInDataTypeDescriptor( - Types.SMALLINT), + TypeDescriptor.VARCHAR128, + TypeDescriptor.SMALLINT, }; @@ -10737,7 +10661,7 @@ // void SYSCS_UTIL.SYSCS_SET_USER_ACCESS(USER_NAME VARCHAR(128), // CONNECTION_PERMISSION VARCHAR(128)) { - TypeDescriptor[] arg_types = {varchar128, varchar128}; + TypeDescriptor[] arg_types = {TypeDescriptor.VARCHAR128, TypeDescriptor.VARCHAR128}; createSystemProcedureOrFunction( "SYSCS_SET_USER_ACCESS", @@ -10753,7 +10677,7 @@ // VARCHAR(128) SYSCS_UTIL.SYSCS_SET_USER_ACCESS(USER_NAME VARCHAR(128)) { - TypeDescriptor[] arg_types = { varchar128 }; + TypeDescriptor[] arg_types = { TypeDescriptor.VARCHAR128 }; createSystemProcedureOrFunction( "SYSCS_GET_USER_ACCESS", @@ -10763,7 +10687,7 @@ 0, 0, RoutineAliasInfo.READS_SQL_DATA, - varchar128, + TypeDescriptor.VARCHAR128, tc); }