From 2e7058e40d2745b1925af91ac3d435155f515435 Mon Sep 17 00:00:00 2001
From: Christian Beikov <christian.beikov@gmail.com>
Date: Fri, 18 Jul 2025 09:24:25 +0200
Subject: [PATCH] HHH-19621 Don't render code units for DB2 for i

---
 .../hibernate/community/dialect/DB2iLegacyDialect.java | 10 ++++++++--
 .../main/java/org/hibernate/dialect/DB2iDialect.java   | 10 ++++++++--
 .../dialect/function/DB2SubstringFunction.java         |  9 ++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java
index 607efd39fb3e..4b1e905ecfcf 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java
@@ -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;
@@ -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();
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
index e52bf220646d..e6d1a49db067 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
@@ -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;
@@ -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();
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java
index 977a55aea1aa..9b177c0794b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java
@@ -30,7 +30,13 @@
  */
 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 ),
@@ -38,6 +44,7 @@ public DB2SubstringFunction(TypeConfiguration typeConfiguration) {
 						StandardBasicTypes.STRING ) ),
 				StandardFunctionArgumentTypeResolvers.invariant( typeConfiguration, STRING, INTEGER, INTEGER )
 		);
+		this.needsCodeUnit = needsCodeUnit;
 	}
 
 	@Override
@@ -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( ')' );