Return-Path: Delivered-To: apmail-incubator-empire-db-commits-archive@minotaur.apache.org Received: (qmail 43033 invoked from network); 13 Jul 2009 21:56:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Jul 2009 21:56:49 -0000 Received: (qmail 75311 invoked by uid 500); 13 Jul 2009 21:56:59 -0000 Delivered-To: apmail-incubator-empire-db-commits-archive@incubator.apache.org Received: (qmail 75289 invoked by uid 500); 13 Jul 2009 21:56:59 -0000 Mailing-List: contact empire-db-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@incubator.apache.org Delivered-To: mailing list empire-db-commits@incubator.apache.org Received: (qmail 75279 invoked by uid 99); 13 Jul 2009 21:56:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jul 2009 21:56:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 13 Jul 2009 21:56:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B0EC423888C5; Mon, 13 Jul 2009 21:56:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r793726 - /incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java Date: Mon, 13 Jul 2009 21:56:34 -0000 To: empire-db-commits@incubator.apache.org From: francisdb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090713215634.B0EC423888C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: francisdb Date: Mon Jul 13 21:56:34 2009 New Revision: 793726 URL: http://svn.apache.org/viewvc?rev=793726&view=rev Log: EMPIREDB-44 Fix for CLOB data type in Derby driver Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java?rev=793726&r1=793725&r2=793726&view=diff ============================================================================== --- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java (original) +++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java Mon Jul 13 21:56:34 2009 @@ -573,12 +573,18 @@ } break; case CLOB: - sql.append("LONGTEXT"); + sql.append("CLOB"); + if (c.getSize() > 0) + { + sql.append("(" + String.valueOf((long) c.getSize()) + ") "); + } break; case BLOB: sql.append("BLOB"); if (c.getSize() > 0) - sql.append(" (" + String.valueOf((long) c.getSize()) + ") "); + { + sql.append("(" + String.valueOf((long) c.getSize()) + ") "); + } break; case UNKNOWN: log.error("Cannot append column of Data-Type 'UNKNOWN'"); @@ -586,7 +592,8 @@ } // Default Value if (isDDLColumnDefaults() && c.getDataType()!=DataType.AUTOINC && c.getDefaultValue()!=null) - { sql.append(" DEFAULT "); + { + sql.append(" DEFAULT "); sql.append(getValueString(c.getDefaultValue(), c.getDataType())); } // Nullable