@finos/legend-query-builder 4.18.19 → 4.18.21

package/src/stores/filter/operators/QueryBuilderFilterOperator_In.ts

@@ -28,6 +28,7 @@ import {
   GenericTypeExplicitReference,
   GenericType,
   Enumeration,
+  getPrimitiveTypeInstanceFromEnum,
   PRIMITIVE_TYPE,
   Multiplicity,
 } from '@finos/legend-graph';
@@ -97,6 +98,15 @@ export class QueryBuilderFilterOperator_In
         if (!collectionType) {
           return false;
         }
+        // Compare standard primitive equivalents so columns declared with a
+        // precise primitive type (e.g. accessor relation columns: Varchar,
+        // BigInt, Timestamp) are still recognized as compatible with the
+        // standard primitives stored in the value collection.
+        const normalizedPropertyTypePath =
+          getStandardPrimitiveTypeEquivalent(propertyType) ?? propertyType.path;
+        const normalizedCollectionTypePath =
+          getStandardPrimitiveTypeEquivalent(collectionType) ??
+          collectionType.path;
         if (
           (
             [
@@ -108,10 +118,7 @@ export class QueryBuilderFilterOperator_In
               PRIMITIVE_TYPE.STRICTDATE,
               PRIMITIVE_TYPE.DATETIME,
             ] as string[]
-          ).includes(
-            getStandardPrimitiveTypeEquivalent(propertyType) ??
-              propertyType.path,
-          )
+          ).includes(normalizedPropertyTypePath)
         ) {
           return (
             [
@@ -123,12 +130,12 @@ export class QueryBuilderFilterOperator_In
               PRIMITIVE_TYPE.STRICTDATE,
               PRIMITIVE_TYPE.DATETIME,
             ] as string[]
-          ).includes(
-            getStandardPrimitiveTypeEquivalent(collectionType) ??
-              collectionType.path,
-          );
+          ).includes(normalizedCollectionTypePath);
         }
-        return collectionType === propertyType;
+        return (
+          collectionType === propertyType ||
+          normalizedPropertyTypePath === normalizedCollectionTypePath
+        );
       } else if (valueSpec instanceof VariableExpression) {
         // check if not a single value
         if (valueSpec.multiplicity.upperBound === 1) {
@@ -144,9 +151,17 @@ export class QueryBuilderFilterOperator_In
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
     const propertyType = filterConditionState.leftConditionType;
+    // Normalize precise primitive types (e.g. Varchar, BigInt) to their
+    // standard equivalent so the collection's generic type matches the
+    // standard primitive values that downstream editors produce.
+    const standardPrimitive = getStandardPrimitiveTypeEquivalent(propertyType);
+    const collectionType =
+      standardPrimitive !== undefined
+        ? getPrimitiveTypeInstanceFromEnum(standardPrimitive)
+        : propertyType;
     return new CollectionInstanceValue(
       Multiplicity.ONE,
-      GenericTypeExplicitReference.create(new GenericType(propertyType)),
+      GenericTypeExplicitReference.create(new GenericType(collectionType)),
     );
   }
 

package/src/stores/shared/ValueSpecificationEditorHelper.ts

@@ -30,7 +30,9 @@ import {
   GenericType,
   GenericTypeExplicitReference,
   getEnumValue,
+  getPrimitiveTypeInstanceFromEnum,
   PrimitiveInstanceValue,
+  PrecisePrimitiveType,
   PrimitiveType,
   PRIMITIVE_TYPE,
   INTERNAL__PropagatedValue,
@@ -484,11 +486,25 @@ export const convertTextToPrimitiveInstanceValue = (
   observerContext: ObserverContext,
 ): PrimitiveInstanceValue | null => {
   let result = null;
+  // Normalize precise primitive types (e.g. Varchar, BigInt, Timestamp) to
+  // their standard primitive equivalent so values entered through the editor
+  // are stored as standard PrimitiveInstanceValue regardless of whether the
+  // source column was declared with a precise type (e.g. accessor relation
+  // columns).
+  let resolvedType: PrimitiveType | undefined;
   if (expectedType instanceof PrimitiveType) {
-    switch (expectedType.path) {
+    resolvedType = expectedType;
+  } else if (expectedType instanceof PrecisePrimitiveType) {
+    const standard = getStandardPrimitiveTypeEquivalent(expectedType);
+    resolvedType = standard
+      ? getPrimitiveTypeInstanceFromEnum(standard)
+      : undefined;
+  }
+  if (resolvedType) {
+    switch (resolvedType.path) {
       case PRIMITIVE_TYPE.STRING: {
         result = new PrimitiveInstanceValue(
-          GenericTypeExplicitReference.create(new GenericType(expectedType)),
+          GenericTypeExplicitReference.create(new GenericType(resolvedType)),
         );
         instanceValue_setValues(result, [value.toString()], observerContext);
         break;
@@ -501,11 +517,11 @@ export const convertTextToPrimitiveInstanceValue = (
           return null;
         }
         const formattedNumber =
-          expectedType.path === PRIMITIVE_TYPE.INTEGER
+          resolvedType.path === PRIMITIVE_TYPE.INTEGER
             ? Number.parseInt(Number(value).toString(), 10)
             : Number(value);
         result = new PrimitiveInstanceValue(
-          GenericTypeExplicitReference.create(new GenericType(expectedType)),
+          GenericTypeExplicitReference.create(new GenericType(resolvedType)),
         );
         instanceValue_setValues(result, [formattedNumber], observerContext);
         break;
@@ -516,7 +532,7 @@ export const convertTextToPrimitiveInstanceValue = (
           return null;
         }
         result = new PrimitiveInstanceValue(
-          GenericTypeExplicitReference.create(new GenericType(expectedType)),
+          GenericTypeExplicitReference.create(new GenericType(resolvedType)),
         );
         instanceValue_setValues(result, [value], observerContext);
         break;
@@ -532,7 +548,7 @@ export const convertTextToPrimitiveInstanceValue = (
           return null;
         }
         result = new PrimitiveInstanceValue(
-          GenericTypeExplicitReference.create(new GenericType(expectedType)),
+          GenericTypeExplicitReference.create(new GenericType(resolvedType)),
         );
         instanceValue_setValues(result, [value], observerContext);
         break;