@finos/legend-query-builder 4.18.19 → 4.18.21

package/lib/stores/shared/ValueSpecificationEditorHelper.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { VariableExpression, CollectionInstanceValue, Enumeration, EnumValueExplicitReference, EnumValueInstanceValue, GenericType, GenericTypeExplicitReference, getEnumValue, PrimitiveInstanceValue, PrimitiveType, PRIMITIVE_TYPE, INTERNAL__PropagatedValue, SimpleFunctionExpression, LambdaFunction, FunctionType, PackageableElementExplicitReference, Multiplicity, CORE_PURE_PATH, buildRawLambdaFromLambdaFunction, getValueSpecificationReturnType, isSubType, AbstractPropertyExpression, PropertyExplicitReference, } from '@finos/legend-graph';
+import { VariableExpression, CollectionInstanceValue, Enumeration, EnumValueExplicitReference, EnumValueInstanceValue, GenericType, GenericTypeExplicitReference, getEnumValue, getPrimitiveTypeInstanceFromEnum, PrimitiveInstanceValue, PrecisePrimitiveType, PrimitiveType, PRIMITIVE_TYPE, INTERNAL__PropagatedValue, SimpleFunctionExpression, LambdaFunction, FunctionType, PackageableElementExplicitReference, Multiplicity, CORE_PURE_PATH, buildRawLambdaFromLambdaFunction, getValueSpecificationReturnType, isSubType, AbstractPropertyExpression, PropertyExplicitReference, } from '@finos/legend-graph';
 import { Randomizer, UnsupportedOperationError, deepClone, guaranteeNonNullable, returnUndefOnError, } from '@finos/legend-shared';
 import { generateDefaultValueForPrimitiveType, getStandardPrimitiveTypeEquivalent, } from '../QueryBuilderValueSpecificationHelper.js';
 import { functionExpression_setParametersValues, instanceValue_setValues, propertyExpression_setFunc, valueSpecification_setGenericType, } from './ValueSpecificationModifierHelper.js';
@@ -198,10 +198,25 @@ export const valueSpecReturnTDS = (val, graph) => {
 };
 export const convertTextToPrimitiveInstanceValue = (expectedType, value, observerContext) => {
     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;
     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)));
+                result = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(resolvedType)));
                 instanceValue_setValues(result, [value.toString()], observerContext);
                 break;
             }
@@ -212,10 +227,10 @@ export const convertTextToPrimitiveInstanceValue = (expectedType, value, observe
                 if (isNaN(Number(value))) {
                     return null;
                 }
-                const formattedNumber = expectedType.path === PRIMITIVE_TYPE.INTEGER
+                const formattedNumber = resolvedType.path === PRIMITIVE_TYPE.INTEGER
                     ? Number.parseInt(Number(value).toString(), 10)
                     : Number(value);
-                result = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(expectedType)));
+                result = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(resolvedType)));
                 instanceValue_setValues(result, [formattedNumber], observerContext);
                 break;
             }
@@ -224,7 +239,7 @@ export const convertTextToPrimitiveInstanceValue = (expectedType, value, observe
                 if (isNaN(Date.parse(value))) {
                     return null;
                 }
-                result = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(expectedType)));
+                result = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(resolvedType)));
                 instanceValue_setValues(result, [value], observerContext);
                 break;
             }
@@ -236,7 +251,7 @@ export const convertTextToPrimitiveInstanceValue = (expectedType, value, observe
                             !new Date(value.slice(1)).getTime()))) {
                     return null;
                 }
-                result = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(expectedType)));
+                result = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(resolvedType)));
                 instanceValue_setValues(result, [value], observerContext);
                 break;
             }

