Hibernate SVN: r15787 - annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-01-14 12:13:55 -0500 (Wed, 14 Jan 2009)
New Revision: 15787
Modified:
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/City.java
Log:
JBPAPP-1070 - Removed streetName from the @OrderBy, as it causes problems on MSSQL and Sybase
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/City.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/City.java 2009-01-14 17:01:05 UTC (rev 15786)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/City.java 2009-01-14 17:13:55 UTC (rev 15787)
@@ -41,7 +41,7 @@
}
@OneToMany(mappedBy = "city")
- @OrderBy("streetNameCopy, streetName, id")
+ @OrderBy("streetNameCopy, id")
public synchronized List<Street> getStreets() {
return streets;
}
15 years, 5 months
Hibernate SVN: r15786 - in annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations: manytoone and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-01-14 12:01:05 -0500 (Wed, 14 Jan 2009)
New Revision: 15786
Modified:
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ForestType.java
Log:
JBPAPP-1074 - shortened the name of the tables
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java 2009-01-14 16:57:05 UTC (rev 15785)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java 2009-01-14 17:01:05 UTC (rev 15786)
@@ -14,7 +14,7 @@
protected EventInformation eventInfo;
@OneToOne
- @JoinColumns({@JoinColumn(name = "EVENTINFORMATIONT_NOTIFICATIONID",
+ @JoinColumns({@JoinColumn(name = "EVENT_NOTIF",
referencedColumnName = "NOTIFICATIONID")})
public EventInformation getEventInfo() {
return eventInfo;
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ForestType.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ForestType.java 2009-01-14 16:57:05 UTC (rev 15785)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ForestType.java 2009-01-14 17:01:05 UTC (rev 15786)
@@ -23,7 +23,7 @@
private BiggestForest biggestRepresentative;
@OneToOne
- @JoinTable(name="BiggestRepresentativePerForestType",
+ @JoinTable(name="BiggestRepPerForestType",
joinColumns = @JoinColumn(name="forest_type"),
inverseJoinColumns = @JoinColumn(name="forest")
)
15 years, 5 months
Hibernate SVN: r15785 - annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-01-14 11:57:05 -0500 (Wed, 14 Jan 2009)
New Revision: 15785
Modified:
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/File.java
Log:
JBPAPP-1069 - Changing the entity name to xfile, as File is a reserved keyword
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/File.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/File.java 2009-01-14 16:46:06 UTC (rev 15784)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/File.java 2009-01-14 16:57:05 UTC (rev 15785)
@@ -10,7 +10,7 @@
/**
* @author Emmanuel Bernard
*/
-@Entity
+@Entity(name="xfile")
@Inheritance(strategy = InheritanceType.JOINED)
public abstract class File {
@Id
15 years, 5 months
Hibernate SVN: r15784 - in annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance: union and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-01-14 11:46:06 -0500 (Wed, 14 Jan 2009)
New Revision: 15784
Modified:
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java
Log:
JBPAPP-1073 - Fixed some models which uses the keyword size
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java 2009-01-14 16:45:17 UTC (rev 15783)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java 2009-01-14 16:46:06 UTC (rev 15784)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.test.annotations.inheritance.joined;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@@ -27,6 +28,7 @@
this.id = id;
}
+ @Column(name="xsize")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-01-14 16:45:17 UTC (rev 15783)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-01-14 16:46:06 UTC (rev 15784)
@@ -9,7 +9,7 @@
*/
@Entity
public class Document extends File {
- @Column(nullable = false)
+ @Column(nullable = false, name="xsize")
private int size;
Document() {
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java 2009-01-14 16:45:17 UTC (rev 15783)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java 2009-01-14 16:46:06 UTC (rev 15784)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.test.annotations.inheritance.union;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -20,6 +21,7 @@
this.size = size;
}
+ @Column(name="xsize")
public int getSize() {
return size;
}
15 years, 5 months
Hibernate SVN: r15783 - in annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations: entitynonentity and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-01-14 11:45:17 -0500 (Wed, 14 Jan 2009)
New Revision: 15783
Modified:
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/entity/Ransom.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/entitynonentity/Interaction.java
annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/indexcoll/Version.java
Log:
JBPAPP-1072 - Fix to some models, which were using date/number keywords in its name
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/entity/Ransom.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/entity/Ransom.java 2009-01-14 14:36:52 UTC (rev 15782)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/entity/Ransom.java 2009-01-14 16:45:17 UTC (rev 15783)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.entity;
import java.util.Date;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -51,6 +52,7 @@
this.amount = amount;
}
+ @Column(name="xdate")
public Date getDate() {
return date;
}
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/entitynonentity/Interaction.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/entitynonentity/Interaction.java 2009-01-14 14:36:52 UTC (rev 15782)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/entitynonentity/Interaction.java 2009-01-14 16:45:17 UTC (rev 15783)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.test.annotations.entitynonentity;
+import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
/**
@@ -8,5 +9,6 @@
*/
@MappedSuperclass
public class Interaction {
+ @Column(name="xnumber")
public int number;
}
Modified: annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/indexcoll/Version.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/indexcoll/Version.java 2009-01-14 14:36:52 UTC (rev 15782)
+++ annotations/branches/v3_2_1_GA_CP/src/test/org/hibernate/test/annotations/indexcoll/Version.java 2009-01-14 16:45:17 UTC (rev 15783)
@@ -1,12 +1,12 @@
//$Id$
package org.hibernate.test.annotations.indexcoll;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
@@ -38,6 +38,7 @@
this.codeName = codeName;
}
+ @Column(name="xnumber")
public String getNumber() {
return number;
}
15 years, 5 months