Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to get the test working again on Sybase

This commit is contained in:
Gavin King 2022-01-06 15:23:47 +01:00
parent 01600b48e5
commit 86025a9af8
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java
View File

@ -911,11 +911,13 @@ public class CommonFunctionFactory {
/**
* These are aggregate functions taking one argument,
* for Oracle.
* for Oracle and Sybase.
*/
public static void everyAny_sumCaseCase(QueryEngine queryEngine) {
queryEngine.getSqmFunctionRegistry().register( "every", new CaseWhenEveryAnyEmulation( queryEngine.getTypeConfiguration(), true ) );
queryEngine.getSqmFunctionRegistry().register( "any", new CaseWhenEveryAnyEmulation( queryEngine.getTypeConfiguration(), false ) );
queryEngine.getSqmFunctionRegistry().register( "every",
new CaseWhenEveryAnyEmulation( queryEngine.getTypeConfiguration(), true ) );
queryEngine.getSqmFunctionRegistry().register( "any",
new CaseWhenEveryAnyEmulation( queryEngine.getTypeConfiguration(), false ) );
}
public static void yearMonthDay(QueryEngine queryEngine) {

4
hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentTypesValidator.java
View File

@ -174,7 +174,9 @@ public class ArgumentTypesValidator implements ArgumentsValidator {
}
break;
case BOOLEAN:
if ( code != BOOLEAN && code != BIT ) {
// ugh, need to be careful here, need to accept all the
// JDBC type codes that a Dialect might use for BOOLEAN
if ( code != BOOLEAN && code != BIT && code != TINYINT ) {
throwError(type, javaType, functionName, count);
}
break;

13
hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java
View File

@ -52,17 +52,16 @@ import org.junit.jupiter.api.Test;
)
@SessionFactory
@RequiresDialect(value = SybaseASEDialect.class, majorVersion = 11)
@SuppressWarnings("rawtypes")
public class SybaseASEFunctionTest {
private Calendar calendar = Calendar.getInstance();
@BeforeAll
protected void prepareTest(SessionFactoryScope scope) throws Exception {
scope.inTransaction(
session -> {
Product product = new Product();
product.setPrice(new BigDecimal(0.5));
product.setDate( calendar.getTime() );
product.setPrice(new BigDecimal("0.5"));
product.setDate( Calendar.getInstance().getTime() );
session.save( product );
}
);
@ -91,7 +90,7 @@ public class SybaseASEFunctionTest {
scope.inTransaction(
session -> {
Query query = session.createQuery( "select dateadd(day, 1, p.date) from Product p" );
assertTrue(calendar.getTime().before((Date) query.uniqueResult()));
assertTrue(Calendar.getInstance().getTime().before((Date) query.uniqueResult()));
}
);
}
@ -102,7 +101,7 @@ public class SybaseASEFunctionTest {
scope.inTransaction(
session -> {
Query query = session.createQuery( "select datepart(month, p.date) from Product p" );
assertEquals(calendar.get(MONTH) + 1, ((Number) query.uniqueResult()).intValue());
assertEquals(Calendar.getInstance().get(MONTH) + 1, ((Number) query.uniqueResult()).intValue());
}
);
}
@ -112,7 +111,7 @@ public class SybaseASEFunctionTest {
public void testDatediffFunction(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
Query query = session.createQuery( "SELECT DATEDIFF( DAY, '1999/07/19 00:00', '1999/07/23 23:59' ) from Product" );
Query query = session.createQuery( "select datediff(day, datetime 1999-07-19 00:00, datetime 1999-07-23 23:59) from Product" );
assertEquals(4, ((Number) query.uniqueResult()).intValue());
}
);