package/lib/stores/shared/ValueSpecificationEditorHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValueSpecificationEditorHelper.js","sourceRoot":"","sources":["../../../src/stores/shared/ValueSpecificationEditorHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ValueSpecificationEditorHelper.js","sourceRoot":"","sources":["../../../src/stores/shared/ValueSpecificationEditorHelper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "4.18.19",
+  "version": "4.18.21",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -45,10 +45,10 @@
   "dependencies": {
     "@finos/legend-application": "16.0.113",
     "@finos/legend-art": "7.1.154",
-    "@finos/legend-code-editor": "2.0.180",
-    "@finos/legend-data-cube": "0.3.97",
-    "@finos/legend-graph": "32.6.11",
-    "@finos/legend-lego": "2.0.200",
+    "@finos/legend-code-editor": "2.0.182",
+    "@finos/legend-data-cube": "0.3.99",
+    "@finos/legend-graph": "32.6.13",
+    "@finos/legend-lego": "2.0.202",
     "@finos/legend-server-depot": "6.1.14",
     "@finos/legend-shared": "11.0.26",
     "@finos/legend-storage": "3.0.147",

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -66,6 +66,7 @@ import {
   type QueryBuilderFilterState,
   FilterValueSpecConditionValueState,
   FilterPropertyExpressionStateConditionValueState,
+  FilterRelationColumnConditionValueState,
   isCollectionProperty,
   type QueryBuilderFilterValueDropTarget,
   isExistsNodeChild,
@@ -109,6 +110,7 @@ import {
   SimpleFunctionExpression,
   VariableExpression,
   PrimitiveType,
+  PrecisePrimitiveType,
   Class,
   Enumeration,
 } from '@finos/legend-graph';
@@ -177,6 +179,7 @@ export const CAN_DROP_FILTER_NODE_DND_TYPES = [
 export const CAN_DROP_FILTER_VALUE_DND_TYPES = [
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
+  QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.RELATION_COLUMN,
   QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
   QUERY_BUILDER_VARIABLE_DND_TYPE,
 ];
@@ -813,6 +816,55 @@ export const QueryBuilderFilterPropertyExpressionBadge = observer(
   },
 );
 
+export const QueryBuilderFilterRelationColumnBadge = observer(
+  (props: {
+    rightConditionValue: FilterRelationColumnConditionValueState;
+    resetNode: () => void;
+  }) => {
+    const { rightConditionValue, resetNode } = props;
+    const type = rightConditionValue.type;
+
+    return (
+      <div className="query-builder-filter-property-expression-badge">
+        <div className="query-builder-filter-property-expression-badge__content">
+          <div
+            className={clsx(
+              'query-builder-filter-property-expression-badge__type',
+              {
+                'query-builder-filter-property-expression-badge__type--class':
+                  type instanceof Class,
+                'query-builder-filter-property-expression-badge__type--enumeration':
+                  type instanceof Enumeration,
+                'query-builder-filter-property-expression-badge__type--primitive':
+                  type instanceof PrimitiveType ||
+                  type instanceof PrecisePrimitiveType,
+              },
+            )}
+          >
+            {renderPropertyTypeIcon(type)}
+          </div>
+          <div
+            className="query-builder-filter-property-expression-badge__property"
+            title={rightConditionValue.columnName}
+          >
+            <div className="query-builder__property__name__display__content">
+              {rightConditionValue.columnName}
+            </div>
+          </div>
+          <button
+            className="query-builder-filter-property-expression-badge__action"
+            name="Reset"
+            title="Reset"
+            onClick={resetNode}
+          >
+            <RefreshIcon />
+          </button>
+        </div>
+      </div>
+    );
+  },
+);
+
 const canDropTypeOntoNodeValue = (
   type: Type | undefined,
   condition: FilterConditionState,
@@ -917,6 +969,35 @@ const QueryBuilderFilterConditionEditor = observer(
               const variable = (item as QueryBuilderVariableDragSource)
                 .variable;
               node.condition.buildRightConditionValueFromValueSpec(variable);
+            } else if (
+              type === QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.RELATION_COLUMN
+            ) {
+              if (
+                !(
+                  node.condition.sourceState instanceof
+                  FilterRelationColumnSourceState
+                )
+              ) {
+                throw new UnsupportedOperationError(
+                  'Relation columns can only be used as filter condition values when the filter source is a relation column.',
+                );
+              }
+              const columnNode = (
+                item as QueryBuilderExplorerTreeRelationColumnDragSource
+              ).node;
+              if (
+                columnNode.column.multiplicity.upperBound === undefined ||
+                columnNode.column.multiplicity.upperBound > 1
+              ) {
+                throw new UnsupportedOperationError(
+                  'Collection types are not supported for filter condition values.',
+                );
+              }
+              node.condition.buildRightConditionValueFromRelationColumn(
+                columnNode.column.name,
+                columnNode.column.genericType.value.rawType,
+                columnNode.column.multiplicity,
+              );
             } else {
               applicationStore.notificationService.notifyWarning(
                 `Dragging and Dropping ${type} to filter panel is not supported.`,
@@ -1078,6 +1159,26 @@ const QueryBuilderFilterConditionEditor = observer(
             </PanelEntryDropZonePlaceholder>
           </div>
         );
+      } else if (
+        rightConditionValue instanceof FilterRelationColumnConditionValueState
+      ) {
+        return (
+          <div
+            ref={ref}
+            className="query-builder-filter-tree__condition-node__value"
+          >
+            <PanelEntryDropZonePlaceholder
+              isDragOver={isFilterValueDragOver}
+              isDroppable={isFilterValueDroppable}
+              label="Change Filter Value"
+            >
+              <QueryBuilderFilterRelationColumnBadge
+                rightConditionValue={rightConditionValue}
+                resetNode={resetNode}
+              />
+            </PanelEntryDropZonePlaceholder>
+          </div>
+        );
       }
       return null;
     };

package/src/components/shared/BasicValueSpecificationEditor.tsx

@@ -49,6 +49,7 @@ import {
   EnumValueInstanceValue,
   GenericType,
   GenericTypeExplicitReference,
+  getCorrespondingStandardPrimitiveType,
   getMultiplicityDescription,
   getPrimitiveTypeInstanceFromEnum,
   InstanceValue,
@@ -56,6 +57,7 @@ import {
   isSubType,
   matchFunctionName,
   PRIMITIVE_TYPE,
+  PrecisePrimitiveType,
   PrimitiveInstanceValue,
   PrimitiveType,
   SimpleFunctionExpression,
@@ -785,6 +787,20 @@ const getPlaceHolder = (expectedType: Type | V1_PackageableType): string => {
       default:
         return 'Add';
     }
+  } else if (expectedType instanceof PrecisePrimitiveType) {
+    // Precise primitive types (e.g. Varchar, BigInt, Timestamp) flow in from
+    // accessor relation columns. Map them to their standard primitive
+    // equivalent so we can pick the right placeholder.
+    switch (getCorrespondingStandardPrimitiveType(expectedType.path)) {
+      case PRIMITIVE_TYPE.DATE:
+      case PRIMITIVE_TYPE.STRICTDATE:
+        return 'yyyy-mm-dd';
+      case PRIMITIVE_TYPE.DATETIME:
+      case PRIMITIVE_TYPE.STRICTTIME:
+        return 'yyyy-mm-ddThh:mm:ss';
+      default:
+        return 'Add';
+    }
   } else if (expectedType instanceof V1_PackageableType) {
     switch (expectedType.fullPath) {
       case PRIMITIVE_TYPE.DATE:

package/src/components/shared/QueryBuilderFilterHelper.ts

@@ -18,6 +18,7 @@ import type { Type } from '@finos/legend-graph';
 import {
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
   type QueryBuilderExplorerTreeDragSource,
+  type QueryBuilderExplorerTreeRelationColumnDragSource,
 } from '../../stores/explorer/QueryBuilderExplorerState.js';
 import {
   QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
@@ -46,6 +47,9 @@ export const getDNDItemType = (
     case QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY:
       return (item as QueryBuilderExplorerTreeDragSource).node.property
         .genericType.value.rawType;
+    case QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.RELATION_COLUMN:
+      return (item as QueryBuilderExplorerTreeRelationColumnDragSource).node
+        .column.genericType.value.rawType;
     case QUERY_BUILDER_VARIABLE_DND_TYPE:
       return (item as QueryBuilderVariableDragSource).variable.genericType
         ?.value.rawType;

package/src/stores/QueryBuilderStateHashUtils.ts

@@ -98,6 +98,7 @@ export enum QUERY_BUILDER_STATE_HASH_STRUCTURE {
   FILTER_CONDITION_SOURCE_RELATION_COLUMN = 'FILTER_CONDITION_SOURCE_RELATION_COLUMN',
   FILTER_CONDITION_RIGHT_VALUE = 'FILTER_CONDITION_RIGHT_VALUE',
   FILTER_CONDITION_RIGHT_VALUE_SPEC = 'FILTER_CONDITION_RIGHT_VALUE_SPEC',
+  FILTER_CONDITION_RIGHT_VALUE_RELATION_COLUMN = 'FILTER_CONDITION_RIGHT_VALUE_RELATION_COLUMN',
   FILTER_OPERATOR_CONTAIN = 'FILTER_OPERATOR_CONTAIN',
   FILTER_OPERATOR_NOT_CONTAIN = 'FILTER_OPERATOR_NOT_CONTAIN',
   FILTER_OPERATOR_END_WITH = 'FILTER_OPERATOR_END_WITH',

package/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.ts

@@ -22,6 +22,7 @@ import {
   matchFunctionName,
   VariableExpression,
   FunctionExpression,
+  RelationColumn,
   type SimpleFunctionExpression,
   type ValueSpecification,
 } from '@finos/legend-graph';
@@ -141,6 +142,27 @@ const buildPostFilterConditionValueState = (
       );
       return;
     }
+  } else if (
+    rightVal instanceof FunctionExpression &&
+    rightVal.func instanceof RelationColumn
+  ) {
+    // Handle relation-column accessor on the right-hand side (e.g. when the
+    // post-filter source is an accessor / relation-based projection).
+    const rightCol = returnUndefOnError(() =>
+      getTDSColumnState(
+        conditionState.postFilterState.tdsState,
+        (rightVal.func as RelationColumn).name,
+      ),
+    );
+    if (rightCol) {
+      conditionState.setRightConditionVal(
+        new PostFilterTDSColumnValueConditionValueState(
+          conditionState,
+          rightCol,
+        ),
+      );
+      return;
+    }
   }
   const val = rightVal
     ? simplifyValueExpression(

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts

@@ -22,6 +22,7 @@ import {
   type LambdaFunction,
   CollectionInstanceValue,
   Enumeration,
+  getPrimitiveTypeInstanceFromEnum,
   PRIMITIVE_TYPE,
   VariableExpression,
   GenericTypeExplicitReference,
@@ -98,6 +99,15 @@ export class QueryBuilderPostFilterOperator_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 (
           (
             [
@@ -106,7 +116,7 @@ export class QueryBuilderPostFilterOperator_In
               PRIMITIVE_TYPE.DECIMAL,
               PRIMITIVE_TYPE.FLOAT,
             ] as string[]
-          ).includes(propertyType.path)
+          ).includes(normalizedPropertyTypePath)
         ) {
           return (
             [
@@ -115,9 +125,12 @@ export class QueryBuilderPostFilterOperator_In
               PRIMITIVE_TYPE.DECIMAL,
               PRIMITIVE_TYPE.FLOAT,
             ] as string[]
-          ).includes(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) {
@@ -135,9 +148,17 @@ export class QueryBuilderPostFilterOperator_In
     const propertyType = guaranteeNonNullable(
       postFilterConditionState.leftConditionValue.getColumnType(),
     );
+    // 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/filter/QueryBuilderFilterState.ts

@@ -93,7 +93,8 @@ export type QueryBuilderFilterNodeDropTarget =
 export type QueryBuilderFilterValueDropTarget =
   | QueryBuilderVariableDragSource
   | QueryBuilderProjectionColumnDragSource
-  | QueryBuilderExplorerTreeDragSource;
+  | QueryBuilderExplorerTreeDragSource
+  | QueryBuilderExplorerTreeRelationColumnDragSource;
 
 export type QueryBuilderFilterConditionRearrangeDropTarget =
   QueryBuilderFilterConditionDragSource;
@@ -237,6 +238,64 @@ export class FilterPropertyExpressionStateConditionValueState extends FilterCond
   }
 }
 
+// This class is used to represent the value of a filter condition when the value is
+// a relation column accessor (which comes from DND a relation column from the explorer
+// tree or from the fetch structure panel). Used when the filter source is also a
+// relation column, allowing expressions like `$x.colA == $x.colB`.
+export class FilterRelationColumnConditionValueState extends FilterConditionValueState {
+  columnName: string;
+  columnType: Type;
+  columnMultiplicity: Multiplicity;
+
+  constructor(
+    conditionState: FilterConditionState,
+    columnName: string,
+    columnType: Type,
+    columnMultiplicity: Multiplicity,
+  ) {
+    super(conditionState);
+    makeObservable(this, {
+      columnName: observable,
+      columnType: observable,
+      columnMultiplicity: observable,
+      changeColumn: action,
+    });
+    this.columnName = columnName;
+    this.columnType = columnType;
+    this.columnMultiplicity = columnMultiplicity;
+  }
+
+  override get type(): Type {
+    return this.columnType;
+  }
+
+  override get isCollection(): boolean {
+    return (
+      this.columnMultiplicity.upperBound === undefined ||
+      this.columnMultiplicity.upperBound > 1
+    );
+  }
+
+  changeColumn(
+    columnName: string,
+    columnType: Type,
+    columnMultiplicity: Multiplicity,
+  ): void {
+    this.columnName = columnName;
+    this.columnType = columnType;
+    this.columnMultiplicity = columnMultiplicity;
+  }
+
+  override get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_CONDITION_RIGHT_VALUE_RELATION_COLUMN,
+      this.columnName,
+      this.columnMultiplicity.lowerBound,
+      this.columnMultiplicity.upperBound ?? '',
+    ]);
+  }
+}
+
 /**
  * Abstract base class for the left-hand side (source) of a filter condition.
  * This allows filtering on different source types (class properties, relation columns)
@@ -403,6 +462,7 @@ export class FilterConditionState implements Hashable {
       addExistsLambdaParamNames: action,
       buildRightConditionValueFromValueSpec: action,
       buildRightConditionValueFromPropertyExpressionState: action,
+      buildRightConditionValueFromRelationColumn: action,
       handleTypeaheadSearch: flow,
       operators: computed,
       hashCode: computed,
@@ -582,6 +642,32 @@ export class FilterConditionState implements Hashable {
     }
   }
 
+  buildRightConditionValueFromRelationColumn(
+    columnName: string,
+    columnType: Type,
+    columnMultiplicity: Multiplicity,
+  ): void {
+    if (
+      this.rightConditionValue instanceof
+      FilterRelationColumnConditionValueState
+    ) {
+      this.rightConditionValue.changeColumn(
+        columnName,
+        columnType,
+        columnMultiplicity,
+      );
+    } else {
+      this.setRightConditionValue(
+        new FilterRelationColumnConditionValueState(
+          this,
+          columnName,
+          columnType,
+          columnMultiplicity,
+        ),
+      );
+    }
+  }
+
   get hashCode(): string {
     return hashArray([
       QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_CONDITION_STATE,

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

@@ -24,11 +24,14 @@ import {
   LambdaFunction,
   FunctionExpression,
   RelationColumn,
+  Multiplicity,
+  VariableExpression,
 } from '@finos/legend-graph';
 import { guaranteeType, assertTrue } from '@finos/legend-shared';
 import {
   FilterConditionState,
   FilterPropertyExpressionStateConditionValueState,
+  FilterRelationColumnConditionValueState,
   FilterRelationColumnSourceState,
   FilterValueSpecConditionValueState,
   type QueryBuilderFilterState,
@@ -76,6 +79,33 @@ export const buildFilterConditionExpression = (
       resolvedLambdaParameterName,
     );
     expression.parametersValues.push(rightConditionPropertyExpression);
+  } else if (
+    filterConditionState.rightConditionValue &&
+    filterConditionState.rightConditionValue instanceof
+      FilterRelationColumnConditionValueState
+  ) {
+    const rightValue = filterConditionState.rightConditionValue;
+    const relationType =
+      filterConditionState.filterState.queryBuilderState.sourceRelationType;
+    if (!relationType) {
+      throw new Error(
+        `Can't build expression for relation column '${rightValue.columnName}': no source relation type`,
+      );
+    }
+    const col = relationType.columns.find(
+      (c) => c.name === rightValue.columnName,
+    );
+    if (!col) {
+      throw new Error(
+        `Can't find column '${rightValue.columnName}' in relation`,
+      );
+    }
+    const colFuncExp = new FunctionExpression(col.name);
+    colFuncExp.func = col;
+    colFuncExp.parametersValues = [
+      new VariableExpression(resolvedLambdaParameterName, Multiplicity.ONE),
+    ];
+    expression.parametersValues.push(colFuncExp);
   }
   return expression;
 };
@@ -221,6 +251,19 @@ export const buildFilterConditionState = (
           ),
         ),
       );
+    } else if (
+      value instanceof FunctionExpression &&
+      value.func instanceof RelationColumn
+    ) {
+      const col = value.func;
+      filterConditionState.setRightConditionValue(
+        new FilterRelationColumnConditionValueState(
+          filterConditionState,
+          col.name,
+          col.genericType.value.rawType,
+          col.multiplicity,
+        ),
+      );
     } else {
       filterConditionState.setRightConditionValue(
         new FilterValueSpecConditionValueState(