Author: stliu
Date: 2009-09-19 15:24:40 -0400 (Sat, 19 Sep 2009)
New Revision: 17528
Modified:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Company.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Group.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/GroupWithSet.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Frame.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Order.java
Log:
JBPAPP-1075 Annotations - Oracle/Sybase - Unique/Primary Key declared twice raises an
error
Modified:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Company.java
===================================================================
---
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Company.java 2009-09-18
09:06:47 UTC (rev 17527)
+++
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Company.java 2009-09-19
19:24:40 UTC (rev 17528)
@@ -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_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Group.java
===================================================================
---
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Group.java 2009-09-18
09:06:47 UTC (rev 17527)
+++
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/Group.java 2009-09-19
19:24:40 UTC (rev 17528)
@@ -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_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/GroupWithSet.java
===================================================================
---
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/GroupWithSet.java 2009-09-18
09:06:47 UTC (rev 17527)
+++
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/GroupWithSet.java 2009-09-19
19:24:40 UTC (rev 17528)
@@ -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_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Frame.java
===================================================================
---
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Frame.java 2009-09-18
09:06:47 UTC (rev 17527)
+++
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Frame.java 2009-09-19
19:24:40 UTC (rev 17528)
@@ -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_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
===================================================================
---
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java 2009-09-18
09:06:47 UTC (rev 17527)
+++
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java 2009-09-19
19:24:40 UTC (rev 17528)
@@ -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_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Order.java
===================================================================
---
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Order.java 2009-09-18
09:06:47 UTC (rev 17527)
+++
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/Order.java 2009-09-19
19:24:40 UTC (rev 17528)
@@ -30,7 +30,7 @@
this.id = id;
}
- @Column(name="order_nbr", unique = true)
+ @Column(name="order_nbr")
public String getOrderNbr() {
return orderNbr;
}
Show replies by date