From dev-return-16275-apmail-openjpa-dev-archive=openjpa.apache.org@openjpa.apache.org Wed Apr 21 20:37:18 2010 Return-Path: Delivered-To: apmail-openjpa-dev-archive@www.apache.org Received: (qmail 68302 invoked from network); 21 Apr 2010 20:37:18 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Apr 2010 20:37:18 -0000 Received: (qmail 73770 invoked by uid 500); 21 Apr 2010 20:37:18 -0000 Delivered-To: apmail-openjpa-dev-archive@openjpa.apache.org Received: (qmail 73737 invoked by uid 500); 21 Apr 2010 20:37:18 -0000 Mailing-List: contact dev-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list dev@openjpa.apache.org Received: (qmail 73729 invoked by uid 99); 21 Apr 2010 20:37:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Apr 2010 20:37:18 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=AWL,RCVD_IN_DNSWL_NONE,SPF_NEUTRAL,UNPARSEABLE_RELAY X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [76.13.13.93] (HELO smtp110.prem.mail.ac4.yahoo.com) (76.13.13.93) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 21 Apr 2010 20:37:12 +0000 Received: (qmail 95383 invoked from network); 21 Apr 2010 20:36:51 -0000 Received: from cpe-174-099-058-061.nc.res.rr.com (dwoods@174.99.58.61 with plain) by smtp110.prem.mail.ac4.yahoo.com with SMTP; 21 Apr 2010 13:36:50 -0700 PDT X-Yahoo-SMTP: sCI.ryiswBB7FW.DxjU523c87MI- X-YMail-OSG: cnjP5Q8VM1m2Vl2BpSS4X0Tk_JLOAcV42C57qy4tcws2qsDFAHSy5O0Xp0nGPshFAMiD4nIe2T3i4_VM40yV3iuPAn9jqRzCGSfnmvI5EESXAqOPnWWEFs39xENvKBZjdfqMBjjNutg4n0wbdwFeoKyT0qhAWMmo8lcv7IY9jI.tiS1y_GQUVBj8MspP_bJ.sMZGrkWKMrYqUab9YpZ3Al0663GS3N.u.kPiLTewdKyn0J9RjnoEI4v81oAGj4HjcV_BG6YF.fp_Y1ANns6C5mpSuc2ADZ3cM223KOqCOKZHqBnD_oVAMiDNiQ-- X-Yahoo-Newman-Property: ymail-3 Message-ID: <4BCF61D5.70000@apache.org> Date: Wed, 21 Apr 2010 16:36:37 -0400 From: Donald Woods User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.9) Gecko/20100317 Lightning/1.0b1 Thunderbird/3.0.4 MIME-Version: 1.0 To: dev@openjpa.apache.org Subject: Re: svn commit: r936449 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java References: <20100421191145.D998623889E7@eris.apache.org> In-Reply-To: <20100421191145.D998623889E7@eris.apache.org> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Fay, please open a new JIRA for this, as 1596 has already been marked as resolved and included in the 2.0.0 release notes. -Donald On 4/21/10 3:11 PM, faywang@apache.org wrote: > Author: faywang > Date: Wed Apr 21 19:11:45 2010 > New Revision: 936449 > > URL: http://svn.apache.org/viewvc?rev=936449&view=rev > Log: > OPENJPA-1596: fix index name for DB2 zOS when schema is present. > > Modified: > openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java > > Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java > URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=936449&r1=936448&r2=936449&view=diff > ============================================================================== > --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original) > +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed Apr 21 19:11:45 2010 > @@ -33,6 +33,7 @@ import java.util.Set; > import java.util.StringTokenizer; > > import org.apache.openjpa.jdbc.identifier.DBIdentifier; > +import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier; > import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration; > import org.apache.openjpa.jdbc.kernel.exps.FilterValue; > import org.apache.openjpa.jdbc.kernel.exps.Lit; > @@ -912,8 +913,10 @@ public class DB2Dictionary > // build the index for the sequence tables > // the index name will be the fully qualified table name + _IDX > Table tab = schema.getTable(table); > - DBIdentifier idxName = DBIdentifier.append(tab.getFullIdentifier(), "IDX"); > - Index idx = tab.addIndex(getValidIndexName(idxName, tab)); > + DBIdentifier fullIdxId = tab.getFullIdentifier().clone(); > + DBIdentifier unQualifiedName = DBIdentifier.append(fullIdxId.getUnqualifiedName(), "IDX"); > + fullIdxId.setName(getValidIndexName(unQualifiedName, tab)); > + Index idx = tab.addIndex(fullIdxId); > idx.setUnique(true); > idx.addColumn(pkColumn); > } > > >