Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 48778 invoked from network); 19 Nov 2007 18:51:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Nov 2007 18:51:13 -0000 Received: (qmail 59746 invoked by uid 500); 19 Nov 2007 18:51:01 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 59718 invoked by uid 500); 19 Nov 2007 18:51:01 -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 59707 invoked by uid 99); 19 Nov 2007 18:51:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2007 10:51:01 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Mon, 19 Nov 2007 18:50:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DE2DD1A9832; Mon, 19 Nov 2007 10:50:52 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r596396 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Date: Mon, 19 Nov 2007 18:50:52 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071119185052.DE2DD1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: myrnavl Date: Mon Nov 19 10:50:51 2007 New Revision: 596396 URL: http://svn.apache.org/viewvc?rev=596396&view=rev Log: DERBY-2242 (partial) edit comments Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?rev=596396&r1=596395&r2=596396&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Mon Nov 19 10:50:51 2007 @@ -84,6 +84,17 @@ * - implement edge case with nested connection, verified using isReadOnly() * - implement getColumns edge case (marked 'beetle 4620') with large column * (if char or varchar size is > max integer /2 = 2147483647) + * - test for DERBY-655/DERBY-1343 + * + * convert from odbc_metadata.java test: + * - checks for SQLPROCEDURES, SQLPROCEDURECOLS, + * - checks for SQLCOLUMNS + * - checks for SQLCOLPRIVILEGES, SQLTABLEPRIVILEGES (????) + * - checks for SQLSPECIALCOLUMNS + * - checks for SQLPRIMARYKEYS + * - checks for SQLSTATISTICS + * - checks for GETBESTROWIDENTIFIER (not in any test?) + * - checks for GETINDEXINFO (not in any test?) */ public class DatabaseMetaDataTest extends BaseJDBCTestCase { @@ -2663,7 +2674,7 @@ * This effectively means that the SQLFOREIGNKEYS function * will always be mapped to getCrossReference() internally. * Since that worked fine prior to 10.3, we need to preserve - * that behavior if we want to maintina backward compatibility. + * that behavior if we want to maintain backward compatibility. */ CallableStatement cs = prepareCall( "CALL SYSIBM.SQLFOREIGNKEYS(?, ?, ?, ?, ?, ?, " + @@ -3113,12 +3124,6 @@ int [] columnTypes = { Types.VARCHAR,Types.VARCHAR,Types.VARCHAR,Types.VARCHAR, Types.VARCHAR,Types.VARCHAR,Types.VARCHAR}; - // Note: the API docs seem to suggest that TABLE_SCHEM (col2) may be - // null, however, that is not what we get back. - // For Grantee (col5), and privilege it's not so clear, as the api - // doesn't specify, which means it may not be null. - // Modified here so test will pass. - // See DERBY-3212. boolean [] nullability = {true,false,false,true,true,true,true}; DatabaseMetaData dmd = getDMD(); @@ -3233,8 +3238,7 @@ // tests seem necessary. Statement st = createStatement(); - // First, create the test tables and indexes/keys - // Create 5 tables which have only one best row identifier + // First, create the test table and indexes/keys st.execute("create table iit (i int not null, j int)"); st.execute("create unique index iii on iit(i asc, j desc)"); DatabaseMetaData dmd = getDMD(); @@ -3252,4 +3256,8 @@ st.close(); } + + + + }