HHH-11315 - EnhancerTest fails on Oracle databases

hibernate · Dec 7, 2016 · a369120 · a369120
1 parent ed804d5
commit a369120
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/...ore/src/test/java/org/hibernate/test/bytecode/enhancement/access/MixedAccessTestTask.java b/...ore/src/test/java/org/hibernate/test/bytecode/enhancement/access/MixedAccessTestTask.java
@@ -8,6 +8,7 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
@@ -162,6 +163,7 @@ public void setParamsAsString(String string) {
 	}
 
 	@Entity
+	@Table(name = "other")
 	@Access( AccessType.FIELD )
 	private static class TestOtherEntity {
 

diff --git a/...org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteThreeTestTask.java b/...org/hibernate/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteThreeTestTask.java
@@ -6,21 +6,21 @@
  */
 package org.hibernate.test.bytecode.enhancement.lazy.HHH_10708;
 
-import org.hibernate.Session;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.test.bytecode.enhancement.AbstractEnhancerTestTask;
-import org.junit.Assert;
-
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+
+import org.hibernate.Session;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+import org.hibernate.test.bytecode.enhancement.AbstractEnhancerTestTask;
+import org.junit.Assert;
 
 public class UnexpectedDeleteThreeTestTask extends AbstractEnhancerTestTask {
 
@@ -97,7 +97,7 @@ protected void cleanup() {
 
 	// --- //
 
-	@Entity public static class Child {
+	@Entity(name = "UChild") public static class Child {
 
 		private Long id;
 
@@ -114,7 +114,7 @@ public void setId(Long id)
 
 	}
 
-	@Entity public static class Parent {
+	@Entity(name = "UParent") public static class Parent {
 
 		private Long id;
 		private Set<String> names;

diff --git a/.../java/org/hibernate/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTestTask.java b/.../java/org/hibernate/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTestTask.java
@@ -13,6 +13,7 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Configuration;
@@ -85,10 +86,11 @@ public void onLoad(LoadEvent event, LoadEventListener.LoadType loadType) throws
 	}
 
 	@Entity
+	@Table(name = "LazyProxyTask_Parent")
 	public static class Parent {
 
 		@Id
-		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		@GeneratedValue(strategy = GenerationType.AUTO)
 		private Long id;
 
 		@OneToOne(fetch = FetchType.LAZY
@@ -109,10 +111,11 @@ public void setChild(Child child) {
 	}
 
 	@Entity
+	@Table(name = "LazyProxyTask_Child")
 	public static class Child {
 
 		@Id
-		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		@GeneratedValue(strategy = GenerationType.AUTO)
 		private Long id;
 
 		private String name;

diff --git a/...rc/test/java/org/hibernate/test/bytecode/enhancement/mapped/MappedSuperclassTestTask.java b/...rc/test/java/org/hibernate/test/bytecode/enhancement/mapped/MappedSuperclassTestTask.java
@@ -3,6 +3,7 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
+import javax.persistence.Table;
 import javax.persistence.Version;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
@@ -62,6 +63,7 @@ protected void setOca(long l) {
 		}
 	}
 
+	@Table(name="MSTT_EMPLOYEE")
 	@Entity private static class Employee extends Person {
 
 		private String title;