Merge branch 'main' into build/jpa-snapshots

Author: gavinking

README.adoc

@@ -18,7 +18,7 @@ See link:MAINTAINERS.md#ci[MAINTAINERS.md] for information about CI.
 
 == Building from sources
 
-The build requires at least JDK 21, and produces Java 17 bytecode.
+The build requires at least JDK 25, and produces Java 17 bytecode.
 
 Hibernate uses https://gradle.org[Gradle] as its build tool. See the _Gradle Primer_ section below if you are new to
 Gradle.

docker_db.sh

@@ -1370,6 +1370,38 @@ informix_12_10() {
     fi
 }
 
+spanner() {
+  spanner_emulator
+}
+
+spanner_emulator() {
+
+  $CONTAINER_CLI rm -f spanner || true
+  # Run emulator (gRPC on 9010, REST on 9020)
+  $CONTAINER_CLI run --name spanner -d \
+    -p 9010:9010 \
+    -p 9020:9020 \
+    ${SPANNER_EMULATOR:-gcr.io/cloud-spanner-emulator/emulator:1.5.45}
+
+  # Wait for emulator to be ready (check logs for known messages)
+  n=0
+  until [ "$n" -ge 20 ]; do
+    OUTPUT="$($CONTAINER_CLI logs spanner 2>&1 || true)"
+    if [[ "$OUTPUT" == *"gRPC server listening"* ]] || [[ "$OUTPUT" == *"Cloud Spanner emulator running"* ]]; then
+      echo "Cloud Spanner emulator started."
+      break
+    fi
+    echo "Waiting for Cloud Spanner emulator to start..."
+    n=$((n+1))
+    sleep 3
+  done
+
+  if [ "$n" -ge 20 ]; then
+    echo "Cloud Spanner emulator failed to start after 1 minute"
+    exit 1
+  fi
+}
+
 if [ -z ${1} ]; then
     echo "No db name provided"
     echo "Provide one of:"
@@ -1417,6 +1449,8 @@ if [ -z ${1} ]; then
     echo -e "\informix"
     echo -e "\informix_14_10"
     echo -e "\informix_12_10"
+    echo -e "\tspanner"
+    echo -e "\tspanner_emulator"
 else
     ${1}
 fi

documentation/src/main/asciidoc/introduction/Configuration.adoc

@@ -116,8 +116,8 @@ and `org.ehcache:ehcache`
 and `com.github.ben-manes.caffeine:jcache`
 | Distributed second-level cache support via {infinispan}[Infinispan] | `org.infinispan:infinispan-hibernate-cache-v60`
 // | SCRAM authentication support for PostgreSQL | `com.ongres.scram:client:2.1`
-| A JSON serialization library for working with JSON datatypes, for example, {jackson}[Jackson] or {yasson}[Yasson] |
-`com.fasterxml.jackson.core:jackson-databind` +
+| A JSON serialization library for working with JSON datatypes, for example, {jackson}[Jackson 2], {jackson3}[Jackson 3] or {yasson}[Yasson] |
+`com.fasterxml.jackson.core:jackson-databind`, `tools.jackson.core:jackson-databind` +
 or `org.eclipse:yasson`
 | <<spatial,Hibernate Spatial>> | `org.hibernate.orm:hibernate-spatial`
 | <<envers,Envers>>, for auditing historical data | `org.hibernate.orm:hibernate-envers`

documentation/src/main/asciidoc/introduction/Mapping.adoc

