Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-08 04:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-6655 trim function on DB2 is broken

Browse Source
This commit is contained in:
brmeyer 2012-10-09 11:29:05 -04:00
parent 58fa4c2eac
commit 11dcd9ab46
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
View File

@ -159,7 +159,7 @@ public DB2Dialect() {
registerFunction( "substring", new StandardSQLFunction( "substr", StandardBasicTypes.STRING ) );
registerFunction( "bit_length", new SQLFunctionTemplate( StandardBasicTypes.INTEGER, "length(?1)*8" ) );
registerFunction( "trim", new AnsiTrimEmulationFunction() );
registerFunction( "trim", new SQLFunctionTemplate( StandardBasicTypes.STRING, "trim(?1 ?2 ?3 ?4)" ) );
registerFunction( "concat", new VarArgsSQLFunction( StandardBasicTypes.STRING, "", "||", "" ) );

14
hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/expression/function/TrimFunction.java
View File

@ -37,6 +37,7 @@
* Models the ANSI SQL <tt>TRIM</tt> function.
*
* @author Steve Ebersole
* @author Brett Meyer
*/
public class TrimFunction
extends BasicFunctionExpression<String>
@ -118,11 +119,22 @@ public void registerParameters(ParameterRegistry registry) {
@Override
public String render(RenderingContext renderingContext) {
String renderedTrimChar;
if ( trimCharacter.getClass().isAssignableFrom(
LiteralExpression.class ) ) {
// If the character is a literal, treat it as one. A few dialects
// do not support parameters as trim() arguments.
renderedTrimChar = ( ( LiteralExpression<Character> )
trimCharacter ).getLiteral().toString();
} else {
renderedTrimChar = ( (Renderable) trimCharacter ).render(
renderingContext );
}
return new StringBuilder()
.append( "trim(" )
.append( trimspec.name() )
.append( ' ' )
.append( ( (Renderable) trimCharacter ).render( renderingContext ) )
.append( renderedTrimChar )
.append( " from " )
.append( ( (Renderable) trimSource ).render( renderingContext ) )
.append( ')' )

2
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/CriteriaCompilingTest.java
View File

@ -92,8 +92,6 @@ public Class[] getAnnotatedClasses() {
}
@Test
@RequiresDialect( DB2Dialect.class )
@FailureExpected( jiraKey = "HHH-6655" )
public void testTrim() {
final String expectedResult = "David R. Vincent";
EntityManager em = getOrCreateEntityManager();