HHH-11198 - Add Geometry cast to Postgis st_extent() function

hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java

@@ -159,9 +159,19 @@ public enum SpatialFunction {
 	 * <p>The semantics are those of the Postgis function ST_Transform(geometry, srid) : geometry. It returns new geometry
 	 * with its coordinates transformed to the spatial reference system referenced by the srid parameter.
 	 */
-	transform( "common" );
+	transform( "common" ),
+
+	/**
+	 * the extents function
+	 */
+	extent( "common" );
+
+
 	private final String description;
 
+
+
+
 	SpatialFunction(String specification) {
 		this.description = specification;
 	}

hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/mysql/MySQLSpatialDialect.java

@@ -122,6 +122,7 @@ public class MySQLSpatialDialect extends MySQLDialect implements SpatialDialect
 			case geomunion:
 			case dwithin:
 			case transform:
+			case extent:
 				return false;
 			default:
 				return true;

hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisDialect.java

@@ -7,10 +7,12 @@
 package org.hibernate.spatial.dialect.postgis;
 
 
+import java.util.List;
+
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.dialect.PostgreSQL82Dialect;
 import org.hibernate.dialect.function.StandardSQLFunction;
-
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.spatial.GeolatteGeometryType;
 import org.hibernate.spatial.JTSGeometryType;
@@ -19,6 +21,7 @@ import org.hibernate.spatial.SpatialDialect;
 import org.hibernate.spatial.SpatialFunction;
 import org.hibernate.spatial.SpatialRelation;
 import org.hibernate.type.StandardBasicTypes;
+import org.hibernate.type.Type;
 
 /**
  * A Dialect for Postgresql with support for the Postgis spatial types, functions and operators (release 1.3 or higher)
@@ -63,138 +66,138 @@ public class PostgisDialect extends PostgreSQL82Dialect implements SpatialDialec
 		// it occurs in the spatial dialect
 		registerFunction(
 				"dimension", new StandardSQLFunction(
-				"st_dimension",
+						"st_dimension",
-				StandardBasicTypes.INTEGER
+						StandardBasicTypes.INTEGER
-		)
+				)
 		);
 		registerFunction(
 				"geometrytype", new StandardSQLFunction(
-				"st_geometrytype", StandardBasicTypes.STRING
+						"st_geometrytype", StandardBasicTypes.STRING
-		)
+				)
 		);
 		registerFunction(
 				"srid", new StandardSQLFunction(
-				"st_srid",
+						"st_srid",
-				StandardBasicTypes.INTEGER
+						StandardBasicTypes.INTEGER
-		)
+				)
 		);
 		registerFunction(
 				"envelope", new StandardSQLFunction(
-				"st_envelope"
+						"st_envelope"
-		)
+				)
 		);
 		registerFunction(
 				"astext", new StandardSQLFunction(
-				"st_astext",
+						"st_astext",
-				StandardBasicTypes.STRING
+						StandardBasicTypes.STRING
-		)
+				)
 		);
 		registerFunction(
 				"asbinary", new StandardSQLFunction(
-				"st_asbinary",
+						"st_asbinary",
-				StandardBasicTypes.BINARY
+						StandardBasicTypes.BINARY
-		)
+				)
 		);
 		registerFunction(
 				"isempty", new StandardSQLFunction(
-				"st_isempty",
+						"st_isempty",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"issimple", new StandardSQLFunction(
-				"st_issimple",
+						"st_issimple",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"boundary", new StandardSQLFunction(
-				"st_boundary"
+						"st_boundary"
-		)
+				)
 		);
 
 		// Register functions for spatial relation constructs
 		registerFunction(
 				"overlaps", new StandardSQLFunction(
-				"st_overlaps",
+						"st_overlaps",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"intersects", new StandardSQLFunction(
-				"st_intersects",
+						"st_intersects",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"equals", new StandardSQLFunction(
-				"st_equals",
+						"st_equals",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"contains", new StandardSQLFunction(
-				"st_contains",
+						"st_contains",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"crosses", new StandardSQLFunction(
-				"st_crosses",
+						"st_crosses",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"disjoint", new StandardSQLFunction(
-				"st_disjoint",
+						"st_disjoint",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"touches", new StandardSQLFunction(
-				"st_touches",
+						"st_touches",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"within", new StandardSQLFunction(
-				"st_within",
+						"st_within",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"relate", new StandardSQLFunction(
-				"st_relate",
+						"st_relate",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 
 		// register the spatial analysis functions
 		registerFunction(
 				"distance", new StandardSQLFunction(
-				"st_distance",
+						"st_distance",
-				StandardBasicTypes.DOUBLE
+						StandardBasicTypes.DOUBLE
-		)
+				)
 		);
 		registerFunction(
 				"buffer", new StandardSQLFunction(
-				"st_buffer"
+						"st_buffer"
-		)
+				)
 		);
 		registerFunction(
 				"convexhull", new StandardSQLFunction(
-				"st_convexhull"
+						"st_convexhull"
-		)
+				)
 		);
 		registerFunction(
 				"difference", new StandardSQLFunction(
-				"st_difference"
+						"st_difference"
-		)
+				)
 		);
 		registerFunction(
 				"intersection", new StandardSQLFunction(
-				"st_intersection"
+						"st_intersection"
-		)
+				)
 		);
 		registerFunction(
 				"symdifference",
@@ -202,28 +205,26 @@ public class PostgisDialect extends PostgreSQL82Dialect implements SpatialDialec
 		);
 		registerFunction(
 				"geomunion", new StandardSQLFunction(
-				"st_union"
+						"st_union"
-		)
+				)
 		);
 
 		//register Spatial Aggregate function
 		registerFunction(
-				"extent", new StandardSQLFunction(
+				"extent", new ExtentFunction()
-				"extent"
-		)
 		);
 
 		//other common functions
 		registerFunction(
 				"dwithin", new StandardSQLFunction(
-				"st_dwithin",
+						"st_dwithin",
-				StandardBasicTypes.BOOLEAN
+						StandardBasicTypes.BOOLEAN
-		)
+				)
 		);
 		registerFunction(
 				"transform", new StandardSQLFunction(
-				"st_transform"
+						"st_transform"
-		)
+				)
 		);
 	}
 
@@ -281,7 +282,7 @@ public class PostgisDialect extends PostgreSQL82Dialect implements SpatialDialec
 		switch ( aggregation ) {
 			case SpatialAggregate.EXTENT:
 				final StringBuilder stbuf = new StringBuilder();
-				stbuf.append( "extent(" ).append( columnName ).append( ")" );
+				stbuf.append( "st_extent(" ).append( columnName ).append( ")::geometry" );
 				return stbuf.toString();
 			default:
 				throw new IllegalArgumentException(
@@ -298,6 +299,22 @@ public class PostgisDialect extends PostgreSQL82Dialect implements SpatialDialec
 
 	@Override
 	public boolean supports(SpatialFunction function) {
-		return ( getFunctions().get( function.toString() ) != null );
+		return (getFunctions().get( function.toString() ) != null);
+	}
+
+	private static class ExtentFunction extends StandardSQLFunction {
+
+		public ExtentFunction() {
+			super( "st_extent" );
+		}
+
+		@Override
+		public String render(
+				Type firstArgumentType, List arguments, SessionFactoryImplementor sessionFactory) {
+			String rendered = super.render( firstArgumentType, arguments, sessionFactory );
+			//add cast
+			return rendered + "::geometry";
+		}
 	}
 }
+

hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/postgis/PostgisUnmarshalTest.java

@@ -60,7 +60,6 @@ public class PostgisUnmarshalTest {
 
 	public void testCase(String pgValue, Geometry<?> expected) throws SQLException {
 		PGobject pgo = new PGobject();
-		System.out.println( "pgValue  " + pgValue );
 		pgo.setValue( pgValue );
 		Geometry<?> received = PGGeometryTypeDescriptor.toGeometry( pgo );
 		assertEquals( String.format( "Failure on %s", pgValue ), expected, received );

hibernate-spatial/src/test/java/org/hibernate/spatial/integration/TestSpatialFunctions.java

@@ -676,6 +676,28 @@ public class TestSpatialFunctions extends SpatialFunctionalTestCase {
 
 	}
 
+	@Test
+	public void test_extent_on_jts() throws SQLException {
+		extent( JTS );
+	}
+
+	@Test
+	public void test_extent_on_geolatte() throws SQLException {
+		extent( GEOLATTE );
+	}
+
+	public void extent(String pckg) throws SQLException {
+		if ( !isSupportedByDialect( SpatialFunction.extent ) ) {
+			return;
+		}
+		// here we just check if we get a result, and can read it
+		String hql = format(
+				"SELECT id, extent(geom) from org.hibernate.spatial.integration.%s.GeomEntity group by id", pckg
+		);
+		Map<Integer, Object> hsreceived = new HashMap<Integer, Object>();
+		doInSession( hql, hsreceived, new HashMap<String, Object>() );
+	}
+
 	public <T> void retrieveHQLResultsAndCompare(Map<Integer, T> dbexpected, String hql, String geometryType) {
 		retrieveHQLResultsAndCompare( dbexpected, hql, null, geometryType );
 	}