HHH-3404 cleanup

Author: gavinking

hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java

@@ -229,7 +229,6 @@
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 import static org.hibernate.internal.util.StringHelper.splitAtCommas;
 import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_STRING_ARRAY;
-import static org.hibernate.query.sqm.produce.function.FunctionParameterType.STRING;
 import static org.hibernate.sql.ast.internal.NonLockingClauseStrategy.NON_CLAUSE_STRATEGY;
 import static org.hibernate.type.SqlTypes.ARRAY;
 import static org.hibernate.type.SqlTypes.BIGINT;
@@ -268,7 +267,6 @@
 import static org.hibernate.type.SqlTypes.isNumericOrDecimal;
 import static org.hibernate.type.SqlTypes.isVarbinaryType;
 import static org.hibernate.type.SqlTypes.isVarcharType;
-import static org.hibernate.type.StandardBasicTypes.BOOLEAN;
 import static org.hibernate.type.descriptor.DateTimeUtils.JDBC_ESCAPE_END;
 import static org.hibernate.type.descriptor.DateTimeUtils.JDBC_ESCAPE_START_DATE;
 import static org.hibernate.type.descriptor.DateTimeUtils.JDBC_ESCAPE_START_TIME;
@@ -1375,11 +1373,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 
 		functionRegistry.register( "sql", new SqlFunction() );
 
-		functionRegistry.namedDescriptorBuilder( "regexp_like"  )
-				.setArgumentCountBetween( 2, 3 )
-				.setParameterTypes( STRING, STRING, STRING )
-				.setInvariantType( basicTypeRegistry.resolve( BOOLEAN ) )
-				.register();
+		functionFactory.regexpLike();
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java

@@ -129,6 +129,11 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 
 		commonFunctionFactory.windowFunctions();
 		commonFunctionFactory.hypotheticalOrderedSetAggregates_windowEmulation();
+		commonFunctionFactory.inverseDistributionOrderedSetAggregates_windowEmulation();
+		commonFunctionFactory.median_medianOver();
+
+		commonFunctionFactory.regexpLike_regexp();
+
 		functionRegistry.registerNamed(
 				"json_valid",
 				basicTypeRegistry.resolve( BOOLEAN )
@@ -141,18 +146,6 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		commonFunctionFactory.jsonArrayAppend_mariadb();
 		commonFunctionFactory.unnest_emulated();
 		commonFunctionFactory.jsonTable_mysql();
-
-		commonFunctionFactory.inverseDistributionOrderedSetAggregates_windowEmulation();
-		functionRegistry.patternDescriptorBuilder( "median", "median(?1) over ()" )
-				.setInvariantType( basicTypeRegistry.resolve( DOUBLE ) )
-				.setExactArgumentCount( 1 )
-				.setParameterTypes(NUMERIC)
-				.register();
-
-		functionRegistry.patternDescriptorBuilder( "regexp_like", "?1 regexp ?2" )
-				.setParameterTypes( STRING, STRING )
-				.setInvariantType( basicTypeRegistry.resolve( BOOLEAN ) )
-				.register();
 	}
 
 	@Override

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

@@ -403,6 +403,20 @@ public void median_percentileCont_castDouble() {
 				.register();
 	}
 
+	/**
+	 * For MariaDB
+	 */
+	public void median_medianOver() {
+		functionRegistry.patternDescriptorBuilder(
+						"median",
+						"median(?1) over ()"
+				)
+				.setInvariantType(doubleType)
+				.setExactArgumentCount( 1 )
+				.setParameterTypes(NUMERIC)
+				.register();
+	}
+
 	/**
 	 * Warning: the semantics of this function are inconsistent between DBs.
 	 * <ul>
@@ -2651,6 +2665,25 @@ public void dateTrunc_datetrunc() {
 				.register();
 	}
 
+	public void regexpLike() {
+		functionRegistry.namedDescriptorBuilder( "regexp_like"  )
+				.setArgumentCountBetween( 2, 3 )
+				.setParameterTypes( STRING, STRING, STRING )
+				.setInvariantType( booleanType )
+				.register();
+
+	}
+
+	/**
+	 * For MariaDB
+	 */
+	public void regexpLike_regexp() {
+		functionRegistry.patternDescriptorBuilder( "regexp_like", "?1 regexp ?2" )
+				.setParameterTypes( STRING, STRING )
+				.setInvariantType( booleanType )
+				.register();
+	}
+
 	/**
 	 * H2, HSQL array() constructor function
 	 */

hibernate-core/src/test/java/x/RegexTest.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/RegexTest.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package x;
+package org.hibernate.orm.test.query.hql;
 
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.MariaDBDialect;
@@ -21,7 +21,8 @@
 class RegexTest {
 	@Test
 //	@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 19)
-	@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 21)
+	@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 21,
+			reason = "regexp_like must be a predicate in older versions")
 	@SkipForDialect(dialectClass = SQLServerDialect.class,
 			reason = "regexp_like coming in 2025")
 	@SkipForDialect(dialectClass = SybaseASEDialect.class,
@@ -32,6 +33,7 @@ void testInSelect(EntityManagerFactoryScope scope) {
 			assertTrue( em.createQuery( "select 'abcdef' like regexp 'ab.*'", Boolean.class ).getSingleResult() );
 		} );
 	}
+
 	@Test
 	@SkipForDialect(dialectClass = MariaDBDialect.class)
 	@SkipForDialect(dialectClass = HSQLDialect.class)
@@ -45,6 +47,7 @@ void testInSelectCaseInsensitive(EntityManagerFactoryScope scope) {
 			assertTrue( em.createQuery( "select 'abcdef' ilike regexp 'ab.*'", Boolean.class ).getSingleResult() );
 		} );
 	}
+
 	@Test
 	@SkipForDialect(dialectClass = SQLServerDialect.class,
 			reason = "regexp_like coming in 2025")