Merge pull request hibernate#11 from liubao68/work

[HHH-19365]json functions

Author: liubao68

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

@@ -572,7 +572,6 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arrayFill_gaussdb();
 
 		functionFactory.jsonObject_gaussdb();
-		functionFactory.jsonObjectAgg_gaussdb( true );
 
 		functionFactory.makeDateTimeTimestamp();
 		// Note that GaussDB doesn't support the OVER clause for ordered set-aggregate functions

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

@@ -3559,13 +3559,6 @@ public void jsonExists() {
 		functionRegistry.register( "json_exists", new JsonExistsFunction( typeConfiguration, true, true ) );
 	}
 
-	/**
-	 * json_exists() function
-	 */
-	public void jsonExists_gaussdb() {
-		functionRegistry.register( "json_exists", new GaussDBJsonExistsFunction( typeConfiguration, false, false ) );
-	}
-
 	/**
 	 * json_exists() function that doesn't support the passing clause
 	 */
@@ -3846,13 +3839,6 @@ public void jsonObjectAgg_postgresql(boolean supportsStandard) {
 		functionRegistry.register( "json_objectagg", new PostgreSQLJsonObjectAggFunction( supportsStandard, typeConfiguration ) );
 	}
 
-	/**
-	 * GaussDB json_objectagg() function
-	 */
-	public void jsonObjectAgg_gaussdb(boolean supportsStandard) {
-		functionRegistry.register( "json_objectagg", new GaussDBJsonObjectAggFunction( supportsStandard, typeConfiguration ) );
-	}
-
 	/**
 	 * MySQL json_objectagg() function
 	 */
@@ -4081,13 +4067,6 @@ public void jsonMergepatch_postgresql() {
 		functionRegistry.register( "json_mergepatch", new PostgreSQLJsonMergepatchFunction( typeConfiguration ) );
 	}
 
-	/**
-	 * GaussDB json_mergepatch() function
-	 */
-	public void jsonMergepatch_gaussdb() {
-		functionRegistry.register( "json_mergepatch", new GaussDBJsonMergepatchFunction( typeConfiguration ) );
-	}
-
 	/**
 	 * MySQL json_mergepatch() function
 	 */
@@ -4118,13 +4097,6 @@ public void jsonArrayAppend_postgresql(boolean supportsLax) {
 		functionRegistry.register( "json_array_append", new PostgreSQLJsonArrayAppendFunction( supportsLax, typeConfiguration ) );
 	}
 
-	/**
-	 * GaussDB json_array_append() function
-	 */
-	public void jsonArrayAppend_gaussdb(boolean supportsLax) {
-		functionRegistry.register( "json_array_append", new GaussDBJsonArrayAppendFunction( supportsLax, typeConfiguration ) );
-	}
-
 	/**
 	 * MySQL json_array_append() function
 	 */

hibernate-core/src/main/java/org/hibernate/dialect/function/json/GaussDBJsonArrayAppendFunction.java

@@ -18,7 +18,6 @@
 import org.hibernate.cfg.QuerySettings;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DB2Dialect;
-import org.hibernate.dialect.GaussDBDialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.MySQLDialect;
@@ -72,7 +71,6 @@
 @ServiceRegistry(settings = @Setting(name = QuerySettings.JSON_FUNCTIONS_ENABLED, value = "true"))
 @SessionFactory
 @Jira("https://hibernate.atlassian.net/browse/HHH-18496")
-@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "opengauss don't support")
 public class JsonFunctionTests {
 
 	JsonHolder entity;
@@ -219,7 +217,6 @@ public void testJsonQuery(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonQueryNestedPath.class)
-	@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "type:resolved.Not support $.theNestedObjects[*].id")
 	public void testJsonQueryNested(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -421,7 +418,6 @@ public void testJsonObjectAgg(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonObjectAgg.class)
-	@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "type:resolved.Gauss has different behavior")
 	public void testJsonObjectAggNullFilter(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -464,7 +460,6 @@ public void testJsonObjectAggNullClause(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = DB2Dialect.class, reason = "DB2 has no way to throw an error on duplicate json object keys.")
 	@SkipForDialect(dialectClass = CockroachDialect.class, reason = "CockroachDB has no way to throw an error on duplicate json object keys.")
 	@SkipForDialect(dialectClass = PostgreSQLDialect.class, majorVersion = 15, matchSubTypes = true, reason = "CockroachDB has no way to throw an error on duplicate json object keys.")
-	@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "type:resolved.not supported")
 	public void testJsonObjectAggUniqueKeys(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -626,7 +621,6 @@ public void testJsonInsertWithExisting(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonMergepatch.class)
-	@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "type:resolved.gauss has different function definition")
 	public void testJsonMergepatch(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -644,7 +638,6 @@ public void testJsonMergepatch(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonMergepatch.class)
-	@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "type:resolved.gauss has different behavior")
 	public void testJsonMergepatchVarargs(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {