From f262811c8f267bf3082f3b1c5f1cdfecab904d4f Mon Sep 17 00:00:00 2001
From: Strong Liu <stliu@hibernate.org>
Date: Wed, 26 Oct 2011 18:40:44 +0800
Subject: [PATCH] HHH-6773 test fails on sybase

---
 .../java/org/hibernate/test/criteria/ComplexJoinAliasTest.java | 2 ++
 .../hibernate/test/hql/ScrollableCollectionFetchingTest.java   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/ComplexJoinAliasTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/criteria/ComplexJoinAliasTest.java
index 849a587de2..08479b4809 100644
--- a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/ComplexJoinAliasTest.java
+++ b/hibernate-core/src/matrix/java/org/hibernate/test/criteria/ComplexJoinAliasTest.java
@@ -30,6 +30,7 @@
 import javax.persistence.Enumerated;
 import javax.persistence.Id;
 import javax.persistence.IdClass;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Table;
@@ -117,6 +118,7 @@ public static class ListActionRole extends VersionedRecord {
 		Code roleCode;
 
 		@ManyToOne(targetEntity = Role.class)
+        @JoinColumn(nullable = false)
 		Role role;
 
 		@Override
diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java
index d685fa105f..9599978aa7 100644
--- a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java
+++ b/hibernate-core/src/matrix/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java
@@ -30,8 +30,10 @@
 import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
+import org.hibernate.dialect.SybaseASE15Dialect;
 import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.RequiresDialectFeature;
+import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
 import static org.junit.Assert.assertEquals;
@@ -69,6 +71,7 @@ public void testTupleReturnFails() {
 	}
 
 	@Test
+    @SkipForDialect( value = SybaseASE15Dialect.class, jiraKey = "HHH-5229")
 	public void testScrollingJoinFetchesEmptyResultSet() {
 		Session s = openSession();
 		Transaction txn = s.beginTransaction();