@@ -809,13 +809,20 @@ class Person {
 ----
 
 We also need to add Jackson or an implementation of JSONB—for example, Yasson—to our runtime classpath.
-To use Jackson we could add this line to our Gradle build:
+To use Jackson 2 we could add this line to our Gradle build:
 
 [source,groovy]
 ----
 runtimeOnly 'com.fasterxml.jackson.core:jackson-databind:{jacksonVersion}'
 ----
 
+To use Jackson 3 we could add this line to our Gradle build:
+
+[source,groovy]
+----
+runtimeOnly 'tools.jackson.core:jackson-databind:{jackson3Version}'
+----
+
 Now the `name` column of the `Author` table will have the type `jsonb`, and Hibernate will automatically use Jackson to serialize a `Name` to and from JSON format.
 
 [[miscellaneous-mappings]]

documentation/src/main/asciidoc/userguide/chapters/query/hql/QueryLanguage.adoc

@@ -1220,6 +1220,8 @@ The following functions deal with SQL array types, which are not supported on ev
 | <<hql-array-slice-functions,`array_slice()`>> | Creates a sub-array of the based on lower and upper index
 | <<hql-array-replace-functions,`array_replace()`>> | Creates array copy replacing a given element with another
 | <<hql-array-trim-functions,`array_trim()`>> | Creates array copy trimming the last _N_ elements
+| <<hql-array-reverse-functions,`array_reverse()`>> | Returns a copy of the array with elements in reverse order
+| <<hql-array-sort-functions,`array_sort()`>> | Returns a sorted copy of the array
 | <<hql-array-fill-functions,`array_fill()`>> | Creates array filled with the same element _N_ times
 | <<hql-array-fill-functions,`array_fill_list()`>> | Like `array_fill`, but returns the result as `List<?>`
 | <<hql-array-to-string-functions,`array_to_string()`>> | String representation of array
@@ -1596,6 +1598,46 @@ include::{array-example-dir-hql}/ArrayTrimTest.java[tags=hql-array-trim-example]
 ----
 ====
 
+[[hql-array-reverse-functions]]
+===== `array_reverse()`
+
+Returns a copy of the array with elements in reverse order. Returns `null` if the argument is `null`.
+
+[[hql-array-reverse-example]]
+====
+[source, java, indent=0]
+----
+include::{array-example-dir-hql}/ArrayReverseTest.java[tags=hql-array-reverse-example]
+----
+====
+
+[[hql-array-sort-functions]]
+===== `array_sort()`
+
+Returns a sorted copy of the array. When called with no optional arguments, elements are sorted in ascending order with `null` elements placed last.
+The optional second argument allows specifying descending order, and the optional third argument controls the position of `null` elements.
+Returns `null` if the first argument is `null`.
+
+[[hql-array-sort-example]]
+====
+[source, java, indent=0]
+----
+include::{array-example-dir-hql}/ArraySortTest.java[tags=hql-array-sort-example]
+----
+====
+
+The second argument controls sort direction: `false` for ascending (default), `true` for descending.
+The third argument controls `null` placement: `false` for nulls last, `true` for nulls first.
+When the third argument is omitted, it defaults to the value of the second argument.
+
+[[hql-array-sort-descending-nulls-last-example]]
+====
+[source, java, indent=0]
+----
+include::{array-example-dir-hql}/ArraySortTest.java[tags=hql-array-sort-descending-nulls-last-example]
+----
+====
+
 [[hql-array-fill-functions]]
 ===== `array_fill()` and `array_fill_list()`
 

gradle/version.properties

@@ -1 +1 @@
-hibernateVersion=7.2.0-SNAPSHOT
+hibernateVersion=7.3.0-SNAPSHOT

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

@@ -141,6 +141,7 @@
  * A {@linkplain Dialect SQL dialect} for CockroachDB.
  *
  * @author Gavin King
+ * @author Yoobin Yoon
  */
 public class CockroachLegacyDialect extends Dialect {
 
@@ -485,6 +486,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arraySlice_operator();
 		functionFactory.arrayReplace();
 		functionFactory.arrayTrim_unnest();
+		functionFactory.arrayReverse_unnest();
+		functionFactory.arraySort_unnest();
 		functionFactory.arrayFill_cockroachdb();
 		functionFactory.arrayToString_postgresql();
 

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

@@ -128,6 +128,7 @@
  *
  * @author Thomas Mueller
  * @author Jürgen Kreitler
+ * @author Yoobin Yoon
  */
 public class H2LegacyDialect extends Dialect {
 
@@ -409,6 +410,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 				functionFactory.arraySlice();
 				functionFactory.arrayReplace_h2( getMaximumArraySize() );
 				functionFactory.arrayTrim_trim_array();
+				functionFactory.arrayReverse_h2( getMaximumArraySize() );
+				functionFactory.arraySort_h2( getMaximumArraySize() );
 				functionFactory.arrayFill_h2();
 				functionFactory.arrayToString_h2( getMaximumArraySize() );
 

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

@@ -95,6 +95,7 @@
  * @author Christoph Sturm
  * @author Phillip Baird
  * @author Fred Toussi
+ * @author Yoobin Yoon
  */
 public class HSQLLegacyDialect extends Dialect {
 
@@ -269,6 +270,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arraySlice_unnest();
 		functionFactory.arrayReplace_unnest();
 		functionFactory.arrayTrim_trim_array();
+		functionFactory.arrayReverse_unnest();
+		functionFactory.arraySort_hsql();
 		functionFactory.arrayFill_hsql();
 		functionFactory.arrayToString_hsql();
 

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

@@ -170,6 +170,7 @@
  * @author Steve Ebersole
  * @author Gavin King
  * @author Loïc Lefèvre
+ * @author Yoobin Yoon
  */
 public class OracleLegacyDialect extends Dialect {
 
@@ -384,6 +385,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arraySlice_oracle();
 		functionFactory.arrayReplace_oracle();
 		functionFactory.arrayTrim_oracle();
+		functionFactory.arrayReverse_oracle();
+		functionFactory.arraySort_oracle();
 		functionFactory.arrayFill_oracle();
 		functionFactory.arrayToString_oracle();