Return-Path: Delivered-To: apmail-openjpa-dev-archive@www.apache.org Received: (qmail 57269 invoked from network); 15 Sep 2009 20:50:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Sep 2009 20:50:26 -0000 Received: (qmail 48957 invoked by uid 500); 15 Sep 2009 20:50:26 -0000 Delivered-To: apmail-openjpa-dev-archive@openjpa.apache.org Received: (qmail 48893 invoked by uid 500); 15 Sep 2009 20:50:25 -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 48883 invoked by uid 99); 15 Sep 2009 20:50:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Sep 2009 20:50:25 +0000 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_NEUTRAL,UNPARSEABLE_RELAY X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [76.13.13.46] (HELO smtp107.prem.mail.ac4.yahoo.com) (76.13.13.46) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 15 Sep 2009 20:50:16 +0000 Received: (qmail 23559 invoked from network); 15 Sep 2009 20:48:55 -0000 Received: from cpe-174-099-058-061.nc.res.rr.com (dwoods@174.99.58.61 with plain) by smtp107.prem.mail.ac4.yahoo.com with SMTP; 15 Sep 2009 13:48:54 -0700 PDT X-Yahoo-SMTP: sCI.ryiswBB7FW.DxjU523c87MI- X-YMail-OSG: RrXHaZIVM1lu6NcmP4_NAxvNlw55DiI25xqRB8suZisBNYCVebU5w4.ZfrbG4kF.ErlEIk.1t8Ph3FmA6u0Lf55EooK7.r31Juwvf6UwI_dqXv9KdEZJG_O6Tx9ngXHlA9vWX.BnbIUynEBjE9RWKT4tRraiunnpuedOyr1sWM_u10j8sllaMI6Ec1mXecskkyVQh5EqkDncmYdbZ8cxPxLEHf7KsB9kt7CXuD96iczL9rnMg0.XqjaG06SuZxrPIZOwhxH4_dzXythjs_VcJrSn8gu8lsmO_WaNhLbLShUTzCPc3jcOBeNzq8JYQ9thciw- X-Yahoo-Newman-Property: ymail-3 Message-ID: <4AAFFDB6.7050802@apache.org> Date: Tue, 15 Sep 2009 16:48:54 -0400 From: Donald Woods User-Agent: Thunderbird 2.0.0.23 (Macintosh/20090812) MIME-Version: 1.0 To: dev@openjpa.apache.org Subject: Re: svn commit: r815473 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence: embed/attrOverrides/ enhance/identity/ References: <20090915203807.CC278238890B@eris.apache.org> In-Reply-To: <20090915203807.CC278238890B@eris.apache.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org If these are reserved words, shouldn't we add them to the OracleDictionary so they'll get escaped out for any app that happens to try using them? -Donald jrbauer@apache.org wrote: > Author: jrbauer > Date: Tue Sep 15 20:38:07 2009 > New Revision: 815473 > > URL: http://svn.apache.org/viewvc?rev=815473&view=rev > Log: > Modify entity definitions to avoid Oracle reserved words. > > Modified: > openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java > openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java > openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java > openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java > openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java > > Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java > URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java?rev=815473&r1=815472&r2=815473&view=diff > ============================================================================== > --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java (original) > +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java Tue Sep 15 20:38:07 2009 > @@ -25,17 +25,18 @@ > @Table(name="PHONE_ATTROVER") > public class PhoneNumber { > @Id > - int number; > + int phNumber; > + > > @ManyToMany(mappedBy="contactInfo.phoneNumbers") > Collection employees = new ArrayList(); > > - public int getNumber() { > - return number; > + public int getPhNumber() { > + return phNumber; > } > > - public void setNumber(int number) { > - this.number = number; > + public void setPhNumber(int number) { > + this.phNumber = number; > } > > public Collection getEmployees() { > > Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java > URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java?rev=815473&r1=815472&r2=815473&view=diff > ============================================================================== > --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java (original) > +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java Tue Sep 15 20:38:07 2009 > @@ -145,7 +145,7 @@ > > public PhoneNumber createPhoneNumber(EntityManager em) { > PhoneNumber p = new PhoneNumber(); > - p.setNumber(phoneId++); > + p.setPhNumber(phoneId++); > em.persist(p); > return p; > } > @@ -187,7 +187,7 @@ > } > > public void assertPhoneNumber(PhoneNumber p, int empId) { > - int number = p.getNumber(); > + int number = p.getPhNumber(); > Collection es = p.getEmployees(); > for (Employee e: es) { > assertEquals(empId, e.getEmpId()); > > Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java > URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java?rev=815473&r1=815472&r2=815473&view=diff > ============================================================================== > --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java (original) > +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java Tue Sep 15 20:38:07 2009 > @@ -62,7 +62,7 @@ > public boolean equals(Object o) { > Employee e = (Employee) o; > PhoneNumber p = e.getPhoneNumber(); > - if (p.getNumber() != phoneNumber.getNumber()) > + if (p.getPhNumber() != phoneNumber.getPhNumber()) > return false; > > return true; > > Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java > URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java?rev=815473&r1=815472&r2=815473&view=diff > ============================================================================== > --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java (original) > +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java Tue Sep 15 20:38:07 2009 > @@ -24,18 +24,18 @@ > @Table(name="PH_MBI") > public class PhoneNumber { > @Id > - int number; > + int phNumber; > > @OneToOne(fetch=FetchType.LAZY) > Employee emp; > > > - public int getNumber() { > - return number; > + public int getPhNumber() { > + return phNumber; > } > > - public void setNumber(int number) { > - this.number = number; > + public void setPhNumber(int number) { > + this.phNumber = number; > } > > public Employee getEmp() { > > Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java > URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java?rev=815473&r1=815472&r2=815473&view=diff > ============================================================================== > --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java (original) > +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java Tue Sep 15 20:38:07 2009 > @@ -170,7 +170,7 @@ > e.setEmpId(1); > e.setEmpType(Employee.EmpType.A1); > PhoneNumber phoneNumber = new PhoneNumber(); > - phoneNumber.setNumber(1); > + phoneNumber.setPhNumber(1); > phoneNumber.setEmp(e); > e.setPhoneNumber(phoneNumber); > em.persist(phoneNumber); > > >