tests for @DialectOverride.Xxxx

Author: gavinking

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java

@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -73,7 +72,8 @@ void testCriteria(SessionFactoryScope scope) {
 			criteria.select( root );
 			criteria.where( criteriaBuilder.equal( root.get( "id" ), criteriaBuilder.literal( 1L ) ) );
 			Account account = session.createQuery( criteria ).uniqueResult();
-			assertThat( account.getInterest(), is( 62.5d ));
+			assertThat( account.getInterest(), is( 62.5d ) );
+			assertThat( account.getRatePercent(), is("1.25%") );
 		} );
 	}
 
@@ -97,6 +97,9 @@ public static class Account {
 		@Formula(value = "credit * rate")
 		private Double interest;
 
+		@Formula(value = "rate * 100 || '%'")
+		private String ratePercent;
+
 		public Long getId() {
 			return id;
 		}
@@ -129,5 +132,12 @@ public void setInterest(Double interest) {
 			this.interest = interest;
 		}
 
+		public String getRatePercent() {
+			return ratePercent;
+		}
+
+		public void setRatePercent(String ratePercent) {
+			this.ratePercent = ratePercent;
+		}
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java

@@ -0,0 +1,81 @@
+package org.hibernate.orm.test.mapping.generated.sqldefault;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DialectOverride;
+import org.hibernate.annotations.Generated;
+import org.hibernate.annotations.GenerationTime;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Gavin King
+ */
+@DomainModel(annotatedClasses = OverriddenDefaultTest.OrderLine.class)
+@SessionFactory
+public class OverriddenDefaultTest {
+
+    @Test
+    public void test(SessionFactoryScope scope) {
+        BigDecimal unitPrice = new BigDecimal("12.99");
+        scope.inTransaction( session -> {
+            OrderLine entity = new OrderLine( unitPrice, 5 );
+            session.persist(entity);
+            session.flush();
+            assertEquals( getDefault(scope), entity.status );
+            assertEquals( unitPrice, entity.unitPrice );
+            assertEquals( 5, entity.quantity );
+        } );
+        scope.inTransaction( session -> {
+            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+            assertEquals( unitPrice, entity.unitPrice );
+            assertEquals( 5, entity.quantity );
+            assertEquals( getDefault(scope), entity.status );
+            entity.status = "old"; //should be ignored when fetch=true
+        } );
+        scope.inTransaction( session -> {
+            OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+            assertEquals( unitPrice, entity.unitPrice );
+            assertEquals( 5, entity.quantity );
+            assertEquals( getDefault(scope), entity.status );
+        } );
+    }
+
+    String getDefault(SessionFactoryScope scope) {
+        return scope.getMetadataImplementor().getDatabase().getDialect() instanceof H2Dialect ? "NEW" : "new";
+    }
+
+    @AfterEach
+    public void dropTestData(SessionFactoryScope scope) {
+        scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() );
+    }
+
+    @Entity(name="WithDefault")
+    public static class OrderLine {
+        @Id
+        private BigDecimal unitPrice;
+        @Id @ColumnDefault("1")
+        private int quantity;
+        @Generated(GenerationTime.INSERT)
+        @ColumnDefault("'new'")
+        @DialectOverride.ColumnDefault(dialect = H2Dialect.class,
+                sameOrAfter = @DialectOverride.Version(major=1, minor=4),
+                override = @ColumnDefault("'NEW'"))
+        private String status;
+
+        public OrderLine() {}
+        public OrderLine(BigDecimal unitPrice, int quantity) {
+            this.unitPrice = unitPrice;
+            this.quantity = quantity;
+        }
+    }
+}