Handle UUIDs properly

Author: maxhov

core/impl/src/main/java/com/blazebit/query/impl/calcite/CalciteDataSource.java

@@ -16,7 +16,6 @@
 import org.apache.calcite.jdbc.CalcitePrepare;
 import org.apache.calcite.jdbc.CalciteSchema;
 import org.apache.calcite.jdbc.Driver;
-import org.apache.calcite.jdbc.JavaTypeFactoryImpl;
 import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelOptCluster;
 import org.apache.calcite.plan.RelOptPlanner;
@@ -72,7 +71,7 @@ public boolean shouldConvertRaggedUnionTypesToVarying() {
 				}
 			};
 		}
-		this.typeFactory = new JavaTypeFactoryImpl( typeSystem );
+		this.typeFactory = new CustomJavaTypeFactory( typeSystem );
 		this.rootSchema = CalciteSchema.createRootSchema( true );
 	}
 

core/impl/src/main/java/com/blazebit/query/impl/calcite/CustomJavaTypeFactory.java

@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+package com.blazebit.query.impl.calcite;
+
+import org.apache.calcite.jdbc.JavaTypeFactoryImpl;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeSystem;
+import org.apache.calcite.sql.type.BasicSqlType;
+import org.apache.calcite.sql.type.SqlTypeName;
+
+import java.lang.reflect.Type;
+
+public class CustomJavaTypeFactory extends JavaTypeFactoryImpl {
+
+	public CustomJavaTypeFactory(RelDataTypeSystem typeSystem) {
+		super( typeSystem );
+	}
+
+	@Override
+	public Type getJavaClass(RelDataType type) {
+		if ( type instanceof BasicSqlType basicSqlType && basicSqlType.getSqlTypeName().equals( SqlTypeName.UUID ) ) {
+			return java.util.UUID.class;
+		}
+
+		return super.getJavaClass( type );
+	}
+}

core/impl/src/main/java/com/blazebit/query/impl/calcite/DataFetcherTable.java

@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.function.Supplier;
 
 import com.blazebit.query.QuerySession;
@@ -62,6 +63,7 @@ public class DataFetcherTable<T> extends AbstractTable implements ScannableTable
 		javaTypeMappings.put( ZonedDateTime.class, SqlTypeName.TIMESTAMP );
 		javaTypeMappings.put( OffsetDateTime.class, SqlTypeName.TIMESTAMP );
 		javaTypeMappings.put( LocalDateTime.class, SqlTypeName.TIMESTAMP );
+		javaTypeMappings.put( UUID.class, SqlTypeName.UUID );
 		javaTypeMappings.put( LocalDate.class, SqlTypeName.DATE );
 		javaTypeMappings.put( OffsetTime.class, SqlTypeName.TIME );
 		javaTypeMappings.put( LocalTime.class, SqlTypeName.TIME );

core/impl/src/test/java/com/blazebit/query/impl/ConverterTest.java

@@ -109,7 +109,7 @@ public List<Model> fetch(DataFetchContext context) {
 								"  and m.theDuration = interval '1 9:8:7.123456' day to second" +
 //								"  and m.theDuration = interval '1 9:8:7.123456789' day to second" +
 								"  and m.thePeriod = interval '1-5' year to month" +
-//								"  and m.theUuid = uuid '53886a8a-7082-4879-b430-25cb94415be8'" +
+								"  and m.theUuid = uuid '53886a8a-7082-4879-b430-25cb94415be8'" +
 								"  and m.theEnum = 'VALUE1'" +
 								"  and m.theCustomEnum = 'VALUE1'"
 				);