From ddlutils-dev-return-630-apmail-db-ddlutils-dev-archive=db.apache.org@db.apache.org Fri Feb 17 19:25:35 2006 Return-Path: Delivered-To: apmail-db-ddlutils-dev-archive@www.apache.org Received: (qmail 95649 invoked from network); 17 Feb 2006 19:25:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 Feb 2006 19:25:35 -0000 Received: (qmail 5431 invoked by uid 500); 17 Feb 2006 19:25:31 -0000 Delivered-To: apmail-db-ddlutils-dev-archive@db.apache.org Received: (qmail 5340 invoked by uid 500); 17 Feb 2006 19:25:30 -0000 Mailing-List: contact ddlutils-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ddlutils-dev@db.apache.org Delivered-To: mailing list ddlutils-dev@db.apache.org Received: (qmail 5293 invoked by uid 500); 17 Feb 2006 19:25:30 -0000 Delivered-To: apmail-db-ddlutils-commits@db.apache.org Received: (qmail 5275 invoked by uid 99); 17 Feb 2006 19:25:30 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Feb 2006 11:25:30 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 17 Feb 2006 11:25:28 -0800 Received: (qmail 94988 invoked by uid 65534); 17 Feb 2006 19:25:08 -0000 Message-ID: <20060217192508.94987.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r378599 - in /db/ddlutils/trunk/src/java/org/apache/ddlutils/platform: PlatformImplBase.java SqlBuilder.java Date: Fri, 17 Feb 2006 19:25:07 -0000 To: ddlutils-commits@db.apache.org From: tomdz@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: tomdz Date: Fri Feb 17 11:25:07 2006 New Revision: 378599 URL: http://svn.apache.org/viewcvs?rev=378599&view=rev Log: Fix for DDLUTILS-72 as supplied by Vignesh Swaminathan Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java?rev=378599&r1=378598&r2=378599&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java Fri Feb 17 11:25:07 2006 @@ -1281,6 +1281,8 @@ Table table = model.findTable(dynaClass.getTableName()); HashMap columnValues = toColumnValues(properties, bean); + columnValues.putAll(toColumnValues(primaryKeys, bean)); + return _builder.getUpdateSql(table, columnValues, bean == null); } @@ -1333,7 +1335,7 @@ { setObject(statement, sqlIndex++, dynaBean, properties[idx]); } - for (int idx = 0; idx < properties.length; idx++) + for (int idx = 0; idx < primaryKeys.length; idx++) { setObject(statement, sqlIndex++, dynaBean, primaryKeys[idx]); } Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java?rev=378599&r1=378598&r2=378599&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java Fri Feb 17 11:25:07 2006 @@ -791,8 +791,9 @@ * update statement usable in a prepared statement is build. * * @param table The table - * @param columnValues Contains the primary key values to identify the object to update - * and the values for the columns to update + * @param columnValues Contains the values for the columns to update, and should also + * contain the primary key values to identify the object to update + * in case genPlaceholders is false * @param genPlaceholders Whether to generate value placeholders for a * prepared statement (both for the pk values and the object values) * @return The update sql