[6.2] Various backports #11179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Open

beikov wants to merge 11 commits into hibernate:6.2 from beikov:HHH-19883-6.2

+4,036 −487

Member

beikov commented Oct 31, 2025

DON'T MERGE YET.

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.

beikov and others added 10 commits

October 31, 2025 15:48


          HHH-19883 Respect predicates defined on treated join nodes

f8adac6


          HHH-17777 Add test for issue

a61714a

(cherry picked from commit b3955d7)


          HHH-17777 Reuse existing fetch-joins if requesting the same join type

f54b915

(cherry picked from commit 3ce10df)


          HHH-16494 Add test for issue

(cherry picked from commit 3e3fd6f)


          HHH-16494 Treat entity and attribute joins for inheritance subtypes

09c16de

(cherry picked from commit fed020e)


          HHH-16494 Reworked pruning for joined inheritance persister

ec7ee3e

Added handling of subclasses with the same table name and discriminator condition.
Also avoid useless left-joins when not finding table references instead of throwing an exception.

(cherry picked from commit 22091b2)


          HHH-17096 Always initialize table group for subtype treated joins

9688d66

(cherry picked from commit eb11676)


          HHH-16798 Add test for issue

(cherry picked from commit dbaf309)


          HHH-16798 Fix check for supertype-treats in single table inheritance

Also, fix a small bug in special not-null discriminator predicate rendering

(cherry picked from commit 317334f)


          Backport some fixes that were part of HHH-17818, that are needed to m…

287be61

…ake other backports work

hibernate-github-bot bot commented Oct 31, 2025 •

edited

Loading

Thanks for your pull request!

This pull request does not follow the contribution rules. Could you have a look?

❌ All commit messages should start with a JIRA issue key matching pattern HHH-\d+
↳ Offending commits: [287be61]
❌ The PR title or body should list the keys of all JIRA issues mentioned in the commits
↳ Issue keys mentioned in commits but missing from the PR title or body: [HHH-19883, HHH-17777, HHH-16494, HHH-17096, HHH-16798]

› This message was automatically generated.

hibernate-github-bot bot added the 6.2 label

github-advanced-security bot found potential problems

View reviewed changes

hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java

    
              			return baseRestriction;

              		}

              		final SqmJunctionPredicate combinedPredicate;

Check notice

Code scanning / CodeQL

Confusing overloading of methods Note

Method SqmCreationHelper.combinePredicates(..) could be confused with overloaded method

combinePredicates

, since dispatch depends on static types.

...rg/hibernate/orm/test/inheritance/join/AttributeJoinWithRestrictedJoinedInheritanceTest.java

    
              	public void cleanup(SessionFactoryScope scope) {

              		scope.inTransaction( s -> {

              			s.createNativeQuery( "delete from root_one" ).executeUpdate();

              			s.createNativeQuery( "delete from SubChildEntityA1" ).executeUpdate();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createNativeQuery

should be avoided because it has been deprecated.

...rg/hibernate/orm/test/inheritance/join/AttributeJoinWithRestrictedJoinedInheritanceTest.java

    
              		scope.inTransaction( s -> {

              			s.createNativeQuery( "delete from root_one" ).executeUpdate();

              			s.createNativeQuery( "delete from SubChildEntityA1" ).executeUpdate();

              			s.createNativeQuery( "delete from SubChildEntityA2" ).executeUpdate();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createNativeQuery

should be avoided because it has been deprecated.

...rg/hibernate/orm/test/inheritance/join/AttributeJoinWithRestrictedJoinedInheritanceTest.java

    
              			s.createNativeQuery( "delete from root_one" ).executeUpdate();

              			s.createNativeQuery( "delete from SubChildEntityA1" ).executeUpdate();

              			s.createNativeQuery( "delete from SubChildEntityA2" ).executeUpdate();

              			s.createNativeQuery( "delete from child_entity" ).executeUpdate();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createNativeQuery

should be avoided because it has been deprecated.

...rg/hibernate/orm/test/inheritance/join/AttributeJoinWithRestrictedJoinedInheritanceTest.java

    
              			s.createNativeQuery( "delete from SubChildEntityA1" ).executeUpdate();

              			s.createNativeQuery( "delete from SubChildEntityA2" ).executeUpdate();

              			s.createNativeQuery( "delete from child_entity" ).executeUpdate();

              			s.createNativeQuery( "delete from BaseClass" ).executeUpdate();

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createNativeQuery

should be avoided because it has been deprecated.

...rg/hibernate/orm/test/inheritance/join/AttributeJoinWithRestrictedJoinedInheritanceTest.java

    
              			s.createNativeQuery( "delete from SubChildEntityA2" ).executeUpdate();

              			s.createNativeQuery( "delete from child_entity" ).executeUpdate();

              			s.createNativeQuery( "delete from BaseClass" ).executeUpdate();

              		} );

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking

QueryProducerImplementor.createNativeQuery

should be avoided because it has been deprecated.


          Switch to TCK version 3.1.6

df7b149

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.2