HHH-20262: Spanner PG: Fix Tests Phase 3 by sakthivelmanii · Pull Request #11991 · hibernate/hibernate-orm

sakthivelmanii · 2026-03-18T14:16:59Z

[Please describe here what your change is about]

Added Array and JSON functions
Fixed some of the $ related errors

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

Please make sure that the following tasks are completed:
Tasks specific to HHH-20262 (Sub-task):

Add test OR check there is no need for a test
Update documentation as relevant: javadoc for changed API, documentation/src/main/asciidoc/userguide for all features, documentation/src/main/asciidoc/introduction for main features, links from existing documentation
Add entries as relevant to migration-guide.adoc (breaking changes) and whats-new.adoc (new features/improvements)

https://hibernate.atlassian.net/browse/HHH-20262

sakthivelmanii · 2026-03-18T14:19:46Z

@beikov This is the last PR for Spanner PG dialect which fixes all the tests.

beikov · 2026-03-18T14:41:43Z

hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonArrayUnnestTest.java

 @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsStructuralArrays.class)
 @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsUnnest.class)
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonAggregate.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner PG doesn't support LATERAL JOIN")


Since this seems to depend on json_table to work correctly, I would prefer to see this:

Suggested change

@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner PG doesn't support LATERAL JOIN")

@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonTable.class)

beikov · 2026-03-18T14:53:00Z

hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayContainsTest.java

 	}

 	@Test
+	@RequiresDialectFeature( feature =  DialectFeatureChecks.SupportsArrayPosition.class)


I would prefer if you add a new check that checks for definesFunction( dialect, "array_contains_nullable" ).

Suggested change

@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayPosition.class)

@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayContainsNullable.class)

beikov · 2026-03-18T14:53:07Z

hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayContainsTest.java

 	}

 	@Test
+	@RequiresDialectFeature( feature =  DialectFeatureChecks.SupportsArrayPosition.class)


Again, I would prefer if you add a new check that checks for definesFunction( dialect, "array_contains_nullable" ).

Suggested change

@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayPosition.class)

@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayContainsNullable.class)

beikov · 2026-03-18T15:21:17Z

...mmunity-dialects/src/main/java/org/hibernate/community/dialect/SpannerPostgreSQLDialect.java

+		functionFactory.arrayConcat_postgresql();
+		functionFactory.arrayPrepend_postgresql();
+		functionFactory.arrayAppend_postgresql();
+		functionFactory.arrayContains_postgresql();


This is what I mean, i.e. don't register array_contains_nullable since you can't implement it.

Suggested change

functionFactory.arrayContains_postgresql();

functionRegistry.register( "array_contains", new ArrayContainsOperatorFunction( false, typeConfiguration ) );

functionRegistry.register( "array_includes", new ArrayIncludesOperatorFunction( false, typeConfiguration ) );

functionRegistry.register( "array_includes_nullable", new ArrayIncludesOperatorFunction( true, typeConfiguration ) );

beikov · 2026-03-18T15:22:52Z

...y-dialects/src/main/java/org/hibernate/community/dialect/SpannerPostgreSQLTableExporter.java

+				.filter( collection -> Objects.nonNull( collection.getCollectionTable() ) )
+				.filter( collection -> collection.getCollectionTable().equals( targetTable ) )


Suggested change

.filter( collection -> Objects.nonNull( collection.getCollectionTable() ) )

.filter( collection -> collection.getCollectionTable().equals( targetTable ) )

.filter( collection -> collection.getCollectionTable() == targetTable )

beikov · 2026-03-18T15:24:38Z

...y-dialects/src/main/java/org/hibernate/community/dialect/SpannerPostgreSQLTableExporter.java

+		return metadata.getCollectionBindings().stream()
+				.filter( collection -> Objects.nonNull( collection.getCollectionTable() ) )
+				.filter( collection -> collection.getCollectionTable().equals( targetTable ) )
+				.anyMatch( collection -> collection.getElement() instanceof SimpleValue );


Suggested change

.anyMatch( collection -> collection.getElement() instanceof SimpleValue );

.anyMatch( collection -> collection.getElement() instanceof SimpleValue && !( collection.getElement() instanceof ToOne ));

beikov · 2026-03-18T15:29:42Z

...y-dialects/src/main/java/org/hibernate/community/dialect/SpannerPostgreSQLTableExporter.java

 	}

