GEOT-4322 Oracle SDO_NN function: fixed result type

geotools · Dec 20, 2012 · a5295be · a5295be
1 parent d53ca9a
commit a5295be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...les/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleFilterToSQL.java b/...les/plugin/jdbc/jdbc-oracle/src/main/java/org/geotools/data/oracle/OracleFilterToSQL.java
@@ -199,13 +199,13 @@ private FilterFunction_sdonn getSDO_NN_Query(PropertyIsEqualTo filter) {
         if (expr1 instanceof FilterFunction_sdonn) {
             if (!(expr2 instanceof Literal)) {
                 throw new UnsupportedOperationException(
-                        "Unsupported usage of SDO_NN Oracle function: property must be TRUE");
+                        "Unsupported usage of SDO_NN Oracle function: it can be compared only to a Boolean \"true\" value");
             }
 
             Boolean nearest = (Boolean) evaluateLiteral((Literal) expr2, Boolean.class);
             if (nearest == null || !nearest.booleanValue()) {
                 throw new UnsupportedOperationException(
-                        "Unsupported usage of SDO_NN Oracle function: property must be TRUE");
+                        "Unsupported usage of SDO_NN Oracle function: it can be compared only to a Boolean \"true\" value");
             }
 
             return (FilterFunction_sdonn) expr1;

diff --git a/...gin/jdbc/jdbc-oracle/src/main/java/org/geotools/filter/function/FilterFunction_sdonn.java b/...gin/jdbc/jdbc-oracle/src/main/java/org/geotools/filter/function/FilterFunction_sdonn.java
@@ -29,7 +29,7 @@
  */
 public class FilterFunction_sdonn extends FunctionExpressionImpl implements VolatileFunction {
 
-    public static FunctionName NAME = new FunctionNameImpl("sdo_nn", String.class,
+    public static FunctionName NAME = new FunctionNameImpl("sdo_nn", Boolean.class,
             // required parameters:
             FunctionNameImpl.parameter("geometry", Geometry.class), 
             FunctionNameImpl.parameter("sdo_num_res", Integer.class),