Various code cleanup

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java

@@ -20,6 +20,7 @@
 
 import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.CockroachDialect;
+import org.hibernate.exception.GenericJDBCException;
 import org.hibernate.exception.SQLGrammarException;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.orm.test.jpa.metamodel.Address;
@@ -314,7 +315,8 @@ public void testMissingDialectFunction() {
 				em.createQuery( criteria ).getResultList();
 				fail( "Expecting a SQLGrammarException" );
 			}
-			catch (SQLGrammarException expected) {
+			catch (SQLGrammarException | GenericJDBCException expected) {
+				// on Sybase, this results in GenericJDBCException
 			}
 		} );
 	}