Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 54229 invoked from network); 13 Mar 2007 07:45:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Mar 2007 07:45:48 -0000 Received: (qmail 80716 invoked by uid 500); 13 Mar 2007 07:45:56 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 80641 invoked by uid 500); 13 Mar 2007 07:45:56 -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 80630 invoked by uid 99); 13 Mar 2007 07:45:56 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2007 00:45:56 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 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, 13 Mar 2007 00:45:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B4CCE1A9838; Tue, 13 Mar 2007 00:45:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r517577 - in /db/derby/code/trunk/java: client/org/apache/derby/client/am/CrossConverters.java testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Date: Tue, 13 Mar 2007 07:45:26 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070313074526.B4CCE1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Tue Mar 13 00:45:25 2007 New Revision: 517577 URL: http://svn.apache.org/viewvc?view=rev&rev=517577 Log: DERBY-2430: setObject(int targetType, Blob source) and setObject(int targetType, Clob source) should disallow updates on all targetTypes except BLOB and CLOB respectively Patch contributed by V. Narayanan. Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java?view=diff&rev=517577&r1=517576&r2=517577 ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CrossConverters.java Tue Mar 13 00:45:25 2007 @@ -749,14 +749,6 @@ switch (targetType) { case Types.BLOB: return source; - case Types.BINARY: - case Types.VARBINARY: - case Types.LONGVARBINARY: - try { - return source.getBytes(1L, (int) source.length()); - } catch (java.sql.SQLException e) { - throw new SqlException(e); - } default: throw new SqlException(agent_.logWriter_, new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH), @@ -814,10 +806,6 @@ switch (targetType) { case Types.CLOB: return source; - case Types.CHAR: - case Types.VARCHAR: - case Types.LONGVARCHAR: - return source.toString(); default: throw new SqlException(agent_.logWriter_, new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH), Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java?view=diff&rev=517577&r1=517576&r2=517577 ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Tue Mar 13 00:45:25 2007 @@ -254,12 +254,12 @@ /* 3 DECIMAL */ {"PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "22018", "XCL12", "XCL12", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "XCL12", "XCL12"}, /* 4 REAL */ {"PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "XCL12", "XCL12", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "XCL12", "XCL12"}, /* 5 DOUBLE */ {"PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "XCL12", "XCL12", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "XCL12", "XCL12"}, - /* 6 CHAR */ {"PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "XCL12", "XCL12", "PASS", "PASS", "PASS", "PASS", "XCL12", "PASS", "PASS", "XCL12", "XCL12"}, - /* 7 VARCHAR */ {"PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "XCL12", "XCL12", "PASS", "PASS", "PASS", "PASS", "XCL12", "PASS", "PASS", "XCL12", "XCL12"}, - /* 8 LONGVARCHAR */ {"PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "XCL12", "XCL12", "PASS", "PASS", "PASS", "PASS", "XCL12", "PASS", "PASS", "XCL12", "XCL12"}, - /* 9 CHAR FOR BIT */ {"XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "22001", "XCL12", "PASS", "XCL12", "XCL12"}, - /* 10 VARCH. BIT */ {"XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "22001", "XCL12", "PASS", "XCL12", "XCL12"}, - /* 11 LONGVAR. BIT */ {"XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "XCL12", "PASS", "XCL12", "XCL12"}, + /* 6 CHAR */ {"PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "PASS", "XCL12", "PASS", "PASS", "XCL12", "XCL12"}, + /* 7 VARCHAR */ {"PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "PASS", "XCL12", "PASS", "PASS", "XCL12", "XCL12"}, + /* 8 LONGVARCHAR */ {"PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "PASS", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "PASS", "XCL12", "PASS", "PASS", "XCL12", "XCL12"}, + /* 9 CHAR FOR BIT */ {"XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "XCL12", "XCL12"}, + /* 10 VARCH. BIT */ {"XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "XCL12", "XCL12"}, + /* 11 LONGVAR. BIT */ {"XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "XCL12", "XCL12"}, /* 12 CLOB */ {"XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "PASS", "XCL12", "XCL12", "XCL12", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "XCL12", "XCL12"}, /* 13 DATE */ {"XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "XCL12", "PASS", "XCL12", "XCL12", "PASS", "XCL12", "XCL12"}, /* 14 TIME */ {"XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "XCL12", "PASS", "PASS", "XCL12", "XCL12", "PASS", "XCL12", "XCL12"},