Various code cleanup

sebersole · sebersole · commit 0f85112b8452 · 2025-02-20T06:26:17.000-06:00
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java b/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
 			}
 		} );
 	}

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`import org.hibernate.community.dialect.InformixDialect;`
`22`	`22`	`import org.hibernate.dialect.CockroachDialect;`
	`23`	`+import org.hibernate.exception.GenericJDBCException;`
`23`	`24`	`import org.hibernate.exception.SQLGrammarException;`
`24`	`25`	`import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;`
`25`	`26`	`import org.hibernate.orm.test.jpa.metamodel.Address;`
`@@ -314,7 +315,8 @@ public void testMissingDialectFunction() {`
`314`	`315`	`em.createQuery( criteria ).getResultList();`
`315`	`316`	`fail( "Expecting a SQLGrammarException" );`
`316`	`317`	`}`
`317`		`- catch (SQLGrammarException expected) {`
	`318`	`+ catch (SQLGrammarException \| GenericJDBCException expected) {`
	`319`	`+ // on Sybase, this results in GenericJDBCException`
`318`	`320`	`}`
`319`	`321`	`} );`
`320`	`322`	`}`