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

HHH-15725 Add test for issue

This commit is contained in:
Andrea Boriero 2022-11-24 11:06:08 +01:00 committed by Steve Ebersole
parent 03e48d8355
commit aece493697
4 changed files with 241 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/AbstractCriteriaTest.java
View File

@ -50,6 +50,7 @@ import org.hibernate.testing.orm.junit.Jpa;
Thing.class,
ThingWithQuantity.class,
VersionedEntity.class
})
}
)
public abstract class AbstractCriteriaTest {
}

72
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CastTest.java
View File

@ -1,72 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.orm.test.jpa.criteria.basic;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.List;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Root;
import org.hibernate.dialect.DerbyDialect;
import org.hibernate.orm.test.jpa.metamodel.Product;
import org.hibernate.orm.test.jpa.metamodel.Product_;
import org.hibernate.orm.test.jpa.criteria.AbstractCriteriaTest;
import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class CastTest extends AbstractCriteriaTest {
private static final int QUANTITY = 2;
@AfterEach
public void tearDown(EntityManagerFactoryScope scope) {
scope.inTransaction(
entityManager -> {
entityManager.createQuery( "delete from Product" ).executeUpdate();
}
);
}
@Test
@SkipForDialect(value = DerbyDialect.class, comment = "Derby does not support cast from INTEGER to VARCHAR")
@TestForIssue(jiraKey = "HHH-5755")
public void testCastToString(EntityManagerFactoryScope scope) {
scope.inTransaction(
entityManager -> {
Product product = new Product();
product.setId( "product1" );
product.setPrice( 1.23d );
product.setQuantity( QUANTITY );
product.setPartNumber( ( (long) Integer.MAX_VALUE ) + 1 );
product.setRating( 1.999f );
product.setSomeBigInteger( BigInteger.valueOf( 987654321 ) );
product.setSomeBigDecimal( BigDecimal.valueOf( 987654.321 ) );
entityManager.persist( product );
}
);
scope.inTransaction(
entityManager -> {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
CriteriaQuery<Product> criteria = builder.createQuery( Product.class );
Root<Product> root = criteria.from( Product.class );
criteria.where( builder.equal(
root.get( Product_.quantity ).as( String.class ),
builder.literal( String.valueOf( QUANTITY ) )
) );
List<Product> result = entityManager.createQuery( criteria ).getResultList();
Assertions.assertEquals( 1, result.size() );
}
);
}
}

234
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CiteriaAsExpressionTest.java Normal file
View File

