GEOMETRY.
+ *
+ * @param code The {@link java.sql.Types} typecode
+ * @param length The datatype length
+ * @param precision The datatype precision
+ * @param scale The datatype scale
+ * @return
+ * @throws org.hibernate.HibernateException
+ *
+ */
+ @Override
+ public String getTypeName(int code, long length, int precision, int scale) throws HibernateException {
+ if (code == 3000) return "GEOMETRY";
+ return super.getTypeName(code, length, precision, scale);
+ }
+
+ @Override
+ public SqlTypeDescriptor remapSqlTypeDescriptor(SqlTypeDescriptor sqlTypeDescriptor) {
+ if (sqlTypeDescriptor instanceof GeometrySqlTypeDescriptor) {
+ return GeoDBGeometryTypeDescriptor.INSTANCE;
+ }
+ return super.remapSqlTypeDescriptor(sqlTypeDescriptor);
+ }
+
+ /* (non-Javadoc)
+ * @see org.hibernatespatial.SpatialDialect#getSpatialAggregateSQL(java.lang.String, int)
+ */
+
+ public String getSpatialAggregateSQL(String columnName, int aggregation) {
+ switch (aggregation) {
+// NOT YET AVAILABLE IN GEODB
+// case SpatialAggregate.EXTENT:
+// StringBuilder stbuf = new StringBuilder();
+// stbuf.append("extent(").append(columnName).append(")");
+// return stbuf.toString();
+ default:
+ throw new IllegalArgumentException("Aggregations of type "
+ + aggregation + " are not supported by this dialect");
+ }
+ }
+
+ public String getDWithinSQL(String columnName) {
+ return "ST_DWithin(" + columnName + ",?,?)";
+ }
+
+ public String getHavingSridSQL(String columnName) {
+ return "( ST_srid(" + columnName + ") = ?)";
+ }
+
+ public String getIsEmptySQL(String columnName, boolean isEmpty) {
+ String emptyExpr = " ST_IsEmpty(" + columnName + ") ";
+ return isEmpty ? emptyExpr : "( NOT " + emptyExpr + ")";
+ }
+
+ /* (non-Javadoc)
+ * @see org.hibernatespatial.SpatialDialect#getSpatialFilterExpression(java.lang.String)
+ */
+ public String getSpatialFilterExpression(String columnName) {
+ return "(" + columnName + " && ? ) ";
+ }
+
+ /* (non-Javadoc)
+ * @see org.hibernatespatial.SpatialDialect#getSpatialRelateSQL(java.lang.String, int, boolean)
+ */
+
+ public String getSpatialRelateSQL(String columnName, int spatialRelation) {
+ switch (spatialRelation) {
+ case SpatialRelation.WITHIN:
+ return " ST_Within(" + columnName + ", ?)";
+ case SpatialRelation.CONTAINS:
+ return " ST_Contains(" + columnName + ", ?)";
+ case SpatialRelation.CROSSES:
+ return " ST_Crosses(" + columnName + ", ?)";
+ case SpatialRelation.OVERLAPS:
+ return " ST_Overlaps(" + columnName + ", ?)";
+ case SpatialRelation.DISJOINT:
+ return " ST_Disjoint(" + columnName + ", ?)";
+ case SpatialRelation.INTERSECTS:
+ return " ST_Intersects(" + columnName + ", ?)";
+ case SpatialRelation.TOUCHES:
+ return " ST_Touches(" + columnName + ", ?)";
+ case SpatialRelation.EQUALS:
+ return " ST_Equals(" + columnName + ", ?)";
+ default:
+ throw new IllegalArgumentException(
+ "Spatial relation is not known by this dialect");
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.hibernatespatial.SpatialDialect#getDbGeometryTypeName()
+ */
+
+ public String getDbGeometryTypeName() {
+ return "GEOM";
+ }
+
+ /* (non-Javadoc)
+ * @see org.hibernatespatial.SpatialDialect#isTwoPhaseFiltering()
+ */
+
+ public boolean isTwoPhaseFiltering() {
+ return false;
+ }
+
+ public boolean supportsFiltering() {
+ return false;
+ }
+
+ public boolean supports(SpatialFunction function) {
+ if (function == SpatialFunction.difference) return false;
+ return (getFunctions().get(function.toString()) != null);
+ }
+
+}
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2geodb/GeoDBGeometryTypeDescriptor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2geodb/GeoDBGeometryTypeDescriptor.java
new file mode 100644
index 0000000000..c985cad3fe
--- /dev/null
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2geodb/GeoDBGeometryTypeDescriptor.java
@@ -0,0 +1,57 @@
+/*
+ * This file is part of Hibernate Spatial, an extension to the
+ * hibernate ORM solution for spatial (geographic) data.
+ *
+ * Copyright © 2007-2012 Geovise BVBA, Geodan IT b.v.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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 library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package org.hibernate.spatial.dialect.h2geodb;
+
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
+import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
+
+import java.sql.Types;
+
+/**
+ * @author Karel Maesen, Geovise BVBA
+ * creation-date: 2/29/12
+ */
+public class GeoDBGeometryTypeDescriptor implements SqlTypeDescriptor {
+ public static final GeoDBGeometryTypeDescriptor INSTANCE = new GeoDBGeometryTypeDescriptor();
+
+ @Override
+ public int getSqlType() {
+ return Types.ARRAY;
+ }
+
+ @Override
+ public boolean canBeRemapped() {
+ return false;
+ }
+
+ @Override
+ public Note: this utility makes it unnecessary to have a dependency on GeoDB. As long as GeoDB is + * not available in common maven repositories, such a dependency is to be avoided.
+ * + * @author Karel Maesen, Geovise BVBA + * creation-date: 2/29/12 + */ +class WKB { + + static Geometry fromWKB(byte[] bytes, GeometryFactory factory) throws ParseException { + WKBReader reader = new WKBReader(factory); + return reader.read(bytes); + } + + /** + * Reads a EWKB byte (which is just a WKB prepended with an envelope of 32 bytes. + * + * @param bytes + * @param factory + * @return + * @throws ParseException + */ + static Geometry fromEWKB(byte[] bytes, GeometryFactory factory) throws ParseException { + byte[] wkbBytes = new byte[bytes.length - 32]; + System.arraycopy(bytes, 32, wkbBytes, 0, bytes.length - 32); + return fromWKB(wkbBytes, factory); + } + + + static byte[] toWKB(Geometry jtsGeom) { + WKBWriter writer = new WKBWriter(2, true); + return writer.write(jtsGeom); + } +} + diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/TestSupportFactories.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/TestSupportFactories.java index 32b1fd711f..8633786abc 100644 --- a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/TestSupportFactories.java +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/TestSupportFactories.java @@ -1,6 +1,7 @@ package org.hibernate.spatial.testing; import org.hibernate.dialect.Dialect; +import org.hibernate.spatial.testing.dialects.h2geodb.GeoDBTestSupport; import org.hibernate.spatial.testing.dialects.mysql.MySQLTestSupport; import org.hibernate.spatial.testing.dialects.oracle.OracleSDOTestSupport; import org.hibernate.spatial.testing.dialects.postgis.PostgisTestSupport; @@ -48,9 +49,9 @@ public class TestSupportFactories { if ("org.hibernate.spatial.dialect.postgis.PostgisDialect".equals(canonicalName)) { return PostgisTestSupport.class; } -// if ("org.hibernate.spatial.geodb.GeoDBDialect".equals(canonicalName)) { -// return "org.hibernate.spatial.geodb.GeoDBSupport"; -// } + if ("org.hibernate.spatial.dialect.h2geodb.GeoDBDialect".equals(canonicalName)) { + return GeoDBTestSupport.class; + } if ("org.hibernate.spatial.dialect.sqlserver.SqlServer2008SpatialDialect".equals(canonicalName)) { return SQLServerTestSupport.class; } diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBDataSourceUtils.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBDataSourceUtils.java new file mode 100644 index 0000000000..45fd8475aa --- /dev/null +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBDataSourceUtils.java @@ -0,0 +1,51 @@ +/** + * + */ +package org.hibernate.spatial.testing.dialects.h2geodb; + + +import org.hibernate.spatial.testing.DataSourceUtils; +import org.hibernate.spatial.testing.SQLExpressionTemplate; + +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.SQLException; + +/** + * Extension of the {@link DataSourceUtils} class which sets up an in-memory + * GeoDB database. The specified SQL file is used to generate a schema in the + * database. + * + * @author Jan Boonen, Geodan IT b.v. + */ +public class GeoDBDataSourceUtils extends DataSourceUtils { + + public GeoDBDataSourceUtils(String jdbcDriver, String jdbcUrl, String jdbcUser, String jdbcPass, + SQLExpressionTemplate sqlExpressionTemplate) + throws SQLException, IOException { + super(jdbcDriver, jdbcUrl, jdbcUser, jdbcPass, sqlExpressionTemplate); + Connection conn = this.getConnection(); + initGeoDB(conn); + } + + //initialise the GeoDB connection using Reflection + // so we do not introduce a compile-time dependency + private void initGeoDB(Connection conn) { + String errorMsg = "Problem initializing GeoDB."; + try { + Class geoDB = Thread.currentThread().getContextClassLoader().loadClass("geodb.GeoDB"); + Method m = geoDB.getDeclaredMethod("InitGeoDB", new Class[]{Connection.class}); + m.invoke(null, conn); + } catch (ClassNotFoundException e) { + throw new RuntimeException(errorMsg, e); + } catch (NoSuchMethodException e) { + throw new RuntimeException(errorMsg, e); + } catch (InvocationTargetException e) { + throw new RuntimeException(errorMsg, e); + } catch (IllegalAccessException e) { + throw new RuntimeException(errorMsg, e); + } + } +} diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java new file mode 100644 index 0000000000..e61b3ab3c1 --- /dev/null +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpectationsFactory.java @@ -0,0 +1,411 @@ +/** + * + */ +package org.hibernate.spatial.testing.dialects.h2geodb; + +import com.vividsolutions.jts.geom.Geometry; +import com.vividsolutions.jts.geom.Point; +import org.hibernate.spatial.dialect.h2geodb.GeoDBValueExtractor; +import org.hibernate.spatial.testing.AbstractExpectationsFactory; +import org.hibernate.spatial.testing.NativeSQLStatement; + + +/** + * A Factory class that generates expected {@link NativeSQLStatement}s for + * GeoDB. + * + * @Author Jan Boonen, Geodan IT b.v. + */ +public class GeoDBExpectationsFactory extends AbstractExpectationsFactory { + + private final GeoDBValueExtractor decoder = new GeoDBValueExtractor(); + + public GeoDBExpectationsFactory(GeoDBDataSourceUtils dataSourceUtils) { + super(dataSourceUtils); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeAsBinaryStatement() + */ + + @Override + protected NativeSQLStatement createNativeAsBinaryStatement() { + return createNativeSQLStatement("select id, ST_AsEWKB(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeAsTextStatement() + */ + + @Override + protected NativeSQLStatement createNativeAsTextStatement() { + return createNativeSQLStatement("select id, ST_AsText(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeBoundaryStatement() + */ + + @Override + protected NativeSQLStatement createNativeBoundaryStatement() { + throw new UnsupportedOperationException( + "Method ST_Bounday() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeBufferStatement(java.lang.Double) + */ + + @Override + protected NativeSQLStatement createNativeBufferStatement(Double distance) { + return createNativeSQLStatement( + "select t.id, ST_Buffer(t.geom,?) from GEOMTEST t where ST_SRID(t.geom) = 4326", + new Object[]{distance}); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeContainsStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeContainsStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Contains(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Contains(t.geom, ST_GeomFromText(?, 4326)) = 1 and ST_SRID(t.geom) = 4326", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeConvexHullStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeConvexHullStatement(Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_ConvexHull() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeCrossesStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeCrossesStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Crosses(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Crosses(t.geom, ST_GeomFromText(?, 4326)) = 1 and ST_SRID(t.geom) = 4326", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeDifferenceStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeDifferenceStatement(Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_Difference() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeDimensionSQL() + */ + + @Override + protected NativeSQLStatement createNativeDimensionSQL() { + throw new UnsupportedOperationException( + "Method ST_Dimension() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeDisjointStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeDisjointStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Disjoint(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Disjoint(t.geom, ST_GeomFromText(?, 4326)) = 1 and ST_SRID(t.geom) = 4326", + geom.toText()); + } + + @Override + protected NativeSQLStatement createNativeTransformStatement(int epsg) { + throw new UnsupportedOperationException(); + } + + @Override + protected NativeSQLStatement createNativeHavingSRIDStatement(int srid) { + return createNativeSQLStatement("select t.id, (ST_SRID(t.geom) = " + + srid + ") from GeomTest t where ST_SRID(t.geom) = " + srid); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeDistanceStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeDistanceStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, st_distance(t.geom, ST_GeomFromText(?, 4326)) from GeomTest t where ST_SRID(t.geom) = 4326", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeEnvelopeStatement() + */ + + @Override + protected NativeSQLStatement createNativeEnvelopeStatement() { + return createNativeSQLStatement("select id, ST_Envelope(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeEqualsStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeEqualsStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Equals(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Equals(t.geom, ST_GeomFromText(?, 4326)) = 1 and ST_SRID(t.geom) = 4326", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeFilterStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeFilterStatement(Geometry geom) { + throw new UnsupportedOperationException( + "Filter is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeGeomUnionStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeGeomUnionStatement(Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_GeomUnion() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeGeometryTypeStatement() + */ + + @Override + protected NativeSQLStatement createNativeGeometryTypeStatement() { + return createNativeSQLStatement("select id, GeometryType(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeIntersectionStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeIntersectionStatement(Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_Intersection() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeIntersectsStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeIntersectsStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Intersects(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Intersects(t.geom, ST_GeomFromText(?, 4326)) = 1 and ST_SRID(t.geom) = 4326", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeIsEmptyStatement() + */ + + @Override + protected NativeSQLStatement createNativeIsEmptyStatement() { + return createNativeSQLStatement("select id, ST_IsEmpty(geom) from GEOMTEST"); + } + + @Override + protected NativeSQLStatement createNativeIsNotEmptyStatement() { + return createNativeSQLStatement("select id, not ST_IsEmpty(geom) from geomtest"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeIsSimpleStatement() + */ + + @Override + protected NativeSQLStatement createNativeIsSimpleStatement() { + return createNativeSQLStatement("select id, ST_IsSimple(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeOverlapsStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeOverlapsStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Overlaps(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Overlaps(t.geom, ST_GeomFromText(?, 4326)) = 1 and ST_SRID(t.geom) = 4326", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeRelateStatement(com.vividsolutions.jts.geom.Geometry, + * java.lang.String) + */ + + @Override + protected NativeSQLStatement createNativeRelateStatement(Geometry geom, + String matrix) { + throw new UnsupportedOperationException( + "Method ST_Relate() is not implemented in the current version of GeoDB."); + } + + @Override + protected NativeSQLStatement createNativeDwithinStatement(Point geom, + double distance) { + String sql = "select t.id, ST_DWithin(t.geom, ST_GeomFromText(?, 4326), " + + distance + + " ) from GEOMTEST t where st_dwithin(t.geom, ST_GeomFromText(?, 4326), " + + distance + ") = 'true' and ST_SRID(t.geom) = 4326"; + return createNativeSQLStatementAllWKTParams(sql, geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeSridStatement() + */ + + @Override + protected NativeSQLStatement createNativeSridStatement() { + return createNativeSQLStatement("select id, ST_SRID(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeSymDifferenceStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeSymDifferenceStatement( + Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_SymDifference() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeTouchesStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeTouchesStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Touches(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Touches(t.geom, ST_GeomFromText(?, 4326)) = 1 and ST_SRID(t.geom) = 4326", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeWithinStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeWithinStatement( + Geometry testPolygon) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Within(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Within(t.geom, ST_GeomFromText(?, 4326)) = 1 and ST_SRID(t.geom) = 4326", + testPolygon.toText()); + } + + /* + * (non-Javadoc) + * + * @see + * org.hibernatespatial.test.AbstractExpectationsFactory#decode(java.lang + * .Object) + */ + + @Override + protected Geometry decode(Object o) { + return decoder.toJTS(o); + } + +} diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpressionTemplate.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpressionTemplate.java new file mode 100644 index 0000000000..f6e5c14b3c --- /dev/null +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBExpressionTemplate.java @@ -0,0 +1,28 @@ +package org.hibernate.spatial.testing.dialects.h2geodb; + +import org.hibernate.spatial.testing.SQLExpressionTemplate; +import org.hibernate.spatial.testing.TestDataElement; + +/** + * This is the template for insert SQL statements into the geomtest test table + * for GeoDB. + * + * @author Jan Boonen, Geodan IT b.v. + */ +public class GeoDBExpressionTemplate implements SQLExpressionTemplate { + + final String SQL_TEMPLATE = "insert into GEOMTEST values (%d, '%s', ST_GeomFromText('%s', %d))"; + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.SQLExpressionTemplate#toInsertSql(org. + * hibernatespatial.test.TestDataElement) + */ + public String toInsertSql(TestDataElement testDataElement) { + return String + .format(SQL_TEMPLATE, testDataElement.id, testDataElement.type, + testDataElement.wkt, testDataElement.srid); + } + +} diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBGeometryEquality.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBGeometryEquality.java new file mode 100644 index 0000000000..3b4c3cefd2 --- /dev/null +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBGeometryEquality.java @@ -0,0 +1,41 @@ +/** + * + */ +package org.hibernate.spatial.testing.dialects.h2geodb; + +import com.vividsolutions.jts.geom.Coordinate; +import com.vividsolutions.jts.geom.Geometry; +import org.hibernate.spatial.testing.GeometryEquality; + +/** + * Extends the test for {@link Geometry} equality, because GeoDB uses JTS + * Geometry objects, which cannot be cast to {@link org.hibernate.spatial.jts.mgeom.MGeometry} objects. + * + * @author Jan Boonen, Geodan IT b.v. + */ +public class GeoDBGeometryEquality extends GeometryEquality { + + @Override + public boolean test(Geometry geom1, Geometry geom2) { + if (geom1 != null && geom1.isEmpty()) + return geom2 == null || geom2.isEmpty(); + return super.test(geom1, geom2); + } + + @Override + protected boolean testSimpleGeometryEquality(Geometry geom1, Geometry geom2) { + return testVerticesEquality(geom1, geom2); + } + + private boolean testVerticesEquality(Geometry geom1, Geometry geom2) { + if (geom1.getNumPoints() != geom2.getNumPoints()) + return false; + for (int i = 0; i < geom1.getNumPoints(); i++) { + Coordinate cn1 = geom1.getCoordinates()[i]; + Coordinate cn2 = geom2.getCoordinates()[i]; + if (!cn1.equals2D(cn2)) + return false; + } + return true; + } +} diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBNoSRIDExpectationsFactory.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBNoSRIDExpectationsFactory.java new file mode 100644 index 0000000000..7d378e47b1 --- /dev/null +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBNoSRIDExpectationsFactory.java @@ -0,0 +1,406 @@ +/** + * + */ +package org.hibernate.spatial.testing.dialects.h2geodb; + +import com.vividsolutions.jts.geom.Geometry; +import com.vividsolutions.jts.geom.Point; +import org.hibernate.spatial.dialect.h2geodb.GeoDBValueExtractor; +import org.hibernate.spatial.testing.AbstractExpectationsFactory; +import org.hibernate.spatial.testing.NativeSQLStatement; + +/** + * A Factory class that generates expected {@link org.hibernate.spatial.testing.NativeSQLStatement}s for GeoDB + * version < 0.4. These versions don't support storage of the SRID value with + * the geometry. + * + * @author Jan Boonen, Geodan IT b.v. + */ +public class GeoDBNoSRIDExpectationsFactory extends AbstractExpectationsFactory { + + private final GeoDBValueExtractor decoder = new GeoDBValueExtractor(); + + public GeoDBNoSRIDExpectationsFactory(GeoDBDataSourceUtils dataSourceUtils) { + super(dataSourceUtils); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeAsBinaryStatement() + */ + + @Override + protected NativeSQLStatement createNativeAsBinaryStatement() { + return createNativeSQLStatement("select id, ST_AsEWKB(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeAsTextStatement() + */ + + @Override + protected NativeSQLStatement createNativeAsTextStatement() { + return createNativeSQLStatement("select id, ST_AsText(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeBoundaryStatement() + */ + + @Override + protected NativeSQLStatement createNativeBoundaryStatement() { + throw new UnsupportedOperationException( + "Method ST_Bounday() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeBufferStatement(java.lang.Double) + */ + + @Override + protected NativeSQLStatement createNativeBufferStatement(Double distance) { + return createNativeSQLStatement( + "select t.id, ST_Buffer(t.geom,?) from GEOMTEST t where ST_SRID(t.geom) = 4326", + new Object[]{distance}); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeContainsStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeContainsStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Contains(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Contains(t.geom, ST_GeomFromText(?, 4326)) = 1", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeConvexHullStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeConvexHullStatement(Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_ConvexHull() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeCrossesStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeCrossesStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Crosses(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Crosses(t.geom, ST_GeomFromText(?, 4326)) = 1", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeDifferenceStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeDifferenceStatement(Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_Difference() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeDimensionSQL() + */ + + @Override + protected NativeSQLStatement createNativeDimensionSQL() { + throw new UnsupportedOperationException( + "Method ST_Dimension() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeDisjointStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeDisjointStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Disjoint(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Disjoint(t.geom, ST_GeomFromText(?, 4326)) = 1", + geom.toText()); + } + + @Override + protected NativeSQLStatement createNativeTransformStatement(int epsg) { + throw new UnsupportedOperationException(); + } + + @Override + protected NativeSQLStatement createNativeHavingSRIDStatement(int srid) { + return createNativeSQLStatement("select t.id, (st_srid(t.geom) = " + srid + ") from GeomTest t where ST_SRID(t.geom) = " + srid); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeDistanceStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeDistanceStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, st_distance(t.geom, ST_GeomFromText(?, 4326)) from GeomTest t where ST_SRID(t.geom) = 4326", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeEnvelopeStatement() + */ + + @Override + protected NativeSQLStatement createNativeEnvelopeStatement() { + return createNativeSQLStatement("select id, ST_Envelope(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeEqualsStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeEqualsStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Equals(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Equals(t.geom, ST_GeomFromText(?, 4326)) = 1", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeFilterStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeFilterStatement(Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_MBRIntersects() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeGeomUnionStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeGeomUnionStatement(Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_GeomUnion() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeGeometryTypeStatement() + */ + + @Override + protected NativeSQLStatement createNativeGeometryTypeStatement() { + return createNativeSQLStatement("select id, GeometryType(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeIntersectionStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeIntersectionStatement(Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_Intersection() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeIntersectsStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeIntersectsStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Intersects(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Intersects(t.geom, ST_GeomFromText(?, 4326)) = 1", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeIsEmptyStatement() + */ + + @Override + protected NativeSQLStatement createNativeIsEmptyStatement() { + return createNativeSQLStatement("select id, ST_IsEmpty(geom) from GEOMTEST"); + } + + @Override + protected NativeSQLStatement createNativeIsNotEmptyStatement() { + return createNativeSQLStatement("select id, not ST_IsEmpty(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeIsSimpleStatement() + */ + + @Override + protected NativeSQLStatement createNativeIsSimpleStatement() { + return createNativeSQLStatement("select id, ST_IsSimple(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeOverlapsStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeOverlapsStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Overlaps(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Overlaps(t.geom, ST_GeomFromText(?, 4326)) = 1", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeRelateStatement(com.vividsolutions.jts.geom.Geometry, + * java.lang.String) + */ + + @Override + protected NativeSQLStatement createNativeRelateStatement(Geometry geom, + String matrix) { + throw new UnsupportedOperationException( + "Method ST_Relate() is not implemented in the current version of GeoDB."); + } + + @Override + protected NativeSQLStatement createNativeDwithinStatement(Point geom, double distance) { + String sql = "select t.id, st_dwithin(t.geom, ST_GeomFromText(?, 4326), " + distance + " ) from GeomTest t where st_dwithin(t.geom, ST_GeomFromText(?, 4326), " + distance + ") = 'true' and ST_SRID(t.geom) = 4326"; + return createNativeSQLStatementAllWKTParams(sql, geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeSridStatement() + */ + + @Override + protected NativeSQLStatement createNativeSridStatement() { + return createNativeSQLStatement("select id, ST_SRID(geom) from GEOMTEST"); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeSymDifferenceStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeSymDifferenceStatement( + Geometry geom) { + throw new UnsupportedOperationException( + "Method ST_SymDifference() is not implemented in the current version of GeoDB."); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeTouchesStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeTouchesStatement(Geometry geom) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Touches(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Touches(t.geom, ST_GeomFromText(?, 4326)) = 1", + geom.toText()); + } + + /* + * (non-Javadoc) + * + * @seeorg.hibernatespatial.test.AbstractExpectationsFactory# + * createNativeWithinStatement(com.vividsolutions.jts.geom.Geometry) + */ + + @Override + protected NativeSQLStatement createNativeWithinStatement( + Geometry testPolygon) { + return createNativeSQLStatementAllWKTParams( + "select t.id, ST_Within(t.geom, ST_GeomFromText(?, 4326)) from GEOMTEST t where ST_Within(t.geom, ST_GeomFromText(?, 4326)) = 1 and ST_SRID(t.geom) = 4326", + testPolygon.toText()); + } + + /* + * (non-Javadoc) + * + * @see + * org.hibernatespatial.test.AbstractExpectationsFactory#decode(java.lang + * .Object) + */ + + @Override + protected Geometry decode(Object o) { + return decoder.toJTS(o); + } + +} diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBTestSupport.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBTestSupport.java new file mode 100644 index 0000000000..c9e0edf056 --- /dev/null +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/h2geodb/GeoDBTestSupport.java @@ -0,0 +1,46 @@ +package org.hibernate.spatial.testing.dialects.h2geodb; + +import org.hibernate.cfg.Configuration; +import org.hibernate.spatial.testing.*; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; + +import java.io.IOException; +import java.sql.SQLException; + +/** + * @author Karel Maesen, Geovise BVBA + * creation-date: Oct 2, 2010 + */ +public class GeoDBTestSupport extends TestSupport { + + + public DataSourceUtils createDataSourceUtil(Configuration configuration) { + super.createDataSourceUtil(configuration); + try { + return new GeoDBDataSourceUtils(driver(), url(), user(), passwd(), getSQLExpressionTemplate()); + } catch (SQLException e) { + throw new RuntimeException(e); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public TestData createTestData(BaseCoreFunctionalTestCase testcase) { + return TestData.fromFile("h2geodb/test-geodb-data-set.xml"); + } + + public GeometryEquality createGeometryEquality() { + return new GeoDBGeometryEquality(); + } + + public AbstractExpectationsFactory createExpectationsFactory(DataSourceUtils dataSourceUtils) { + return new GeoDBExpectationsFactory((GeoDBDataSourceUtils) dataSourceUtils); + } + + public SQLExpressionTemplate getSQLExpressionTemplate() { + return new GeoDBExpressionTemplate(); + } + + +} + diff --git a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/postgis/PostgisExpectationsFactory.java b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/postgis/PostgisExpectationsFactory.java index 749736d215..d983c592e7 100644 --- a/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/postgis/PostgisExpectationsFactory.java +++ b/hibernate-spatial/src/matrix/java/org/hibernate/spatial/testing/dialects/postgis/PostgisExpectationsFactory.java @@ -1,6 +1,4 @@ /* - * $Id:$ - * * This file is part of Hibernate Spatial, an extension to the * hibernate ORM solution for geographic data. * diff --git a/hibernate-spatial/src/test/resources/h2geodb/test-geodb-data-set.xml b/hibernate-spatial/src/test/resources/h2geodb/test-geodb-data-set.xml new file mode 100644 index 0000000000..32ae0dea16 --- /dev/null +++ b/hibernate-spatial/src/test/resources/h2geodb/test-geodb-data-set.xml @@ -0,0 +1,69 @@ + + +