From fd388087c8b645c588690660d6661a31efaee49d Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Mon, 3 Jun 2024 21:32:40 -0500
Subject: [PATCH] HHH-17979 - Add @PropertyRef HHH-18075 - Transform
 property-ref HHH-18060 - HbXmlTransformer work

---
 gradle/databases.gradle                                       | 2 +-
 .../hbm/propertyref/CompositeManyToOnePropertyRefTests.java   | 3 +++
 .../models/hbm/propertyref/composite-many-to-one.hbm.xml      | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gradle/databases.gradle b/gradle/databases.gradle
index d00a6fbf68..64d977955b 100644
--- a/gradle/databases.gradle
+++ b/gradle/databases.gradle
@@ -9,7 +9,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 // build a map of the database settings to use.
 ext {
-        db = project.hasProperty('db') ? project.getProperty('db') : 'h2'
+        db = project.hasProperty('db') ? project.getProperty('db') : 'derby'
         dbHost = System.getProperty( 'dbHost', 'localhost' )
         dbService = System.getProperty( 'dbService', '' )
         runID = System.getProperty( 'runID', '' )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/CompositeManyToOnePropertyRefTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/CompositeManyToOnePropertyRefTests.java
index c109a0f0fb..8827db4736 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/CompositeManyToOnePropertyRefTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/propertyref/CompositeManyToOnePropertyRefTests.java
@@ -23,6 +23,7 @@ import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -98,7 +99,9 @@ public class CompositeManyToOnePropertyRefTests {
 
 	@Embeddable
 	public static class Name {
+		@Column(name = "fname")
 		private String first;
+		@Column(name = "lname")
 		private String last;
 
 		public Name() {
diff --git a/hibernate-core/src/test/resources/mappings/models/hbm/propertyref/composite-many-to-one.hbm.xml b/hibernate-core/src/test/resources/mappings/models/hbm/propertyref/composite-many-to-one.hbm.xml
index 2de34b9a38..313f22f77f 100644
--- a/hibernate-core/src/test/resources/mappings/models/hbm/propertyref/composite-many-to-one.hbm.xml
+++ b/hibernate-core/src/test/resources/mappings/models/hbm/propertyref/composite-many-to-one.hbm.xml
@@ -16,8 +16,8 @@
     <class name="CompositeManyToOnePropertyRefTests$Person" table="persons">
         <id name="id"/>
         <component name="name" class="CompositeManyToOnePropertyRefTests$Name">
-            <property name="first"/>
-            <property name="last"/>
+            <property name="first" column="fname"/>
+            <property name="last" column="lname"/>
         </component>
     </class>