@ -0,0 +1,234 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.orm.test.jpa.criteria.basic;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.List;
import org.hibernate.dialect.DerbyDialect;
import org.hibernate.dialect.SybaseASEDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.orm.test.jpa.metamodel.Product;
import org.hibernate.orm.test.jpa.metamodel.Product_;
import org.hibernate.orm.test.jpa.metamodel.ShelfLife;
import org.hibernate.testing.jdbc.SQLStatementInspector;
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.orm.junit.Jpa;
import org.hibernate.testing.orm.junit.SkipForDialect;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import jakarta.persistence.AttributeConverter;
import jakarta.persistence.Convert;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Root;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
@Jpa(annotatedClasses = {
Product.class,
ShelfLife.class,
CiteriaAsExpressionTest.TestEntity.class
},
useCollectingStatementInspector = true
)
public class CiteriaAsExpressionTest {
private static final int QUANTITY = 2;
private static final String NAME = "a";
private static final Integer NAME_CONVERTED_VALUE = 1;
@BeforeEach
public void setup(EntityManagerFactoryScope scope) {
scope.inTransaction(
entityManager -> {
Product product = new Product();
product.setId( "product1" );
product.setPrice( 1.23d );
product.setQuantity( QUANTITY );
product.setPartNumber( ( (long) Integer.MAX_VALUE ) + 1 );
product.setRating( 1.999f );
product.setSomeBigInteger( BigInteger.valueOf( 987654321 ) );
product.setSomeBigDecimal( BigDecimal.valueOf( 987654.321 ) );
entityManager.persist( product );
TestEntity testEntity = new TestEntity( 1, NAME );
entityManager.persist( testEntity );
}
);
}
@AfterEach
public void tearDown(EntityManagerFactoryScope scope) {
scope.inTransaction(
entityManager -> {
entityManager.createQuery( "delete from Product" ).executeUpdate();
entityManager.createQuery( "delete from TestEntity" ).executeUpdate();
}
);
}
@Test
@JiraKey("HHH-5755")
@SkipForDialect(dialectClass = DerbyDialect.class )
@SkipForDialect(dialectClass = SybaseDialect.class )
@SkipForDialect(dialectClass = SybaseASEDialect.class )
public void testAsToString(EntityManagerFactoryScope scope) {
SQLStatementInspector statementInspector = (SQLStatementInspector) scope.getStatementInspector();
statementInspector.clear();
scope.inTransaction(
entityManager -> {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
CriteriaQuery<Product> criteria = builder.createQuery( Product.class );
Root<Product> root = criteria.from( Product.class );
criteria.where( builder.equal(
root.get( Product_.quantity ).as( String.class ),
builder.literal( String.valueOf( QUANTITY ) )
) );
List<Product> result = entityManager.createQuery( criteria ).getResultList();
Assertions.assertEquals( 1, result.size() );
assertExecuteQueryDoesNotContainACast( statementInspector );
}
);
}
@Test
@JiraKey("HHH-15713")
public void testAsIntegerToIntegreDoesNotCreateACast(EntityManagerFactoryScope scope) {
SQLStatementInspector statementInspector = (SQLStatementInspector) scope.getStatementInspector();
statementInspector.clear();
scope.inTransaction(
entityManager -> {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
CriteriaQuery<Product> criteria = builder.createQuery( Product.class );
Root<Product> root = criteria.from( Product.class );
criteria.where( builder.equal(
root.get( Product_.quantity ).as( Integer.class ),
builder.literal( QUANTITY )
)
);
List<Product> result = entityManager.createQuery( criteria ).getResultList();
Assertions.assertEquals( 1, result.size() );
assertExecuteQueryDoesNotContainACast( statementInspector );
}
);
}
@Test
@JiraKey("HHH-15725")
public void testAsAndConvertedAttribute(EntityManagerFactoryScope scope) {
SQLStatementInspector statementInspector = (SQLStatementInspector) scope.getStatementInspector();
statementInspector.clear();
scope.inTransaction(
entityManager -> {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
CriteriaQuery<TestEntity> criteria = builder.createQuery( TestEntity.class );
Root<TestEntity> root = criteria.from( TestEntity.class );
criteria.where( builder.equal(
root.get( "name" ).as( Integer.class ),
builder.literal( NAME_CONVERTED_VALUE )
)
);
List<TestEntity> result = entityManager.createQuery( criteria ).getResultList();
Assertions.assertEquals( 1, result.size() );
assertExecuteQueryDoesNotContainACast( statementInspector );
}
);
}
@Test
@JiraKey("HHH-15725")
public void testAsAndConvertedAttribute2(EntityManagerFactoryScope scope) {
SQLStatementInspector statementInspector = (SQLStatementInspector) scope.getStatementInspector();
statementInspector.clear();
scope.inTransaction(
entityManager -> {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
CriteriaQuery<Integer> criteria = builder.createQuery( Integer.class );
Root<TestEntity> root = criteria.from( TestEntity.class );
criteria.select( root.get( "name" ).as( Integer.class ) );
List<Integer> result = entityManager.createQuery( criteria ).getResultList();
Assertions.assertEquals( 1, result.size() );
Integer actual = result.get( 0 );
// When Expression.as() is used the Converted is not applied
Assertions.assertEquals( 1, actual );
assertExecuteQueryDoesNotContainACast( statementInspector );
}
);
}
private static void assertExecuteQueryDoesNotContainACast(SQLStatementInspector statementInspector) {
assertFalse( getExecutedQuery( statementInspector ).contains( "cast" ) );
}
private static String getExecutedQuery(SQLStatementInspector statementInspector) {
List<String> sqlQueries = statementInspector.getSqlQueries();
assertThat( sqlQueries.size() ).isEqualTo( 1 );
String executedQuery = sqlQueries.get( 0 );
return executedQuery;
}
@Entity(name = "TestEntity")
public static class TestEntity {
@Id
private Integer id;
@Convert(converter = TestConverter.class)
private String name;
public TestEntity() {
}
public TestEntity(Integer id, String name) {
this.id = id;
this.name = name;
}
public Integer getId() {
return id;
}
public String getName() {
return name;
}
}
private static class TestConverter implements AttributeConverter<String, Integer> {
@Override
public Integer convertToDatabaseColumn(String attribute) {
if ( attribute.equals( NAME ) ) {
return NAME_CONVERTED_VALUE;
}
return 0;
}
@Override
public String convertToEntityAttribute(Integer dbData) {
if ( dbData == 1 ) {
return "a";
}
return "b";
}
}
}

10
hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java
View File

@ -237,14 +237,14 @@ public class CriteriaBuilderNonStandardFunctionsTest {
Expression<String> theString = from.get( "theString" );
query.multiselect(
cb.overlay( theString, "33", 6 ),
cb.overlay( theString, from.get( "theInt" ).as( String.class ), 6 ),
// cb.overlay( theString, from.get( "theInt" ).as( String.class ), 6 ),
cb.overlay( theString, "1234", from.get( "theInteger" ), 2 )
).where( cb.equal( from.get( "id" ), 4 ) );
Tuple result = session.createQuery( query ).getSingleResult();
assertEquals( "thirt33n", result.get( 0 ) );
assertEquals( "thirt13n", result.get( 1 ) );
assertEquals( "thi1234een", result.get( 2 ) );
// assertEquals( "thirt13n", result.get( 1 ) );
assertEquals( "thi1234een", result.get( 1 ) );
} );
}
@ -300,12 +300,12 @@ public class CriteriaBuilderNonStandardFunctionsTest {
Expression<String> theString = from.get( "theString" );
query.multiselect(
cb.replace( theString, "thi", "12345" ),
cb.replace( theString, "t", from.get( "theInteger" ).as( String.class ) )
cb.replace( theString, "t", from.get( "theString" ) )
).where( cb.equal( from.get( "id" ), 4 ) );
Tuple result = session.createQuery( query ).getSingleResult();
assertEquals( "12345rteen", result.get( 0 ) );
assertEquals( "4hir4een", result.get( 1 ) );
assertEquals( "thirteenhirthirteeneen", result.get( 1 ) );
} );
}