[hibernate-commits] Hibernate SVN: r15883 - in core/trunk: testsuite/src/test/java/org/hibernate/test/interfaceproxy and 3 other directories.

[hibernate-commits at lists.jboss.org]

Author: gbadner
Date: 2009-02-03 23:05:44 -0500 (Tue, 03 Feb 2009)
New Revision: 15883

Modified:
   core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
   core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/mixed/MixedTest.java
Log:
HHH-3691 : Sybase does not support Blobs and Clobs; skip unit tests that use Blobs/Clobs 


Modified: core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java	2009-02-04 03:56:19 UTC (rev 15882)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java	2009-02-04 04:05:44 UTC (rev 15883)
@@ -134,9 +134,9 @@
 		return false;
 	}
 
-        public boolean supportsCascadeDelete() {
-                return true;
-        }
+	public boolean supportsCascadeDelete() {
+		return true;
+	}
 
 	public boolean supportsCircularCascadeDeleteConstraints() {
 		// SQL Server (at least up through 2005) does not support defining
@@ -145,6 +145,10 @@
 		return false;
 	}
 
+	public boolean supportsExpectedLobUsagePattern() {
+		return true;
+	}
+
 	public boolean supportsLobValueChangePropogation() {
 		// note: at least my local SQL Server 2005 Express shows this not working...
 		return false;

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java	2009-02-04 03:56:19 UTC (rev 15882)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/SybaseDialect.java	2009-02-04 04:05:44 UTC (rev 15883)
@@ -251,6 +251,10 @@
                 return false;
         }
 
+	public boolean supportsExpectedLobUsagePattern() {
+		return false;
+	}
+
 	public boolean supportsEmptyInList() {
 		return false;
 	}

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java	2009-02-04 03:56:19 UTC (rev 15882)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java	2009-02-04 04:05:44 UTC (rev 15883)
@@ -6,7 +6,6 @@
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.junit.functional.FunctionalTestCase;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 
@@ -33,8 +32,8 @@
 	
 	public void testInterfaceProxies() {
 		
-		if ( getDialect() instanceof PostgreSQLDialect ) {
-			// TODO : why?
+		if ( ! getDialect().supportsExpectedLobUsagePattern() ) {
+			reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" );
 			return;
 		}
 		

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java	2009-02-04 03:56:19 UTC (rev 15882)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java	2009-02-04 04:05:44 UTC (rev 15883)
@@ -27,6 +27,7 @@
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.dialect.TimesTenDialect;
+import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.dialect.function.SQLFunction;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 
@@ -498,6 +499,14 @@
 		//s.refresh(b);
 		//assertTrue( b.getClob() instanceof ClobImpl );
 		s.flush();
+
+		// Sybase ASE does not support ResultSet.getBlob(String)
+		if ( getDialect() instanceof SybaseDialect && ! ( getDialect() instanceof SQLServerDialect ) ) {
+			s.connection().rollback();
+			s.close();
+			return;
+		}
+
 		s.refresh(b);
 		//b.getBlob().setBytes( 2, "abc".getBytes() );
 		b.getClob().getSubString(2, 3);

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java	2009-02-04 03:56:19 UTC (rev 15882)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java	2009-02-04 04:05:44 UTC (rev 15883)
@@ -4,6 +4,9 @@
 import junit.framework.Test;
 
 import org.hibernate.Session;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.junit.functional.FunctionalTestCase;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 
@@ -26,11 +29,17 @@
 		return new FunctionalTestClassTestSuite( SerializableTypeTest.class );
 	}
 
+
 	public String getCacheConcurrencyStrategy() {
 		return null;
 	}
 
 	public void testNewSerializableType() {
+		// Sybase ASE does not support ResultSet.getBlob(String)
+		if ( getDialect() instanceof SybaseDialect && ! ( getDialect() instanceof SQLServerDialect ) ) {
+			return;
+		}
+
 		final String payloadText = "Initial payload";
 
 		Session s = openSession();

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/mixed/MixedTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/mixed/MixedTest.java	2009-02-04 03:56:19 UTC (rev 15882)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/mixed/MixedTest.java	2009-02-04 04:05:44 UTC (rev 15883)
@@ -6,7 +6,6 @@
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.junit.functional.FunctionalTestCase;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 
@@ -57,7 +56,10 @@
 		t.commit();
 		s.close();
 
-		if ( getDialect() instanceof PostgreSQLDialect ) return;
+		if ( ! getDialect().supportsExpectedLobUsagePattern() ) {
+			reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" );
+			return;
+		}
 
 		s = openSession( new DocumentInterceptor() );
 		t = s.beginTransaction();