HHH-15518 bless degrees() and radians() as standard

- add a test - emulate them on HANA and Oracle
hibernate · Oct 6, 2022 · 4451611 · 4451611
1 parent 1c3819a
commit 4451611
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 9 deletions.
diff --git a/documentation/src/main/asciidoc/userguide/chapters/query/hql/QueryLanguage.adoc b/documentation/src/main/asciidoc/userguide/chapters/query/hql/QueryLanguage.adoc
@@ -1002,6 +1002,8 @@ Of course, we also have a number of functions for working with numeric values.
 | `pi` | &#960; | `pi` | &cross;
 | `sin()`, `cos()`, `tan()`, `asin()`, `acos()`, `atan()`, `atan2()`
 | Basic trigonometric functions | `sin(theta)`, `cos(theta)`, `atan2(opposite, adjacent)` | &cross;
+| `degrees()` | Convert radians to degrees | `degrees(x)` | &cross;
+| `radians()` | Convert degrees to radians | `radians(x)` | &cross;
 | `least()` | Return the smallest of the given arguments | `least(x, y, z)` |&cross;
 | `greatest()` | Return the largest of the given arguments | `greatest(x, y, z)` | &cross;
 |===

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java
@@ -377,6 +377,9 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		functionFactory.inverseDistributionOrderedSetAggregates();
 		functionFactory.hypotheticalOrderedSetAggregates_windowEmulation();
 
+		functionFactory.radians_acos();
+		functionFactory.degrees_acos();
+
 		queryEngine.getSqmFunctionRegistry().register( "timestampadd",
 				new IntegralTimestampaddFunction( this, typeConfiguration ) );
 	}

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -787,6 +787,8 @@ else if ( isNumericType(sqlType) ) {
 	 * <li> <code>round(arg0, arg1)</code>
 	 * <li> <code>least(arg0, arg1, ...)</code>
 	 * <li> <code>greatest(arg0, arg1, ...)</code>
+	 * <li> <code>degrees(arg)</code>
+	 * <li> <code>radians(arg)</code>
 	 * </ul>
 	 *
 	 * <ul>

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
@@ -174,6 +174,9 @@ public void initializeFunctionRegistry(QueryEngine queryEngine) {
 		functionFactory.monthsBetween();
 		functionFactory.everyAny_minMaxCase();
 
+		functionFactory.radians_acos();
+		functionFactory.degrees_acos();
+
 		functionFactory.median();
 		functionFactory.stddev();
 		functionFactory.stddevPopSamp();

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java
@@ -80,14 +80,6 @@ public void cot() {
 				.register();
 	}
 
-	public void degrees() {
-		functionRegistry.namedDescriptorBuilder( "degrees" )
-				.setExactArgumentCount( 1 )
-				.setParameterTypes(NUMERIC)
-				.setInvariantType(doubleType)
-				.register();
-	}
-
 	/**
 	 * For databases where the first parameter is the base
 	 */
@@ -178,6 +170,36 @@ public void radians() {
 				.register();
 	}
 
+	/**
+	 * For Oracle, HANA
+	 */
+	public void radians_acos() {
+		functionRegistry.patternDescriptorBuilder( "radians", "(?1*acos(-1)/180)" )
+				.setInvariantType(doubleType)
+				.setExactArgumentCount(1)
+				.setParameterTypes(NUMERIC)
+				.register();
+	}
+
+	public void degrees() {
+		functionRegistry.namedDescriptorBuilder( "degrees" )
+				.setExactArgumentCount( 1 )
+				.setParameterTypes(NUMERIC)
+				.setInvariantType(doubleType)
+				.register();
+	}
+
+	/**
+	 * For Oracle, HANA
+	 */
+	public void degrees_acos() {
+		functionRegistry.patternDescriptorBuilder( "degrees", "(?1/acos(-1)*180)" )
+				.setInvariantType(doubleType)
+				.setExactArgumentCount(1)
+				.setParameterTypes(NUMERIC)
+				.register();
+	}
+
 	public void sinh() {
 		functionRegistry.namedDescriptorBuilder( "sinh" )
 				.setExactArgumentCount( 1 )

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java
@@ -27,7 +27,6 @@
 import org.hibernate.sql.ast.tree.SqlAstNode;
 import org.hibernate.sql.ast.tree.expression.Distinct;
 import org.hibernate.sql.ast.tree.expression.Expression;
-import org.hibernate.sql.ast.tree.expression.FunctionExpression;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
 import org.hibernate.sql.ast.tree.expression.SqlTupleContainer;
 import org.hibernate.sql.ast.tree.expression.Star;

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java
@@ -921,6 +921,22 @@ public void testPi(SessionFactoryScope scope) {
 		);
 	}
 
+	@Test
+	public void testDegreesRadians(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					assertThat(
+							session.createQuery("select degrees(pi)", Double.class).getSingleResult(),
+							IsCloseTo.closeTo( 180.0, 1e-9 )
+					);
+					assertThat(
+							session.createQuery("select radians(180.0)", Double.class).getSingleResult(),
+							IsCloseTo.closeTo( Math.PI, 1e-9 )
+					);
+				}
+		);
+	}
+
 	@Test
 	public void testLog(SessionFactoryScope scope) {
 		scope.inTransaction(