Branch: refs/heads/main Home: https://github.com/hibernate/hibernate-orm Commit: e02317f3d6471e1d7f1dcc5f37b45fb7a0d72490 https://github.com/hibernate/hibernate-orm/commit/e02317f3d6471e1d7f1dcc5... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2024-03-02 (Sat, 02 Mar 2024) Changed paths: M hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4 M hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java M hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictClause.java A hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictOnConstraintTest.java Log Message: ----------- HHH-17795 fix an NPE and add a test for 'on conflict on constraint' Commit: 0d7a7087ff7f5a5163fe3da2caba9a84a844c338 https://github.com/hibernate/hibernate-orm/commit/0d7a7087ff7f5a5163fe3da... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2024-03-02 (Sat, 02 Mar 2024) Changed paths: M documentation/src/main/asciidoc/querylanguage/Concepts.adoc A documentation/src/main/asciidoc/querylanguage/extras/on_conflict_bnf.txt M documentation/src/main/asciidoc/querylanguage/extras/statement_insert_bnf.txt Log Message: ----------- document 'on conflict' in query language guide Compare: https://github.com/hibernate/hibernate-orm/compare/9b4e61c9849d...0d7a708... To unsubscribe from these emails, change your notification settings at https://github.com/hibernate/hibernate-orm/settings/notifications