Skip to content

[6.6] HHH-19621 Don't render code units for DB2 for i #10579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2025
Merged

[6.6] HHH-19621 Don't render code units for DB2 for i #10579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.hibernate.boot.model.FunctionContributions;
import org.hibernate.dialect.DatabaseVersion;
import org.hibernate.dialect.function.CommonFunctionFactory;
import org.hibernate.dialect.function.DB2SubstringFunction;
import org.hibernate.dialect.identity.DB2390IdentityColumnSupport;
import org.hibernate.dialect.identity.DB2IdentityColumnSupport;
import org.hibernate.dialect.identity.IdentityColumnSupport;
Expand Down Expand Up @@ -59,9 +60,14 @@ public DB2iLegacyDialect(DatabaseVersion version) {

@Override
public void initializeFunctionRegistry(FunctionContributions functionContributions) {
super.initializeFunctionRegistry(functionContributions);
super.initializeFunctionRegistry( functionContributions );
// DB2 for i doesn't allow code units: https://www.ibm.com/docs/en/i/7.1.0?topic=functions-substring
functionContributions.getFunctionRegistry().register(
"substring",
new DB2SubstringFunction( false, functionContributions.getTypeConfiguration() )
);
if ( getVersion().isSameOrAfter( 7, 2 ) ) {
CommonFunctionFactory functionFactory = new CommonFunctionFactory(functionContributions);
CommonFunctionFactory functionFactory = new CommonFunctionFactory( functionContributions );
functionFactory.listagg( null );
functionFactory.inverseDistributionOrderedSetAggregates();
functionFactory.hypotheticalOrderedSetAggregates_windowEmulation();
Expand Down
10 changes: 8 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.hibernate.LockOptions;
import org.hibernate.boot.model.FunctionContributions;
import org.hibernate.dialect.function.CommonFunctionFactory;
import org.hibernate.dialect.function.DB2SubstringFunction;
import org.hibernate.dialect.identity.DB2IdentityColumnSupport;
import org.hibernate.dialect.identity.DB2zIdentityColumnSupport;
import org.hibernate.dialect.identity.IdentityColumnSupport;
Expand Down Expand Up @@ -65,9 +66,14 @@ protected DatabaseVersion getMinimumSupportedVersion() {

@Override
public void initializeFunctionRegistry(FunctionContributions functionContributions) {
super.initializeFunctionRegistry(functionContributions);
super.initializeFunctionRegistry( functionContributions );
// DB2 for i doesn't allow code units: https://www.ibm.com/docs/en/i/7.1.0?topic=functions-substring
functionContributions.getFunctionRegistry().register(
"substring",
new DB2SubstringFunction( false, functionContributions.getTypeConfiguration() )
);
if ( getVersion().isSameOrAfter( 7, 2 ) ) {
CommonFunctionFactory functionFactory = new CommonFunctionFactory(functionContributions);
CommonFunctionFactory functionFactory = new CommonFunctionFactory( functionContributions );
functionFactory.listagg( null );
functionFactory.inverseDistributionOrderedSetAggregates();
functionFactory.hypotheticalOrderedSetAggregates_windowEmulation();
Expand Down
9 changes: 8 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,21 @@
*/
public class DB2SubstringFunction extends AbstractSqmSelfRenderingFunctionDescriptor {

private final boolean needsCodeUnit;

public DB2SubstringFunction(TypeConfiguration typeConfiguration) {
this( true, typeConfiguration );
}

public DB2SubstringFunction(boolean needsCodeUnit, TypeConfiguration typeConfiguration) {
super(
"substring",
new ArgumentTypesValidator( StandardArgumentsValidators.between( 2, 4 ), STRING, INTEGER, INTEGER, FunctionParameterType.ANY ),
StandardFunctionReturnTypeResolvers.invariant( typeConfiguration.getBasicTypeRegistry().resolve(
StandardBasicTypes.STRING ) ),
StandardFunctionArgumentTypeResolvers.invariant( typeConfiguration, STRING, INTEGER, INTEGER )
);
this.needsCodeUnit = needsCodeUnit;
}

@Override
Expand All @@ -53,7 +60,7 @@ public void render(
sqlAppender.appendSql( ',' );
arguments.get( i ).accept( walker );
}
if ( argumentCount != 4 ) {
if ( argumentCount != 4 && needsCodeUnit ) {
sqlAppender.appendSql( ",codeunits32" );
}
sqlAppender.appendSql( ')' );
Expand Down
Loading