[hibernate-commits] Hibernate SVN: r17529 - in annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations: manytoone and 1 other directory.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Sat Sep 19 15:59:47 EDT 2009
Author: stliu
Date: 2009-09-19 15:59:46 -0400 (Sat, 19 Sep 2009)
New Revision: 17529
Modified:
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Company.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Group.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/GroupWithSet.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Frame.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Order.java
Log:
JBPAPP-2789 CLONE -Annotations - Oracle/Sybase - Unique/Primary Key declared twice raises an error
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Company.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Company.java 2009-09-19 19:24:40 UTC (rev 17528)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Company.java 2009-09-19 19:59:46 UTC (rev 17529)
@@ -10,7 +10,7 @@
*/
@MappedSuperclass
public class Company implements Serializable {
- @Column(unique = true) private String name;
+ @Column private String name;
public String getName() {
return name;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Group.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Group.java 2009-09-19 19:24:40 UTC (rev 17528)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Group.java 2009-09-19 19:59:46 UTC (rev 17529)
@@ -5,12 +5,9 @@
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
import org.hibernate.annotations.Where;
import org.hibernate.annotations.FilterDef;
@@ -38,11 +35,6 @@
}
@ManyToMany(cascade = CascadeType.PERSIST)
- @JoinTable(name = "GROUPS_PERMISSIONS",
- uniqueConstraints = @UniqueConstraint(columnNames = {"group_id", "permission"}),
- joinColumns = @JoinColumn(name = "group_id", referencedColumnName = "id"),
- inverseJoinColumns = @JoinColumn(name = "permission", referencedColumnName = "permission")
- )
@OrderBy("expirationDate")
@Where(clause = "1=1")
@WhereJoinTable(clause = "2=2")
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/GroupWithSet.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/GroupWithSet.java 2009-09-19 19:24:40 UTC (rev 17528)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/GroupWithSet.java 2009-09-19 19:59:46 UTC (rev 17529)
@@ -40,11 +40,6 @@
}
@ManyToMany(cascade = CascadeType.PERSIST)
- @JoinTable(name = "GROUPS_PERMISSIONS",
- uniqueConstraints = @UniqueConstraint(columnNames = {"group_id", "permission"}),
- joinColumns = @JoinColumn(name = "group_id", referencedColumnName = "id"),
- inverseJoinColumns = @JoinColumn(name = "permission", referencedColumnName = "permission")
- )
@OrderBy("expirationDate")
@Where(clause = "1=1")
@WhereJoinTable(clause = "2=2")
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java 2009-09-19 19:24:40 UTC (rev 17528)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java 2009-09-19 19:59:46 UTC (rev 17529)
@@ -7,15 +7,12 @@
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import org.hibernate.Hibernate;
import org.hibernate.JDBCException;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.test.annotations.RequiresDialect;
import org.hibernate.test.annotations.TestCase;
/**
@@ -81,7 +78,6 @@
s.close();
}
- @RequiresDialect(HSQLDialect.class)
public void testDefaultCompositePk() throws Exception {
Session s;
Transaction tx;
@@ -265,7 +261,8 @@
*
* @throws Exception in case the test fails.
*
- * This fails test fails for other databases (except HSQL) due to missing alias in order by clause:
+ * This test only works against databases which allow a mixed usage of
+ * table names and table aliases. The generated SQL for this test is:
*
* select
* contractor0_.EMPLOYER_ID as EMPLOYER1_1_,
@@ -285,54 +282,54 @@
*
*
*/
- @RequiresDialect(HSQLDialect.class)
- public void testOrderByContractor() throws Exception {
-
- Session s;
- Transaction tx;
- s = openSession();
- tx = s.beginTransaction();
-
- // create some test entities
- Employer employer = new Employer();
- Contractor contractor1 = new Contractor();
- contractor1.setName( "Emmanuel" );
- contractor1.setHourlyRate(100.0f);
- Contractor contractor2 = new Contractor();
- contractor2.setName( "Hardy" );
- contractor2.setHourlyRate(99.99f);
- s.persist( contractor1 );
- s.persist( contractor2 );
-
- // add contractors to employer
- List setOfContractors = new ArrayList();
- setOfContractors.add( contractor1 );
- setOfContractors.add( contractor2 );
- employer.setContractors( setOfContractors );
-
- // add employer to contractors
- Collection employerListContractor1 = new ArrayList();
- employerListContractor1.add( employer );
- contractor1.setEmployers( employerListContractor1 );
-
- Collection employerListContractor2 = new ArrayList();
- employerListContractor2.add( employer );
- contractor2.setEmployers( employerListContractor2 );
+// HHH-3577
+// public void testOrderByContractor() throws Exception {
+//
+// Session s;
+// Transaction tx;
+// s = openSession();
+// tx = s.beginTransaction();
+//
+// // create some test entities
+// Employer employer = new Employer();
+// Contractor contractor1 = new Contractor();
+// contractor1.setName( "Emmanuel" );
+// contractor1.setHourlyRate(100.0f);
+// Contractor contractor2 = new Contractor();
+// contractor2.setName( "Hardy" );
+// contractor2.setHourlyRate(99.99f);
+// s.persist( contractor1 );
+// s.persist( contractor2 );
+//
+// // add contractors to employer
+// List setOfContractors = new ArrayList();
+// setOfContractors.add( contractor1 );
+// setOfContractors.add( contractor2 );
+// employer.setContractors( setOfContractors );
+//
+// // add employer to contractors
+// Collection employerListContractor1 = new ArrayList();
+// employerListContractor1.add( employer );
+// contractor1.setEmployers( employerListContractor1 );
+//
+// Collection employerListContractor2 = new ArrayList();
+// employerListContractor2.add( employer );
+// contractor2.setEmployers( employerListContractor2 );
+//
+// s.flush();
+// s.clear();
+//
+// // assertions
+// employer = (Employer) s.get( Employer.class, employer.getId() );
+// assertNotNull( employer );
+// assertNotNull( employer.getContractors() );
+// assertEquals( 2, employer.getContractors().size() );
+// Contractor firstContractorFromDb = (Contractor) employer.getContractors().iterator().next();
+// assertEquals( contractor2.getName(), firstContractorFromDb.getName() );
+// tx.rollback();
+// s.close();
+// }
- s.flush();
- s.clear();
-
- // assertions
- employer = (Employer) s.get( Employer.class, employer.getId() );
- assertNotNull( employer );
- assertNotNull( employer.getContractors() );
- assertEquals( 2, employer.getContractors().size() );
- Contractor firstContractorFromDb = (Contractor) employer.getContractors().iterator().next();
- assertEquals( contractor2.getName(), firstContractorFromDb.getName() );
- tx.rollback();
- s.close();
- }
-
public void testRemoveInBetween() throws Exception {
Session s;
Transaction tx;
@@ -423,7 +420,6 @@
s.close();
}
- @RequiresDialect(HSQLDialect.class)
public void testCompositePk() throws Exception {
Session s;
Transaction tx;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Frame.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Frame.java 2009-09-19 19:24:40 UTC (rev 17528)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Frame.java 2009-09-19 19:59:46 UTC (rev 17529)
@@ -21,7 +21,6 @@
private Long id;
@OneToMany( mappedBy = "frame" )
private Set<Lens> lenses;
- @Column( unique = true )
private String name;
@Formula("lower(name)")
private String lowerName;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java 2009-09-19 19:24:40 UTC (rev 17528)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java 2009-09-19 19:59:46 UTC (rev 17529)
@@ -249,10 +249,6 @@
s.close();
}
- public void testManyToOneAndIdClass() throws Exception {
-
- }
-
public void testManyToOneNonPk() throws Exception {
Session s = openSession();
Transaction tx = s.beginTransaction();
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Order.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Order.java 2009-09-19 19:24:40 UTC (rev 17528)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Order.java 2009-09-19 19:59:46 UTC (rev 17529)
@@ -30,7 +30,7 @@
this.id = id;
}
- @Column(name="order_nbr", unique = true)
+ @Column(name="order_nbr")
public String getOrderNbr() {
return orderNbr;
}
More information about the hibernate-commits
mailing list