HHH-19365 - fix duplicate and unused code problems

Author: liubao68

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBAbstractStructuredJdbcType.java

@@ -7,6 +7,7 @@
 import java.util.List;
 
 import org.hibernate.HibernateException;
+import org.hibernate.dialect.type.AbstractPostgreSQLStructJdbcType;
 import org.hibernate.procedure.internal.AbstractStandardCallableStatementSupport;
 import org.hibernate.procedure.spi.FunctionReturnImplementor;
 import org.hibernate.procedure.spi.ProcedureCallImplementor;
@@ -132,9 +133,9 @@ else if ( firstParamIsRefCursor ) {
 				if ( parameter.getName() != null ) {
 					buffer.append( parameter.getName() ).append( " => " );
 				}
-				if ( type != null && type.getJdbcType() instanceof GaussDBAbstractStructuredJdbcType ) {
+				if ( type != null && type.getJdbcType() instanceof AbstractPostgreSQLStructJdbcType ) {
 					// We have to cast struct type parameters so that GaussDB understands nulls
-					castType = ( (GaussDBAbstractStructuredJdbcType) type.getJdbcType() ).getStructTypeName();
+					castType = ( (AbstractPostgreSQLStructJdbcType) type.getJdbcType() ).getStructTypeName();
 					buffer.append( "cast(" );
 				}
 				else {

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBCallableStatementSupport.java

@@ -5,7 +5,6 @@
 package org.hibernate.community.dialect;
 
 import org.hibernate.boot.model.FunctionContributions;
-import org.hibernate.community.dialect.function.GaussDBFormatFunction;
 import org.hibernate.community.dialect.function.GaussDBMinMaxFunction;
 import org.hibernate.community.dialect.function.GaussDBTruncFunction;
 import org.hibernate.community.dialect.function.GaussDBTruncRoundFunction;
@@ -96,6 +95,7 @@ public void register() {
 		functionFactory.hex( "encode(?1, 'hex')" );
 		functionFactory.sha( "sha256(?1)" );
 		functionFactory.md5( "decode(md5(?1), 'hex')" );
+		functionFactory.format_toChar();
 
 		functionContributions.getFunctionRegistry().register( "min", new GaussDBMinMaxFunction( "min" ) );
 		functionContributions.getFunctionRegistry().register( "max", new GaussDBMinMaxFunction( "max" ) );
@@ -115,7 +115,6 @@ public void register() {
 		);
 		functionContributions.getFunctionRegistry().registerAlternateKey( "truncate", "trunc" );
 
-		format_toChar_gaussdb();
 		array_gaussdb();
 		arrayRemoveIndex_gaussdb();
 		arrayConcat_gaussdb();
@@ -130,10 +129,6 @@ public void register() {
 		jsonObject_gaussdb();
 	}
 
-	public void format_toChar_gaussdb() {
-		functionRegistry.register( "format", new GaussDBFormatFunction( "to_char", typeConfiguration ) );
-	}
-
 	public void array_gaussdb() {
 		functionRegistry.register( "array", new GaussDBArrayConstructorFunction( false ) );
 		functionRegistry.register( "array_list", new GaussDBArrayConstructorFunction( true ) );

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBFunctionRegistry.java

@@ -10,6 +10,7 @@
 
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.type.AbstractPostgreSQLStructJdbcType;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.sql.ast.spi.SqlAppender;
@@ -25,7 +26,7 @@
  *
  * Notes: Original code of this class is based on PostgreSQLStructCastingJdbcType.
  */
-public class GaussDBStructuredJdbcType extends GaussDBAbstractStructuredJdbcType {
+public class GaussDBStructuredJdbcType extends AbstractPostgreSQLStructJdbcType {
 
 	public static final GaussDBStructuredJdbcType INSTANCE = new GaussDBStructuredJdbcType();
 	public GaussDBStructuredJdbcType() {
@@ -75,6 +76,7 @@ protected void doBind(PreparedStatement st, X value, int index, WrapperOptions o
 					throws SQLException {
 				final String stringValue = ( (GaussDBStructuredJdbcType) getJdbcType() ).toString(
 						value,
+						getJavaType(),
 						options
 				);
 				st.setString( index, stringValue );
@@ -85,6 +87,7 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 					throws SQLException {
 				final String stringValue = ( (GaussDBStructuredJdbcType) getJdbcType() ).toString(
 						value,
+						getJavaType(),
 						options
 				);
 				st.setString( name, stringValue );