HHH-4769 In HQL, function ROUND always returns an Integer, it truncate the decimal part of Double number.

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18457 1b8cb986-b30d-0410-93ca-fae66ebed9b2

core/src/main/java/org/hibernate/dialect/MySQLDialect.java

@@ -113,7 +113,7 @@ public class MySQLDialect extends Dialect {
 		registerFunction("ceiling", new StandardSQLFunction("ceiling", Hibernate.INTEGER) );
 		registerFunction("ceil", new StandardSQLFunction("ceil", Hibernate.INTEGER) );
 		registerFunction("floor", new StandardSQLFunction("floor", Hibernate.INTEGER) );
-		registerFunction("round", new StandardSQLFunction("round", Hibernate.INTEGER) );
+		registerFunction("round", new StandardSQLFunction("round") );
 
 		registerFunction("datediff", new StandardSQLFunction("datediff", Hibernate.INTEGER) );
 		registerFunction("timediff", new StandardSQLFunction("timediff", Hibernate.TIME) );

testsuite/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java

@@ -0,0 +1,75 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.test.dialect.function;
+
+import java.math.BigDecimal;
+
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.junit.functional.FunctionalTestCase;
+
+/**
+ * 
+ * @author Strong Liu <stliu@redhat.com>
+ *
+ */
+public class MySQLRoundFunctionTest extends FunctionalTestCase {
+
+	public MySQLRoundFunctionTest( String string ) {
+		super( string );
+	}
+
+	public String[] getMappings() {
+		return new String[]{"dialect/function/Product.hbm.xml"};
+	}
+	
+	public void testRoundFuntion(){
+		Product product = new Product();
+		product.setLength( 100 );
+		product.setPrice( new BigDecimal( 1.298 ) );
+		Session s=openSession();
+		Transaction tx=s.beginTransaction();
+		s.save( product );
+		tx.commit();
+		s.close();
+		s=openSession();
+		tx=s.beginTransaction();
+		Query q=s.createQuery( "select round(p.price,1) from Product p" );
+		Object o=q.uniqueResult();
+		assertEquals( BigDecimal.class , o.getClass() );
+		assertEquals( BigDecimal.valueOf( 1.3 ) , o );
+		tx.commit();
+		s.close();
+		
+	}
+
+	@Override
+	public boolean appliesTo( Dialect dialect ) {
+		return dialect instanceof MySQLDialect;
+	}
+
+}

testsuite/src/test/java/org/hibernate/test/dialect/function/Product.hbm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.test.dialect.function">
+
+	<class name="Product" table="t_product">
+		<id name="id">
+            <generator class="native"/>
+        </id>
+        <property name="length" />
+        <property name="weight" />
+        <property name="price" />
+	</class>
+
+</hibernate-mapping>

testsuite/src/test/java/org/hibernate/test/dialect/function/Product.java

@@ -0,0 +1,71 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.test.dialect.function;
+
+import java.math.BigDecimal;
+
+/**
+ * 
+ * @author Strong Liu <stliu@redhat.com>
+ *
+ */
+public class Product {
+	private Long id;
+	private int length;
+	private long weight;
+	private BigDecimal price;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId( Long id ) {
+		this.id = id;
+	}
+
+	public int getLength() {
+		return length;
+	}
+
+	public void setLength( int length ) {
+		this.length = length;
+	}
+
+	public long getWeight() {
+		return weight;
+	}
+
+	public void setWeight( long weight ) {
+		this.weight = weight;
+	}
+
+	public BigDecimal getPrice() {
+		return price;
+	}
+
+	public void setPrice( BigDecimal price ) {
+		this.price = price;
+	}
+
+}