Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

HHH-7569 Correct multiple failures/issues in

hibernate-core-master-matrix CI job
  • Loading branch information...
commit 5306dda1c92c45b4b3f9870db1ff5339df69410c 1 parent ae59da9
@brmeyer brmeyer authored
View
2  ...e-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml
@@ -22,7 +22,7 @@
</many-to-one>
<many-to-one name="customer" fetch="EAGER">
- <join-column name="CI_CUSTOMERID" insertable="false"/>
+ <join-column name="CI_CUSTOMERID" insertable="false" nullable="false"/>
<cascade>
<cascade-merge/>
</cascade>
View
5 hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/FirstLetterType.java
@@ -35,7 +35,10 @@ public void nullSafeSet(PreparedStatement st, Object value, int index, SessionIm
}
else {
String enumString = ( (Enum<?>) value ).name();
- st.setObject( index, enumString.charAt( 0 ), sqlTypes()[0] );
+ // Using setString here, rather than setObject. A few JDBC drivers
+ // (Oracle, DB2, and SQLServer) were having trouble converting
+ // the char to VARCHAR.
+ st.setString( index, enumString.substring( 0, 1 ) );
}
}
}
View
5 hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/LastNumberType.java
@@ -36,7 +36,10 @@ public void nullSafeSet(PreparedStatement st, Object value, int index, SessionIm
else {
String enumString = ( (Enum<?>) value ).name();
- st.setObject( index, enumString.charAt( enumString.length() - 1 ), sqlTypes()[0] );
+ // Using setString here, rather than setObject. A few JDBC drivers
+ // (Oracle, DB2, and SQLServer) were having trouble converting
+ // the char to VARCHAR.
+ st.setString( index, enumString.substring( enumString.length() - 1 ) );
}
}
}
View
9 hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/ManipulationCriteriaTest.java
@@ -23,6 +23,8 @@
*/
package org.hibernate.jpa.test.criteria;
+import static org.junit.Assert.fail;
+
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.persistence.criteria.CriteriaBuilder;
@@ -31,14 +33,13 @@
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
+import org.hibernate.dialect.MySQLDialect;
import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest;
import org.hibernate.jpa.test.metamodel.Customer;
import org.hibernate.jpa.test.metamodel.Customer_;
-
+import org.hibernate.testing.SkipForDialect;
import org.junit.Test;
-import static org.junit.Assert.fail;
-
/**
* @author Steve Ebersole
*/
@@ -174,6 +175,8 @@ public void testJoinsAndFetchesDisallowed() {
}
@Test
+ // MySQL does not allow "delete/update from" and subqueries to use the same table
+ @SkipForDialect(MySQLDialect.class)
public void testDeleteWithUnCorrelatedSubquery() {
CriteriaBuilder builder = entityManagerFactory().getCriteriaBuilder();
EntityManager em = getOrCreateEntityManager();
Please sign in to comment.
Something went wrong with that request. Please try again.