+	private boolean isHistoryOrAuditedTable(Table table) {
+		return table.getName().endsWith( "_history" ) || table.getName().endsWith( "_aud" );


It seems to me that this is a safer way to check if a table is an audit table:

Suggested change

return table.getName().endsWith( "_history" ) || table.getName().endsWith( "_aud" );

return metadata.getCollectionBindings().stream()

.anyMatch( collection -> collection.getAuxiliaryTable() == targetTable )

|| metadata.getEntityBindings().stream()

.filter( entity -> entity instanceof RootClass )

.anyMatch( entity -> ((RootClass) entity).getAuxiliaryTable() == targetTable );

beikov · 2026-03-18T16:08:16Z

...re/src/main/java/org/hibernate/dialect/function/json/SpannerPostgreSQLJsonArrayFunction.java

+				sqlAppender.appendSql( "jsonb_strip_nulls(jsonb_build_array" );
+			}
+			else {
+				sqlAppender.appendSql( "jsonb_build_array" );
+			}
+
+			char separator = '(';
+			for ( int i = 0; i < argumentsCount; i++ ) {
+				sqlAppender.appendSql( separator );
+				sqlAstArguments.get( i ).accept( walker );
+				separator = ',';
+			}
+			sqlAppender.appendSql( ')' );
+
+			if ( nullBehavior == JsonNullBehavior.ABSENT ) {
+				sqlAppender.appendSql( ')' );


According to the documentation, jsonb_strip_nulls only works on object values, not array values, so you need this instead:

Suggested change

sqlAppender.appendSql( "jsonb_strip_nulls(jsonb_build_array" );

}

else {

sqlAppender.appendSql( "jsonb_build_array" );

}

char separator = '(';

for ( int i = 0; i < argumentsCount; i++ ) {

sqlAppender.appendSql( separator );

sqlAstArguments.get( i ).accept( walker );

separator = ',';

}

sqlAppender.appendSql( ')' );

if ( nullBehavior == JsonNullBehavior.ABSENT ) {

sqlAppender.appendSql( ')' );

sqlAppender.appendSql( "jsonb_path_query_array(jsonb_build_array" );

}

else {

sqlAppender.appendSql( "jsonb_build_array" );

}

char separator = '(';

for ( int i = 0; i < argumentsCount; i++ ) {

sqlAppender.appendSql( separator );

sqlAstArguments.get( i ).accept( walker );

separator = ',';

}

sqlAppender.appendSql( ')' );

if ( nullBehavior == JsonNullBehavior.ABSENT ) {

sqlAppender.appendSql( ",'$[*] ? (@ != null)')" );

Unfortunately, Spanner doesn't support jsonb_path_query_array.

beikov · 2026-03-18T16:08:50Z

hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonArrayTest.java

 	}

 	@Test
+	@SkipForDialect(dialectClass = org.hibernate.community.dialect.SpannerPostgreSQLDialect.class, reason = "Spanner PG does not support values in from clause")


After the fix I proposed to SpannerPostgreSQLJsonArrayFunction, you should be able to revert the changes to this file.

beikov requested changes Mar 18, 2026

View reviewed changes

HHH-20262: Spanner PG: Fix Tests Phase 3

4c77282

sakthivelmanii force-pushed the fix_spanner_pg_tests_part3 branch from 0d5c0a4 to 4c77282 Compare March 18, 2026 17:46

	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner PG doesn't support LATERAL JOIN")
	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonTable.class)

	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayPosition.class)
	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayContainsNullable.class)

-		functionFactory.arrayContains_postgresql();
+		functionRegistry.register( "array_contains", new ArrayContainsOperatorFunction( false, typeConfiguration ) );
+		functionRegistry.register( "array_includes", new ArrayIncludesOperatorFunction( false, typeConfiguration ) );
+		functionRegistry.register( "array_includes_nullable", new ArrayIncludesOperatorFunction( true, typeConfiguration ) );

		.filter( collection -> Objects.nonNull( collection.getCollectionTable() ) )
		.filter( collection -> collection.getCollectionTable().equals( targetTable ) )

	.anyMatch( collection -> collection.getElement() instanceof SimpleValue );
	.anyMatch( collection -> collection.getElement() instanceof SimpleValue && !( collection.getElement() instanceof ToOne ));

-		return table.getName().endsWith( "_history" ) || table.getName().endsWith( "_aud" );
+		return metadata.getCollectionBindings().stream()
+				.anyMatch( collection -> collection.getAuxiliaryTable() == targetTable )
+				|| metadata.getEntityBindings().stream()
+				.filter( entity -> entity instanceof RootClass )
+				.anyMatch( entity -> ((RootClass) entity).getAuxiliaryTable() == targetTable );

Uh oh!

Conversation

sakthivelmanii commented Mar 18, 2026 • edited by hibernate-github-bot bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sakthivelmanii commented Mar 18, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sakthivelmanii commented Mar 18, 2026 •

edited by hibernate-github-bot bot

Loading