Hibernate SVN: r16301 - annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/ejb3.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-04-10 19:26:04 -0400 (Fri, 10 Apr 2009)
New Revision: 16301
Modified:
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java
Log:
JBPAPP-1878 ANN-817 : 8-bit characters in string values cause unit test failures
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java 2009-04-10 23:23:50 UTC (rev 16300)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java 2009-04-10 23:26:04 UTC (rev 16301)
@@ -45,7 +45,7 @@
s.getTransaction().begin();
Lighter l = new Lighter();
l.name = "Blue";
- l.power = "400�F";
+ l.power = "400F";
s.persist( l );
s.flush();
s.getTransaction().rollback();
15 years, 7 months
Hibernate SVN: r16300 - annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/xml/ejb3.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-04-10 19:23:50 -0400 (Fri, 10 Apr 2009)
New Revision: 16300
Modified:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java
Log:
JBPAPP-1878 ANN-817 : 8-bit characters in string values cause unit test failures
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java 2009-04-10 22:48:31 UTC (rev 16299)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java 2009-04-10 23:23:50 UTC (rev 16300)
@@ -45,7 +45,7 @@
s.getTransaction().begin();
Lighter l = new Lighter();
l.name = "Blue";
- l.power = "400�F";
+ l.power = "400F";
s.persist( l );
s.flush();
s.getTransaction().rollback();
15 years, 7 months
Hibernate SVN: r16299 - annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/generics.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-04-10 18:48:31 -0400 (Fri, 10 Apr 2009)
New Revision: 16299
Added:
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/generics/Classes.java
Modified:
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
Log:
JBPAPP-1124 ANN-779 : Oracle/DB2 - Identifier is too long
Added: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/generics/Classes.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/generics/Classes.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/generics/Classes.java 2009-04-10 22:48:31 UTC (rev 16299)
@@ -0,0 +1,47 @@
+package org.hibernate.test.annotations.generics;
+
+/**
+ * A test case for ANN-494.
+ *
+ * @author Edward Costello
+ * @author Paolo Perrotta
+ */
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.CollectionOfElements;
+
+public class Classes {
+
+ @Embeddable
+ public static class Edition<T> {
+ T name;
+ }
+
+ @Entity
+ public static class Book {
+ @Id
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ Long id;
+
+ @Embedded
+ Edition<String> edition;
+ }
+
+ @Entity
+ public static class PopularBook {
+ @Id
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ Long id;
+
+ @CollectionOfElements
+ Set<Edition<String>> editions = new HashSet<Edition<String>>();
+ }
+}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java 2009-04-10 22:37:51 UTC (rev 16298)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java 2009-04-10 22:48:31 UTC (rev 16299)
@@ -6,62 +6,51 @@
* @author Edward Costello
* @author Paolo Perrotta
*/
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.annotations.CollectionOfElements;
import org.hibernate.test.annotations.TestCase;
public class EmbeddedGenericsTest extends TestCase {
Session session;
- Edition<String> edition;
+ Classes.Edition<String> edition;
public void setUp() throws Exception {
super.setUp();
session = openSession();
session.getTransaction().begin();
- edition = new Edition<String>();
+ edition = new Classes.Edition<String>();
edition.name = "Second";
}
public void testWorksWithGenericEmbedded() {
- Book b = new Book();
+ Classes.Book b = new Classes.Book();
b.edition = edition;
persist( b );
- Book retrieved = (Book)find( Book.class, b.id );
+ Classes.Book retrieved = (Classes.Book)find( Classes.Book.class, b.id );
assertEquals( "Second", retrieved.edition.name );
- clean( Book.class, b.id );
+ clean( Classes.Book.class, b.id );
session.close();
}
public void testWorksWithGenericCollectionOfElements() {
- PopularBook b = new PopularBook();
+ Classes.PopularBook b = new Classes.PopularBook();
b.editions.add( edition );
persist( b );
- PopularBook retrieved = (PopularBook)find( PopularBook.class, b.id );
+ Classes.PopularBook retrieved = (Classes.PopularBook)find( Classes.PopularBook.class, b.id );
assertEquals( "Second", retrieved.editions.iterator().next().name );
- clean( PopularBook.class, b.id );
+ clean( Classes.PopularBook.class, b.id );
session.close();
}
protected Class[] getMappings() {
return new Class[]{
- Book.class,
- PopularBook.class
+ Classes.Book.class,
+ Classes.PopularBook.class
};
}
@@ -81,28 +70,4 @@
tx.commit();
}
- @Embeddable
- public static class Edition<T> {
- T name;
- }
-
- @Entity
- public static class Book {
- @Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- Long id;
-
- @Embedded
- Edition<String> edition;
- }
-
- @Entity
- public static class PopularBook {
- @Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- Long id;
-
- @CollectionOfElements
- Set<Edition<String>> editions = new HashSet<Edition<String>>();
- }
}
15 years, 7 months
Hibernate SVN: r16298 - core/trunk/annotations/src/test/java/org/hibernate/test/annotations/generics.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-04-10 18:37:51 -0400 (Fri, 10 Apr 2009)
New Revision: 16298
Added:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/generics/Classes.java
Modified:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
Log:
JBPAPP-1124 ANN-779 : Oracle/DB2 - Identifier is too long
Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/generics/Classes.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/generics/Classes.java (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/generics/Classes.java 2009-04-10 22:37:51 UTC (rev 16298)
@@ -0,0 +1,47 @@
+package org.hibernate.test.annotations.generics;
+
+/**
+ * A test case for ANN-494.
+ *
+ * @author Edward Costello
+ * @author Paolo Perrotta
+ */
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.CollectionOfElements;
+
+public class Classes {
+
+ @Embeddable
+ public static class Edition<T> {
+ T name;
+ }
+
+ @Entity
+ public static class Book {
+ @Id
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ Long id;
+
+ @Embedded
+ Edition<String> edition;
+ }
+
+ @Entity
+ public static class PopularBook {
+ @Id
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ Long id;
+
+ @CollectionOfElements
+ Set<Edition<String>> editions = new HashSet<Edition<String>>();
+ }
+}
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java 2009-04-10 22:14:12 UTC (rev 16297)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java 2009-04-10 22:37:51 UTC (rev 16298)
@@ -6,62 +6,51 @@
* @author Edward Costello
* @author Paolo Perrotta
*/
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.annotations.CollectionOfElements;
import org.hibernate.test.annotations.TestCase;
public class EmbeddedGenericsTest extends TestCase {
Session session;
- Edition<String> edition;
+ Classes.Edition<String> edition;
public void setUp() throws Exception {
super.setUp();
session = openSession();
session.getTransaction().begin();
- edition = new Edition<String>();
+ edition = new Classes.Edition<String>();
edition.name = "Second";
}
public void testWorksWithGenericEmbedded() {
- Book b = new Book();
+ Classes.Book b = new Classes.Book();
b.edition = edition;
persist( b );
- Book retrieved = (Book)find( Book.class, b.id );
+ Classes.Book retrieved = (Classes.Book)find( Classes.Book.class, b.id );
assertEquals( "Second", retrieved.edition.name );
- clean( Book.class, b.id );
+ clean( Classes.Book.class, b.id );
session.close();
}
public void testWorksWithGenericCollectionOfElements() {
- PopularBook b = new PopularBook();
+ Classes.PopularBook b = new Classes.PopularBook();
b.editions.add( edition );
persist( b );
- PopularBook retrieved = (PopularBook)find( PopularBook.class, b.id );
+ Classes.PopularBook retrieved = (Classes.PopularBook)find( Classes.PopularBook.class, b.id );
assertEquals( "Second", retrieved.editions.iterator().next().name );
- clean( PopularBook.class, b.id );
+ clean( Classes.PopularBook.class, b.id );
session.close();
}
protected Class[] getMappings() {
return new Class[]{
- Book.class,
- PopularBook.class
+ Classes.Book.class,
+ Classes.PopularBook.class
};
}
@@ -81,28 +70,4 @@
tx.commit();
}
- @Embeddable
- public static class Edition<T> {
- T name;
- }
-
- @Entity
- public static class Book {
- @Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- Long id;
-
- @Embedded
- Edition<String> edition;
- }
-
- @Entity
- public static class PopularBook {
- @Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- Long id;
-
- @CollectionOfElements
- Set<Edition<String>> editions = new HashSet<Edition<String>>();
- }
}
15 years, 7 months
Hibernate SVN: r16297 - in annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations: inheritance/joined and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-04-10 18:14:12 -0400 (Fri, 10 Apr 2009)
New Revision: 16297
Added:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/generics/Classes.java
Modified:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ForestType.java
Log:
JBPAPP-1124 ANN-779 : Oracle/DB2 - Identifier is too long
Added: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/generics/Classes.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/generics/Classes.java (rev 0)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/generics/Classes.java 2009-04-10 22:14:12 UTC (rev 16297)
@@ -0,0 +1,47 @@
+package org.hibernate.test.annotations.generics;
+
+/**
+ * A test case for ANN-494.
+ *
+ * @author Edward Costello
+ * @author Paolo Perrotta
+ */
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.CollectionOfElements;
+
+public class Classes {
+
+ @Embeddable
+ public static class Edition<T> {
+ T name;
+ }
+
+ @Entity
+ public static class Book {
+ @Id
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ Long id;
+
+ @Embedded
+ Edition<String> edition;
+ }
+
+ @Entity
+ public static class PopularBook {
+ @Id
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ Long id;
+
+ @CollectionOfElements
+ Set<Edition<String>> editions = new HashSet<Edition<String>>();
+ }
+}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java 2009-04-10 20:21:48 UTC (rev 16296)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java 2009-04-10 22:14:12 UTC (rev 16297)
@@ -6,62 +6,51 @@
* @author Edward Costello
* @author Paolo Perrotta
*/
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.annotations.CollectionOfElements;
import org.hibernate.test.annotations.TestCase;
public class EmbeddedGenericsTest extends TestCase {
Session session;
- Edition<String> edition;
+ Classes.Edition<String> edition;
public void setUp() throws Exception {
super.setUp();
session = openSession();
session.getTransaction().begin();
- edition = new Edition<String>();
+ edition = new Classes.Edition<String>();
edition.name = "Second";
}
public void testWorksWithGenericEmbedded() {
- Book b = new Book();
+ Classes.Book b = new Classes.Book();
b.edition = edition;
persist( b );
- Book retrieved = (Book)find( Book.class, b.id );
+ Classes.Book retrieved = (Classes.Book)find( Classes.Book.class, b.id );
assertEquals( "Second", retrieved.edition.name );
- clean( Book.class, b.id );
+ clean( Classes.Book.class, b.id );
session.close();
}
public void testWorksWithGenericCollectionOfElements() {
- PopularBook b = new PopularBook();
+ Classes.PopularBook b = new Classes.PopularBook();
b.editions.add( edition );
persist( b );
- PopularBook retrieved = (PopularBook)find( PopularBook.class, b.id );
+ Classes.PopularBook retrieved = (Classes.PopularBook)find( Classes.PopularBook.class, b.id );
assertEquals( "Second", retrieved.editions.iterator().next().name );
- clean( PopularBook.class, b.id );
+ clean( Classes.PopularBook.class, b.id );
session.close();
}
protected Class[] getMappings() {
return new Class[]{
- Book.class,
- PopularBook.class
+ Classes.Book.class,
+ Classes.PopularBook.class
};
}
@@ -81,28 +70,4 @@
tx.commit();
}
- @Embeddable
- public static class Edition<T> {
- T name;
- }
-
- @Entity
- public static class Book {
- @Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- Long id;
-
- @Embedded
- Edition<String> edition;
- }
-
- @Entity
- public static class PopularBook {
- @Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- Long id;
-
- @CollectionOfElements
- Set<Edition<String>> editions = new HashSet<Edition<String>>();
- }
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java 2009-04-10 20:21:48 UTC (rev 16296)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Alarm.java 2009-04-10 22:14:12 UTC (rev 16297)
@@ -14,7 +14,7 @@
protected EventInformation eventInfo;
@OneToOne
- @JoinColumns({@JoinColumn(name = "EVENTINFORMATIONT_NOTIFICATIONID",
+ @JoinColumns({@JoinColumn(name = "EVENTINFO_NOTIFICATIONID",
referencedColumnName = "NOTIFICATIONID")})
public EventInformation getEventInfo() {
return eventInfo;
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ForestType.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ForestType.java 2009-04-10 20:21:48 UTC (rev 16296)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytoone/ForestType.java 2009-04-10 22:14:12 UTC (rev 16297)
@@ -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, 7 months
Hibernate SVN: r16296 - annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-04-10 16:21:48 -0400 (Fri, 10 Apr 2009)
New Revision: 16296
Modified:
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
Log:
JBPAPP-1073 : added foreign key that was inadvertently removed
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-10 20:20:20 UTC (rev 16295)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-10 20:21:48 UTC (rev 16296)
@@ -4,10 +4,13 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import org.hibernate.annotations.ForeignKey;
+
/**
* @author Emmanuel Bernard
*/
@Entity
+@ForeignKey(name = "FK_DOCU_FILE")
public class Document extends File {
@Column(nullable = false, name="xsize")
private int size;
15 years, 7 months
Hibernate SVN: r16295 - annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-04-10 16:20:20 -0400 (Fri, 10 Apr 2009)
New Revision: 16295
Modified:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
Log:
JBPAPP-1073 : added foreign key that was inadvertently removed from
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-10 20:07:37 UTC (rev 16294)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-10 20:20:20 UTC (rev 16295)
@@ -4,10 +4,13 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import org.hibernate.annotations.ForeignKey;
+
/**
* @author Emmanuel Bernard
*/
@Entity
+@ForeignKey(name = "FK_DOCU_FILE")
public class Document extends File {
@Column(nullable = false, name="xsize")
private int size;
15 years, 7 months
Hibernate SVN: r16294 - in core/trunk/annotations/src/test/java/org/hibernate/test/annotations: inheritance/union and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-04-10 16:07:37 -0400 (Fri, 10 Apr 2009)
New Revision: 16294
Modified:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java
Log:
JBPAPP-1073 : Annotations - Oracle - "size" is reserved in Oracle
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-10 19:17:45 UTC (rev 16293)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-10 20:07:37 UTC (rev 16294)
@@ -12,7 +12,7 @@
@Entity
@ForeignKey(name = "FK_DOCU_FILE")
public class Document extends File {
- @Column(nullable = false)
+ @Column(nullable = false, name="xsize")
private int size;
Document() {
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java 2009-04-10 19:17:45 UTC (rev 16293)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java 2009-04-10 20:07:37 UTC (rev 16294)
@@ -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;
}
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java 2009-04-10 19:17:45 UTC (rev 16293)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java 2009-04-10 20:07:37 UTC (rev 16294)
@@ -24,7 +24,7 @@
@Entity
@Table(name="CHAOS")
@SQLInsert( sql="INSERT INTO CHAOS(name, nick_name, chaos_size, id) VALUES(upper(?),?,?,?)")
-@SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, cha0s_size = ? WHERE id = ?")
+@SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, chaos_size = ? WHERE id = ?")
@SQLDelete( sql="DELETE CHAOS WHERE id = ?")
@SQLDeleteAll( sql="DELETE CHAOS")
@Loader(namedQuery = "chaos")
15 years, 7 months
Hibernate SVN: r16293 - in annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations: inheritance/union and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-04-10 15:17:45 -0400 (Fri, 10 Apr 2009)
New Revision: 16293
Modified:
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java
Log:
JBPAPP-1073 : Annotations - Oracle - "size" is reserved in Oracle
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-10 19:09:48 UTC (rev 16292)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-10 19:17:45 UTC (rev 16293)
@@ -4,15 +4,12 @@
import javax.persistence.Column;
import javax.persistence.Entity;
-import org.hibernate.annotations.ForeignKey;
-
/**
* @author Emmanuel Bernard
*/
@Entity
-@ForeignKey(name = "FK_DOCU_FILE")
public class Document extends File {
- @Column(nullable = false)
+ @Column(nullable = false, name="xsize")
private int size;
Document() {
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java 2009-04-10 19:09:48 UTC (rev 16292)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java 2009-04-10 19:17:45 UTC (rev 16293)
@@ -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;
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java 2009-04-10 19:09:48 UTC (rev 16292)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java 2009-04-10 19:17:45 UTC (rev 16293)
@@ -24,7 +24,7 @@
@Entity
@Table(name="CHAOS")
@SQLInsert( sql="INSERT INTO CHAOS(name, nick_name, chaos_size, id) VALUES(upper(?),?,?,?)")
-@SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, cha0s_size = ? WHERE id = ?")
+@SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, chaos_size = ? WHERE id = ?")
@SQLDelete( sql="DELETE CHAOS WHERE id = ?")
@SQLDeleteAll( sql="DELETE CHAOS")
@Loader(namedQuery = "chaos")
15 years, 7 months
Hibernate SVN: r16292 - in annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations: cascade and 6 other directories.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-04-10 15:09:48 -0400 (Fri, 10 Apr 2009)
New Revision: 16292
Modified:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java
Log:
JBPAPP-1073 : Annotations - Oracle - "size" is reserved in Oracle
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/access/BigBed.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -2,11 +2,13 @@
package org.hibernate.test.annotations.access;
import javax.persistence.Entity;
+import javax.persistence.Column;
/**
* @author Emmanuel Bernard
*/
@Entity
public class BigBed extends Bed {
+ @Column(name="bed_size")
public int size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/cascade/Mouth.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -7,6 +7,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToMany;
+import javax.persistence.Column;
/**
* @author Emmanuel Bernard
@@ -16,6 +17,7 @@
@Id
@GeneratedValue
public Integer id;
+ @Column(name="mouth_size")
public int size;
@OneToMany(mappedBy = "mouth", cascade = CascadeType.REMOVE)
public Collection<Tooth> teeth;
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Book.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -36,7 +36,7 @@
}
@AttributeOverrides({
- @AttributeOverride(name = "size", column = @Column(table = "BookSummary")),
+ @AttributeOverride(name = "size", column = @Column(name="summ_size", table = "BookSummary")),
@AttributeOverride(name = "text", column = @Column(table = "BookSummary"))
})
public Summary getSummary() {
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/embedded/Summary.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.embedded;
import javax.persistence.Embeddable;
+import javax.persistence.Column;
import org.hibernate.annotations.Parent;
@@ -14,6 +15,7 @@
private String text;
private Book summarizedBook;
+ @Column(name="summary_size")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/Tomato.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -4,6 +4,7 @@
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
+import javax.persistence.Column;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
@@ -21,6 +22,7 @@
public class Tomato extends Vegetable {
private int size;
+ @Column(name="tom_size")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Clothing.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -6,6 +6,7 @@
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
+import javax.persistence.Column;
/**
* @author Emmanuel Bernard
@@ -27,6 +28,7 @@
this.id = id;
}
+ @Column(name = "cloth_size")
public int getSize() {
return size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/joined/Document.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -4,15 +4,12 @@
import javax.persistence.Column;
import javax.persistence.Entity;
-import org.hibernate.annotations.ForeignKey;
-
/**
* @author Emmanuel Bernard
*/
@Entity
-@ForeignKey(name = "FK_DOCU_FILE")
public class Document extends File {
- @Column(nullable = false)
+ @Column(nullable = false, name="xsize")
private int size;
Document() {
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -25,7 +25,7 @@
this.size = size;
}
- @Column(table = "DocumentMixed", nullable = false)
+ @Column(table = "DocumentMixed", name="doc_size", nullable = false)
public int getSize() {
return size;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/inheritance/union/Document.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -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;
}
Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java 2009-04-09 23:07:59 UTC (rev 16291)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/query/Chaos.java 2009-04-10 19:09:48 UTC (rev 16292)
@@ -1,4 +1,4 @@
-//$Id: $
+//$Id$
package org.hibernate.test.annotations.query;
import java.util.Set;
@@ -23,15 +23,16 @@
*/
@Entity
@Table(name="CHAOS")
-@SQLInsert( sql="INSERT INTO CHAOS(name, nick_name, size, id) VALUES(upper(?),?,?,?)")
-@SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, size = ? WHERE id = ?")
+@SQLInsert( sql="INSERT INTO CHAOS(name, nick_name, chaos_size, id) VALUES(upper(?),?,?,?)")
+@SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, chaos_size = ? WHERE id = ?")
@SQLDelete( sql="DELETE CHAOS WHERE id = ?")
@SQLDeleteAll( sql="DELETE CHAOS")
@Loader(namedQuery = "chaos")
-@NamedNativeQuery(name="chaos", query="select id, size, name, lower( nick_name ) as nick_name from CHAOS where id= ?", resultClass = Chaos.class)
+@NamedNativeQuery(name="chaos", query="select id, chaos_size, name, lower( nick_name ) as nick_name from CHAOS where id= ?", resultClass = Chaos.class)
public class Chaos {
@Id
private Long id;
+ @Column(name="chaos_size")
private Long size;
private String name;
@Column(name="nick_name")
15 years, 7 months