Adding distinct to query fix

Author: aarrsseni

cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java

@@ -188,8 +188,13 @@ public int hashCode(){
         }
 
         public boolean equals(Object o){
-            ObjectArrayWrapper m = (ObjectArrayWrapper)o;
-            return Arrays.deepEquals(this.getObjects(),m.getObjects());
+            if (o == this)
+                return true;
+
+            if (!(o instanceof DistinctResultIterator.ObjectArrayWrapper))
+                return false;
+
+            return Arrays.deepEquals(this.getObjects(),((ObjectArrayWrapper)o).getObjects());
         }
     }
 

cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java

@@ -455,7 +455,7 @@ <T> List<ColumnDescriptor> appendOverriddenColumns(List<ColumnDescriptor> column
 				int type = getJdbcTypeForProperty(property);
 				ColumnDescriptor descriptor;
 				if(property.getType() != null) {
-					descriptor = new ColumnDescriptor(builder.toString(), type, property.getType().getName());
+					descriptor = new ColumnDescriptor(builder.toString(), type, property.getType().getCanonicalName());
 				} else {
 					descriptor = new ColumnDescriptor(builder.toString(), type);
 				}