Return-Path: X-Original-To: apmail-empire-db-commits-archive@www.apache.org Delivered-To: apmail-empire-db-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C9BE4D24D for ; Fri, 31 Aug 2012 09:37:27 +0000 (UTC) Received: (qmail 28552 invoked by uid 500); 31 Aug 2012 09:37:27 -0000 Delivered-To: apmail-empire-db-commits-archive@empire-db.apache.org Received: (qmail 28535 invoked by uid 500); 31 Aug 2012 09:37:27 -0000 Mailing-List: contact commits-help@empire-db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@empire-db.apache.org Delivered-To: mailing list commits@empire-db.apache.org Received: (qmail 28512 invoked by uid 99); 31 Aug 2012 09:37:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Aug 2012 09:37:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 31 Aug 2012 09:37:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7C593238897F for ; Fri, 31 Aug 2012 09:36:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1379384 - /empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java Date: Fri, 31 Aug 2012 09:36:41 -0000 To: commits@empire-db.apache.org From: doebele@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120831093641.7C593238897F@eris.apache.org> Author: doebele Date: Fri Aug 31 09:36:41 2012 New Revision: 1379384 URL: http://svn.apache.org/viewvc?rev=1379384&view=rev Log: EMPIREDB-157 add check for key column in DBRecord.isFieldReadOnly() Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java?rev=1379384&r1=1379383&r2=1379384&view=diff ============================================================================== --- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java (original) +++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java Fri Aug 31 09:36:41 2012 @@ -657,6 +657,9 @@ public class DBRecord extends DBRecordDa throw new ObjectNotValidException(this); if (rowset.getColumnIndex(column)<0) throw new InvalidArgumentException("column", column); + // Check key column + if (isValid() && !isNew() && rowset.isKeyColumn((DBColumn)column)) + return true; // Ask RowSet return (rowset.isColumnReadOnly((DBColumn)column)); }