From b960913cb5d85a8c7ac4ee2a1a58766c6589256f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 10:42:00 +0000 Subject: [PATCH 1/2] Bump the database-containers group Bumps the database-containers group in /build/container/database with 2 updates: cockroachdb/cockroach and mysql. Updates `cockroachdb/cockroach` from v24.3.2 to v24.3.4 Updates `mysql` from 9.1.0 to 9.2.0 --- updated-dependencies: - dependency-name: cockroachdb/cockroach dependency-type: direct:production dependency-group: database-containers - dependency-name: mysql dependency-type: direct:production update-type: version-update:semver-minor dependency-group: database-containers ... Signed-off-by: dependabot[bot] --- build/container/database/cockroachdb.Dockerfile | 2 +- build/container/database/mysql.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/container/database/cockroachdb.Dockerfile b/build/container/database/cockroachdb.Dockerfile index a193c524800..0350984ca88 100644 --- a/build/container/database/cockroachdb.Dockerfile +++ b/build/container/database/cockroachdb.Dockerfile @@ -1,3 +1,3 @@ # CockroachDB # See https://hub.docker.com/r/cockroachdb/cockroach/tags -FROM docker.io/cockroachdb/cockroach:v24.3.2 \ No newline at end of file +FROM docker.io/cockroachdb/cockroach:v24.3.4 \ No newline at end of file diff --git a/build/container/database/mysql.Dockerfile b/build/container/database/mysql.Dockerfile index 38a556c8527..4f27185ed42 100644 --- a/build/container/database/mysql.Dockerfile +++ b/build/container/database/mysql.Dockerfile @@ -1,3 +1,3 @@ # MySQL # See https://hub.docker.com/_/mysql/tags -FROM docker.io/mysql:9.1.0 \ No newline at end of file +FROM docker.io/mysql:9.2.0 \ No newline at end of file From 482c2f746b38c2543ee8a5ba4680bf24f9214c60 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Mon, 3 Feb 2025 17:17:44 +0100 Subject: [PATCH 2/2] Adjust table names to address new database-level keywords --- .../integrationtest/showcase/library/model/Library.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Library.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Library.java index 5799da14966..0023c5d5480 100644 --- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Library.java +++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/model/Library.java @@ -14,6 +14,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.search.engine.backend.types.Aggregable; import org.hibernate.search.engine.backend.types.Projectable; @@ -31,6 +32,9 @@ * A place where documents are available. */ @Entity +// MySQL 9.2 defines `library` as a reserved keyword: +// https://dev.mysql.com/doc/refman/9.2/en/keywords.html#keywords-new-in-current-series +@Table(name = "library_table") @Indexed @GeoPointBinding(fieldName = "location", sortable = Sortable.YES) public class Library extends AbstractEntity {