@contember/engine-content-api 1.2.0-alpha.9 → 1.2.0-beta.2

package/dist/src/mapper/select/WhereBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WhereBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,gBAAgB,IAAI,mBAAmB,EAA0B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACpH,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAJd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc;IAGzC,KAAK,CACX,EAAE,EAAE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACvC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,aAAa,GAAE,OAAe;IAKxB,aAAa,CACnB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,mBAAmB,KAAK,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACjH,aAAa,GAAE,OAAe;IAY/B,OAAO,CAAC,aAAa;IA0IrB,OAAO,CAAC,yBAAyB;IAoCjC,OAAO,CAAC,gCAAgC;CA2CxC;AAED,oBAAY,mBAAmB,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAA"}
+{"version":3,"file":"WhereBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EACN,gBAAgB,IAAI,mBAAmB,EAIvC,aAAa,EACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAEnF,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBALxB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,wBAAwB,EAAE,OAAO;IAG5C,KAAK,CACX,EAAE,EAAE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACvC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,iBAAiB,GAAE,sBAA2B;IAaxC,aAAa,CACnB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,mBAAmB,KAAK,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACjH,iBAAiB,GAAE,sBAA2B;IAY/C,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,cAAc;IAiLtB,OAAO,CAAC,yBAAyB;IAsCjC,OAAO,CAAC,gCAAgC;IA4CxC,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,kBAAkB;CAe1B;AAED,oBAAY,mBAAmB,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAA"}

package/dist/src/mapper/select/WhereBuilder.js

@@ -5,44 +5,86 @@ const utils_1 = require("../../utils");
 const schema_utils_1 = require("@contember/schema-utils");
 const database_1 = require("@contember/database");
 class WhereBuilder {
-    constructor(schema, joinBuilder, conditionBuilder, pathFactory, whereOptimizer) {
+    constructor(schema, joinBuilder, conditionBuilder, pathFactory, whereOptimizer, useExistsInHasManyFilter) {
         this.schema = schema;
         this.joinBuilder = joinBuilder;
         this.conditionBuilder = conditionBuilder;
         this.pathFactory = pathFactory;
         this.whereOptimizer = whereOptimizer;
+        this.useExistsInHasManyFilter = useExistsInHasManyFilter;
     }
-    build(qb, entity, path, where, allowManyJoin = false) {
-        return this.buildAdvanced(entity, path, where, cb => qb.where(clause => cb(clause)), allowManyJoin);
+    build(qb, entity, path, where, optimizationHints = {}) {
+        const optimizedWhere = this.whereOptimizer.optimize(where, entity, optimizationHints);
+        return this.buildInternal({
+            entity,
+            path,
+            where: optimizedWhere,
+            callback: cb => qb.where(clause => cb(clause)),
+            allowManyJoin: false,
+        });
     }
-    buildAdvanced(entity, path, where, callback, allowManyJoin = false) {
-        const optimizedWhere = this.whereOptimizer.optimize(where, entity);
+    buildAdvanced(entity, path, where, callback, optimizationHints = {}) {
+        const optimizedWhere = this.whereOptimizer.optimize(where, entity, optimizationHints);
+        return this.buildInternal({
+            entity,
+            path,
+            where: optimizedWhere,
+            callback,
+            allowManyJoin: false,
+        });
+    }
+    buildInternal({ callback, ...args }) {
         const joinList = [];
-        const qbWithWhere = callback(clause => this.buildInternal(clause, entity, path, optimizedWhere, allowManyJoin, joinList));
+        const qbWithWhere = callback(clause => this.buildRecursive({
+            conditionBuilder: clause,
+            joinList: joinList,
+            ...args,
+        }));
         return joinList.reduce((qb, { path, entity, relationName }) => this.joinBuilder.join(qb, path, entity, relationName), qbWithWhere);
     }
-    buildInternal(conditionBuilder, entity, path, where, allowManyJoin, joinList) {
+    buildRecursive({ conditionBuilder, entity, path, where, joinList, allowManyJoin, }) {
         const tableName = path.alias;
         if (where.and !== undefined && where.and.length > 0) {
             const expr = where.and;
-            conditionBuilder = conditionBuilder.and(clause => expr.reduce((clause2, where) => !where ? clause2 : this.buildInternal(clause2, entity, path, where, allowManyJoin, joinList), clause));
+            conditionBuilder = conditionBuilder.and(clause => expr.reduce((clause2, where) => !where ? clause2 : this.buildRecursive({
+                conditionBuilder: clause2,
+                entity,
+                path,
+                where,
+                joinList,
+                allowManyJoin,
+            }), clause));
         }
         if (where.or !== undefined && where.or.length > 0) {
             const expr = where.or;
             conditionBuilder = conditionBuilder.or(clause => expr.reduce((clause2, where) => !where
                 ? clause2
-                : clause2.and(clause3 => this.buildInternal(clause3, entity, path, where, allowManyJoin, joinList)), clause));
+                : clause2.and(clause3 => this.buildRecursive({
+                    conditionBuilder: clause3,
+                    entity,
+                    path,
+                    where,
+                    joinList,
+                    allowManyJoin,
+                })), clause));
         }
         if (where.not !== undefined) {
             const expr = where.not;
-            conditionBuilder = conditionBuilder.not(clause => this.buildInternal(clause, entity, path, expr, allowManyJoin, joinList));
+            conditionBuilder = conditionBuilder.not(clause => this.buildRecursive({
+                conditionBuilder: clause,
+                entity,
+                path,
+                where: expr,
+                joinList,
+                allowManyJoin,
+            }));
         }
         for (const fieldName in where) {
             if (fieldName === 'and' || fieldName === 'or' || fieldName === 'not') {
                 continue;
             }
-            const joinedWhere = (entity, relation, targetEntity) => {
-                const targetPath = path.for(fieldName);
+            const targetPath = path.for(fieldName);
+            const joinedWhere = ({ targetEntity, relation, entity }) => {
                 const relationWhere = where[fieldName];
                 if (Object.keys(relationWhere).length === 0) {
                     return conditionBuilder;
@@ -54,58 +96,84 @@ class WhereBuilder {
                     }
                 }
                 joinList.push({ path: targetPath, entity, relationName: relation.name });
-                return this.buildInternal(conditionBuilder, targetEntity, targetPath, relationWhere, allowManyJoin, joinList);
+                return this.buildRecursive({
+                    conditionBuilder,
+                    entity: targetEntity,
+                    path: targetPath,
+                    where: relationWhere,
+                    joinList,
+                    allowManyJoin,
+                });
             };
             conditionBuilder = (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, fieldName, {
-                visitColumn: (entity, column) => {
+                visitColumn: ({ entity, column }) => {
                     const subWhere = where[column.name];
                     return this.conditionBuilder.build(conditionBuilder, tableName, column.columnName, column.columnType, subWhere);
                 },
                 visitOneHasOneInverse: joinedWhere,
                 visitOneHasOneOwning: joinedWhere,
                 visitManyHasOne: joinedWhere,
-                visitManyHasManyInverse: (entity, relation, targetEntity, targetRelation) => {
-                    if (allowManyJoin) {
-                        return joinedWhere(entity, relation, targetEntity);
+                visitManyHasManyInverse: context => {
+                    if (allowManyJoin && !this.useExistsInHasManyFilter) {
+                        return joinedWhere(context);
                     }
                     const relationWhere = where[fieldName];
-                    return conditionBuilder.exists(this.createManyHasManySubquery([tableName, entity.primaryColumn], relationWhere, targetEntity, targetRelation.joiningTable, 'inverse'));
+                    return conditionBuilder.exists(this.createManyHasManySubquery([tableName, entity.primaryColumn], relationWhere, context.targetEntity, context.targetRelation.joiningTable, 'inverse', targetPath));
                 },
-                visitManyHasManyOwning: (entity, relation, targetEntity) => {
-                    if (allowManyJoin) {
-                        return joinedWhere(entity, relation, targetEntity);
+                visitManyHasManyOwning: context => {
+                    if (allowManyJoin && !this.useExistsInHasManyFilter) {
+                        return joinedWhere(context);
                     }
                     const relationWhere = where[fieldName];
-                    return conditionBuilder.exists(this.createManyHasManySubquery([tableName, entity.primaryColumn], relationWhere, targetEntity, relation.joiningTable, 'owning'));
+                    return conditionBuilder.exists(this.createManyHasManySubquery([tableName, entity.primaryColumn], relationWhere, context.targetEntity, context.relation.joiningTable, 'owning', targetPath));
                 },
-                visitOneHasMany: (entity, relation, targetEntity, targetRelation) => {
-                    if (allowManyJoin) {
-                        return joinedWhere(entity, relation, targetEntity);
+                visitOneHasMany: context => {
+                    if (allowManyJoin && !this.useExistsInHasManyFilter) {
+                        return joinedWhere(context);
                     }
                     const relationWhere = where[fieldName];
-                    return conditionBuilder.exists(this.build(database_1.SelectBuilder.create()
-                        .select(it => it.raw('1'))
-                        .from(targetEntity.tableName, 'sub_')
-                        .where(it => it.columnsEq([tableName, entity.primaryColumn], ['sub_', targetRelation.joiningColumn.columnName])), targetEntity, this.pathFactory.create([], 'sub_'), relationWhere, true));
+                    const qb = this.hasRootIsNull(relationWhere, context.targetEntity)
+                        ? database_1.SelectBuilder.create()
+                            .select(it => it.raw('1'))
+                            .from(new database_1.Literal(`(select ${(0, database_1.wrapIdentifier)(tableName)}.${(0, database_1.wrapIdentifier)(entity.primaryColumn)})`), targetPath.for('tmp_').alias)
+                            .leftJoin(context.targetEntity.tableName, targetPath.alias, it => it.columnsEq([targetPath.for('tmp_').alias, entity.primaryColumn], [targetPath.alias, context.targetRelation.joiningColumn.columnName]))
+                        : database_1.SelectBuilder.create()
+                            .select(it => it.raw('1'))
+                            .from(context.targetEntity.tableName, targetPath.alias)
+                            .where(it => it.columnsEq([tableName, entity.primaryColumn], [targetPath.alias, context.targetRelation.joiningColumn.columnName]));
+                    return conditionBuilder.exists(this.buildInternal({
+                        entity: context.targetEntity,
+                        path: targetPath,
+                        where: relationWhere,
+                        callback: cb => qb.where(clause => cb(clause)),
+                        allowManyJoin: true,
+                    }));
                 },
             });
         }
         return conditionBuilder;
     }
-    createManyHasManySubquery(outerColumn, relationWhere, targetEntity, joiningTable, fromSide) {
+    createManyHasManySubquery(outerColumn, relationWhere, targetEntity, joiningTable, fromSide, path) {
         const fromColumn = fromSide === 'owning' ? joiningTable.joiningColumn.columnName : joiningTable.inverseJoiningColumn.columnName;
         const toColumn = fromSide === 'owning' ? joiningTable.inverseJoiningColumn.columnName : joiningTable.joiningColumn.columnName;
+        const junctionPath = path.for('junction_');
         const qb = database_1.SelectBuilder.create()
-            .from(joiningTable.tableName, 'junction_')
+            .from(joiningTable.tableName, junctionPath.alias)
             .select(it => it.raw('1'))
-            .where(it => it.columnsEq(outerColumn, ['junction_', fromColumn]));
+            .where(it => it.columnsEq(outerColumn, [junctionPath.alias, fromColumn]));
         const primaryCondition = this.transformWhereToPrimaryCondition(relationWhere, targetEntity.primary);
         if (primaryCondition !== null) {
             const columnType = targetEntity.fields[targetEntity.primary].columnType;
-            return qb.where(condition => this.conditionBuilder.build(condition, 'junction_', toColumn, columnType, primaryCondition));
+            return qb.where(condition => this.conditionBuilder.build(condition, junctionPath.alias, toColumn, columnType, primaryCondition));
         }
-        const qbJoined = qb.join(targetEntity.tableName, 'sub_', clause => clause.compareColumns(['junction_', toColumn], database_1.Operator.eq, ['sub_', targetEntity.primary]));
-        return this.buildAdvanced(targetEntity, this.pathFactory.create([], 'sub_'), relationWhere, cb => qbJoined.where(clause => cb(clause)), true);
+        const qbJoined = qb.join(targetEntity.tableName, path.alias, clause => clause.compareColumns([junctionPath.alias, toColumn], database_1.Operator.eq, [path.alias, targetEntity.primary]));
+        return this.buildInternal({
+            entity: targetEntity,
+            path: this.pathFactory.create([], path.fullAlias),
+            where: relationWhere,
+            callback: cb => qbJoined.where(clause => cb(clause)),
+            allowManyJoin: true,
+        });
     }
     transformWhereToPrimaryCondition(where, primaryField) {
         const keys = Object.keys(where);
@@ -146,6 +214,40 @@ class WhereBuilder {
         }
         return condition;
     }
+    hasRootIsNull(where, entity) {
+        var _a;
+        for (const key in where) {
+            if (key === 'and' || key === 'or') {
+                if ((_a = where[key]) === null || _a === void 0 ? void 0 : _a.some(it => this.hasRootIsNull(it, entity))) {
+                    return true;
+                }
+            }
+            else if (key === 'not') {
+                if (where.not && this.hasRootIsNull(where.not, entity)) {
+                    return true;
+                }
+            }
+            else if ((0, schema_utils_1.isColumn)(entity.fields[key]) && this.conditionHasIsNull(where[key])) {
+                return true;
+            }
+        }
+        return false;
+    }
+    conditionHasIsNull(cond) {
+        if (cond.isNull !== undefined) {
+            return true;
+        }
+        if (cond.and && cond.and.some(it => this.conditionHasIsNull(it))) {
+            return true;
+        }
+        if (cond.or && cond.or.some(it => this.conditionHasIsNull(it))) {
+            return true;
+        }
+        if (cond.not && this.conditionHasIsNull(cond.not)) {
+            return true;
+        }
+        return false;
+    }
 }
 exports.WhereBuilder = WhereBuilder;
 //# sourceMappingURL=WhereBuilder.js.map

package/dist/src/mapper/select/WhereBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"WhereBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":";;;AAAA,uCAAkC;AAClC,0DAA4D;AAK5D,kDAAoH;AAGpH,MAAa,YAAY;IACxB,YACkB,MAAoB,EACpB,WAAwB,EACxB,gBAAkC,EAClC,WAAwB,EACxB,cAA8B;QAJ9B,WAAM,GAAN,MAAM,CAAc;QACpB,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;IAC7C,CAAC;IAEG,KAAK,CACX,EAAuC,EACvC,MAAoB,EACpB,IAAU,EACV,KAA0B,EAC1B,gBAAyB,KAAK;QAE9B,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,CAAA;IACpG,CAAC;IAEM,aAAa,CACnB,MAAoB,EACpB,IAAU,EACV,KAA0B,EAC1B,QAAiH,EACjH,gBAAyB,KAAK;QAE9B,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAClE,MAAM,QAAQ,GAA0B,EAAE,CAAA;QAE1C,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAA;QACzH,OAAO,QAAQ,CAAC,MAAM,CACrB,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAC7F,WAAW,CACX,CAAA;IACF,CAAC;IAEO,aAAa,CACpB,gBAAqC,EACrC,MAAoB,EACpB,IAAU,EACV,KAAkB,EAClB,aAAsB,EACtB,QAA+B;QAE/B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAA;QAE5B,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YACpD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAA;YACtB,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAChD,IAAI,CAAC,MAAM,CACV,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAClB,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,EAC7F,MAAM,CACN,CACD,CAAA;SACD;QACD,IAAI,KAAK,CAAC,EAAE,KAAK,SAAS,IAAI,KAAK,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;YAClD,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAA;YACrB,gBAAgB,GAAG,gBAAgB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAC/C,IAAI,CAAC,MAAM,CACV,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAClB,CAAC,KAAK;gBACL,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC,EACrG,MAAM,CACN,CACD,CAAA;SACD;QACD,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,EAAE;YAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAA;YACtB,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAChD,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,CACvE,CAAA;SACD;QAED,KAAK,MAAM,SAAS,IAAI,KAAK,EAAE;YAC9B,IAAI,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,KAAK,EAAE;gBACrE,SAAQ;aACR;YAED,MAAM,WAAW,GAAG,CACnB,MAAoB,EACpB,QAAwB,EACxB,YAA0B,EACJ,EAAE;gBACxB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;gBACtC,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAgB,CAAA;gBACrD,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC5C,OAAO,gBAAgB,CAAA;iBACvB;gBACD,IAAI,IAAA,YAAI,EAA8B,QAAQ,EAAE,eAAe,CAAC,EAAE;oBACjE,MAAM,gBAAgB,GAAG,IAAI,CAAC,gCAAgC,CAAC,aAAa,EAAE,YAAY,CAAC,OAAO,CAAC,CAAA;oBACnG,IAAI,gBAAgB,KAAK,IAAI,EAAE;wBAC9B,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CACjC,gBAAgB,EAChB,SAAS,EACT,QAAQ,CAAC,aAAa,CAAC,UAAU,EAChC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAqB,CAAC,UAAU,EACzE,gBAAgB,CAChB,CAAA;qBACD;iBACD;gBAED,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;gBAExE,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAA;YAC9G,CAAC,CAAA;YAED,gBAAgB,GAAG,IAAA,iCAAkB,EAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE;gBAC1F,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;oBAC/B,MAAM,QAAQ,GAAuC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAuC,CAAA;oBAC7G,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,EAAE,SAAS,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;gBAChH,CAAC;gBACD,qBAAqB,EAAE,WAAW;gBAClC,oBAAoB,EAAE,WAAW;gBACjC,eAAe,EAAE,WAAW;gBAC5B,uBAAuB,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE;oBAC3E,IAAI,aAAa,EAAE;wBAClB,OAAO,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAA;qBAClD;oBACD,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAgB,CAAA;oBAErD,OAAO,gBAAgB,CAAC,MAAM,CAC7B,IAAI,CAAC,yBAAyB,CAC7B,CAAC,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,EACjC,aAAa,EACb,YAAY,EACZ,cAAc,CAAC,YAAY,EAC3B,SAAS,CACT,CACD,CAAA;gBACF,CAAC;gBACD,sBAAsB,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE;oBAC1D,IAAI,aAAa,EAAE;wBAClB,OAAO,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAA;qBAClD;oBAED,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAgB,CAAA;oBAErD,OAAO,gBAAgB,CAAC,MAAM,CAC7B,IAAI,CAAC,yBAAyB,CAC7B,CAAC,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,EACjC,aAAa,EACb,YAAY,EACZ,QAAQ,CAAC,YAAY,EACrB,QAAQ,CACR,CACD,CAAA;gBACF,CAAC;gBACD,eAAe,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE;oBACnE,IAAI,aAAa,EAAE;wBAClB,OAAO,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAA;qBAClD;oBAED,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAgB,CAAA;oBAErD,OAAO,gBAAgB,CAAC,MAAM,CAC7B,IAAI,CAAC,KAAK,CACT,wBAAa,CAAC,MAAM,EAAE;yBACpB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;yBACzB,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC;yBACpC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,EACjH,YAAY,EACZ,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,EACnC,aAAa,EACb,IAAI,CACJ,CACD,CAAA;gBACF,CAAC;aACD,CAAC,CAAA;SACF;QACD,OAAO,gBAAgB,CAAA;IACxB,CAAC;IAEO,yBAAyB,CAChC,WAA0C,EAC1C,aAA0B,EAC1B,YAA0B,EAC1B,YAAgC,EAChC,QAA8B;QAE9B,MAAM,UAAU,GAAG,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAAA;QAC/H,MAAM,QAAQ,GAAG,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAA;QAC7H,MAAM,EAAE,GAAG,wBAAa,CAAC,MAAM,EAAwB;aACrD,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,WAAW,CAAC;aACzC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACzB,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;QAEnE,MAAM,gBAAgB,GAAG,IAAI,CAAC,gCAAgC,CAAC,aAAa,EAAE,YAAY,CAAC,OAAO,CAAC,CAAA;QACnG,IAAI,gBAAgB,KAAK,IAAI,EAAE;YAE9B,MAAM,UAAU,GAAI,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAqB,CAAC,UAAU,CAAA;YAE5F,OAAO,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAC3B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAC3F,CAAA;SACD;QAED,MAAM,QAAQ,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CACjE,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,mBAAQ,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAC3F,CAAA;QACD,OAAO,IAAI,CAAC,aAAa,CACxB,YAAY,EACZ,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,EACnC,aAAa,EACb,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAC1C,IAAI,CACJ,CAAA;IACF,CAAC;IAEO,gCAAgC,CAAC,KAAkB,EAAE,YAAoB;QAChF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC/B,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACnF,OAAO,IAAI,CAAA;SACX;QACD,IAAI,SAAS,GAIT,EAAE,CAAA;QACN,IAAI,KAAK,CAAC,GAAG,EAAE;YACd,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG;iBAC1B,MAAM,CAAC,CAAC,EAAE,EAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACvC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAA;YACpE,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAC9B,OAAO,IAAI,CAAA;aACX;YACD,SAAS,CAAC,GAAG,GAAG,UAAsC,CAAA;SACtD;QACD,IAAI,KAAK,CAAC,EAAE,EAAE;YACb,MAAM,UAAU,GAAG,KAAK,CAAC,EAAE;iBACzB,MAAM,CAAC,CAAC,EAAE,EAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACvC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAA;YACpE,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAC9B,OAAO,IAAI,CAAA;aACX;YACD,SAAS,CAAC,EAAE,GAAG,UAAsC,CAAA;SACrD;QACD,IAAI,KAAK,CAAC,GAAG,EAAE;YACd,MAAM,UAAU,GAAG,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;YACjF,IAAI,UAAU,KAAK,IAAI,EAAE;gBACxB,OAAO,IAAI,CAAA;aACX;YACD,SAAS,CAAC,GAAG,GAAG,UAAoC,CAAA;SACpD;QACD,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE;YACxB,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAA2B,CAAC,EAAE,CAAA;aAC1E;YACD,OAAO,KAAK,CAAC,YAAY,CAA2B,CAAA;SACpD;QACD,OAAO,SAAS,CAAA;IACjB,CAAC;CACD;AA7PD,oCA6PC"}
+{"version":3,"file":"WhereBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts

@@ -11,13 +11,15 @@ export declare class FieldsVisitor implements Model.RelationByTypeVisitor<void>,
     private readonly whereBuilder;
     private readonly mapper;
     private readonly executionContext;
-    constructor(schema: Model.Schema, relationFetcher: RelationFetcher, predicateFactory: PredicateFactory, whereBuilder: WhereBuilder, mapper: Mapper, executionContext: SelectExecutionHandlerContext);
-    visitColumn(entity: Model.Entity, column: Model.AnyColumn): void;
-    visitManyHasManyInverse(entity: Model.Entity, relation: Model.ManyHasManyInverseRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyOwningRelation): void;
-    visitManyHasManyOwning(entity: Model.Entity, relation: Model.ManyHasManyOwningRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyInverseRelation | null): void;
-    visitOneHasMany(entity: Model.Entity, relation: Model.OneHasManyRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasOneRelation): void;
-    visitOneHasOneInverse(entity: Model.Entity, relation: Model.OneHasOneInverseRelation, targetEntity: Model.Entity, targetRelation: Model.OneHasOneOwningRelation): void;
-    visitOneHasOneOwning(entity: Model.Entity, relation: Model.OneHasOneOwningRelation, targetEntity: Model.Entity, targetRelation: Model.OneHasOneInverseRelation | null): void;
-    visitManyHasOne(entity: Model.Entity, relation: Model.ManyHasOneRelation, targetEntity: Model.Entity, targetRelation: Model.OneHasManyRelation | null): void;
+    private readonly relationPath;
+    constructor(schema: Model.Schema, relationFetcher: RelationFetcher, predicateFactory: PredicateFactory, whereBuilder: WhereBuilder, mapper: Mapper, executionContext: SelectExecutionHandlerContext, relationPath: Model.AnyRelationContext[]);
+    visitColumn({ entity, column }: Model.ColumnContext): void;
+    visitManyHasManyInverse(relationContext: Model.ManyHasManyInverseContext): void;
+    visitManyHasManyOwning(relationContext: Model.ManyHasManyOwningContext): void;
+    visitOneHasMany(relationContext: Model.OneHasManyContext): void;
+    visitOneHasOneInverse(relationContext: Model.OneHasOneInverseContext): void;
+    visitOneHasOneOwning(relationContext: Model.OneHasOneOwningContext): void;
+    visitManyHasOne(relationContext: Model.ManyHasOneContext): void;
+    private getRequiredPredicate;
 }
 //# sourceMappingURL=FieldsVisitor.d.ts.map

package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FieldsVisitor.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/handlers/FieldsVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAE9C,qBAAa,aAAc,YAAW,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC;IAEhG,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBALhB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,6BAA6B;IAGjE,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,GAAG,IAAI;IAkCzD,uBAAuB,CAC7B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,EAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,GAC7C,IAAI;IAuBA,sBAAsB,CAC5B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,GACrD,IAAI;IAsBA,eAAe,CACrB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GACtC,IAAI;IAqBA,qBAAqB,CAC3B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,wBAAwB,EACxC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,uBAAuB,GAC3C,IAAI;IA0BA,oBAAoB,CAC1B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,uBAAuB,EACvC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,wBAAwB,GAAG,IAAI,GACnD,IAAI;IAwBA,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAAE,YAAY,EAAE,KAAK,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,CAAC,kBAAkB,GAAG,IAAI,GAAG,IAAI;CAuBnK"}
+{"version":3,"file":"FieldsVisitor.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/handlers/FieldsVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAE9C,qBAAa,aAAc,YAAW,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC;IAEhG,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBANZ,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,6BAA6B,EAC/C,YAAY,EAAE,KAAK,CAAC,kBAAkB,EAAE;IAG1D,WAAW,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,aAAa,GAAG,IAAI;IAWnD,uBAAuB,CAAC,eAAe,EAAE,KAAK,CAAC,yBAAyB,GAAG,IAAI;IAoB/E,sBAAsB,CAAC,eAAe,EAAE,KAAK,CAAC,wBAAwB,GAAG,IAAI;IAqB7E,eAAe,CAAC,eAAe,EAAE,KAAK,CAAC,iBAAiB,GAAG,IAAI;IAqB/D,qBAAqB,CAAC,eAAe,EAAE,KAAK,CAAC,uBAAuB,GAAG,IAAI;IA+B3E,oBAAoB,CAAC,eAAe,EAAE,KAAK,CAAC,sBAAsB,GAAG,IAAI;IA6BzE,eAAe,CAAC,eAAe,EAAE,KAAK,CAAC,iBAAiB,GAAG,IAAI;IA6BtE,OAAO,CAAC,oBAAoB;CAI5B"}

package/dist/src/mapper/select/handlers/FieldsVisitor.js

@@ -3,129 +3,164 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldsVisitor = void 0;
 const schema_1 = require("@contember/schema");
 class FieldsVisitor {
-    constructor(schema, relationFetcher, predicateFactory, whereBuilder, mapper, executionContext) {
+    constructor(schema, relationFetcher, predicateFactory, whereBuilder, mapper, executionContext, relationPath) {
         this.schema = schema;
         this.relationFetcher = relationFetcher;
         this.predicateFactory = predicateFactory;
         this.whereBuilder = whereBuilder;
         this.mapper = mapper;
         this.executionContext = executionContext;
+        this.relationPath = relationPath;
     }
-    visitColumn(entity, column) {
+    visitColumn({ entity, column }) {
         const columnPath = this.executionContext.path;
-        this.executionContext.addColumn(qb => {
-            const tableAlias = columnPath.back().alias;
-            const columnAlias = columnPath.alias;
-            const fieldPredicate = this.predicateFactory.shouldApplyCellLevelPredicate(entity, schema_1.Acl.Operation.read, column.name)
-                ? this.predicateFactory.create(entity, schema_1.Acl.Operation.read, [column.name])
-                : undefined;
-            if (!fieldPredicate || Object.keys(fieldPredicate).length === 0) {
-                return qb.select([tableAlias, column.columnName], columnAlias);
-            }
-            return this.whereBuilder.buildAdvanced(entity, columnPath.back(), fieldPredicate, cb => qb.select(expr => expr.case(caseExpr => caseExpr
-                .when(whenExpr => whenExpr.selectCondition(cb), thenExpr => thenExpr.select([tableAlias, column.columnName]))
-                .else(elseExpr => elseExpr.raw('null'))), columnAlias));
+        const tableAlias = columnPath.back().alias;
+        const columnAlias = columnPath.alias;
+        this.executionContext.addColumn({
+            query: qb => qb.select([tableAlias, column.columnName], columnAlias),
+            predicate: this.getRequiredPredicate(entity, column),
         });
     }
-    visitManyHasManyInverse(entity, relation, targetEntity, targetRelation) {
+    visitManyHasManyInverse(relationContext) {
         const field = this.executionContext.objectNode;
         if (!field) {
             throw new Error();
         }
-        this.executionContext.addData(entity.primary, async (ids) => this.relationFetcher.fetchManyHasManyGroups({
-            mapper: this.mapper,
-            field: field,
-            targetEntity: targetEntity,
-            sourceRelation: relation,
-            targetRelation,
-            directionFrom: 'inverse',
-            ids: ids,
-        }), []);
+        this.executionContext.addData({
+            field: relationContext.entity.primary,
+            dataProvider: async (ids) => this.relationFetcher.fetchManyHasManyGroups({
+                mapper: this.mapper,
+                field: field,
+                relationContext,
+                relationPath: this.relationPath,
+                ids: ids,
+            }),
+            defaultValue: [],
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
     }
-    visitManyHasManyOwning(entity, relation, targetEntity, targetRelation) {
+    visitManyHasManyOwning(relationContext) {
         const field = this.executionContext.objectNode;
         if (!field) {
             throw new Error();
         }
-        this.executionContext.addData(entity.primary, async (ids) => this.relationFetcher.fetchManyHasManyGroups({
-            mapper: this.mapper,
-            field: field,
-            targetEntity: targetEntity,
-            sourceRelation: relation,
-            targetRelation,
-            directionFrom: 'owning',
-            ids: ids,
-        }), []);
+        this.executionContext.addData({
+            field: relationContext.entity.primary,
+            dataProvider: async (ids) => this.relationFetcher.fetchManyHasManyGroups({
+                mapper: this.mapper,
+                field: field,
+                relationContext,
+                relationPath: this.relationPath,
+                ids: ids,
+            }),
+            defaultValue: [],
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
     }
-    visitOneHasMany(entity, relation, targetEntity, targetRelation) {
+    visitOneHasMany(relationContext) {
         const field = this.executionContext.objectNode;
         if (!field) {
             throw new Error();
         }
-        this.executionContext.addData(entity.primary, async (ids) => this.relationFetcher.fetchOneHasManyGroups({
-            mapper: this.mapper,
-            objectNode: field,
-            targetEntity: targetEntity,
-            relation: relation,
-            targetRelation: targetRelation,
-            ids: ids,
-        }), []);
+        this.executionContext.addData({
+            field: relationContext.entity.primary,
+            dataProvider: async (ids) => this.relationFetcher.fetchOneHasManyGroups({
+                mapper: this.mapper,
+                objectNode: field,
+                relationContext,
+                relationPath: this.relationPath,
+                ids: ids,
+            }),
+            defaultValue: [],
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
+    }
+    visitOneHasOneInverse(relationContext) {
+        const { entity, targetRelation, targetEntity } = relationContext;
+        this.executionContext.addData({
+            field: entity.primary,
+            dataProvider: async (ids) => {
+                const idsWhere = {
+                    [targetRelation.name]: {
+                        [entity.primary]: {
+                            in: ids,
+                        },
+                    },
+                };
+                const field = this.executionContext.objectNode;
+                if (!field) {
+                    throw new Error();
+                }
+                const where = {
+                    and: [idsWhere, field.args.filter].filter((it) => it !== undefined),
+                };
+                const objectWithWhere = field.withArg('filter', where);
+                return this.mapper.selectAssoc(targetEntity, objectWithWhere, [
+                    ...this.relationPath,
+                    relationContext,
+                ], targetRelation.name);
+            },
+            defaultValue: null,
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
     }
-    visitOneHasOneInverse(entity, relation, targetEntity, targetRelation) {
-        this.executionContext.addData(entity.primary, async (ids) => {
-            const idsWhere = {
-                [targetRelation.name]: {
-                    [entity.primary]: {
+    visitOneHasOneOwning(relationContext) {
+        const { relation, targetEntity } = relationContext;
+        this.executionContext.addData({
+            field: relation.name,
+            dataProvider: async (ids) => {
+                const idsWhere = {
+                    [targetEntity.primary]: {
                         in: ids,
                     },
-                },
-            };
-            const field = this.executionContext.objectNode;
-            if (!field) {
-                throw new Error();
-            }
-            const where = {
-                and: [idsWhere, field.args.filter].filter((it) => it !== undefined),
-            };
-            const objectWithWhere = field.withArg('filter', where);
-            return this.mapper.select(targetEntity, objectWithWhere, targetRelation, targetRelation.name);
-        }, null);
+                };
+                const objectNode = this.executionContext.objectNode;
+                if (!objectNode) {
+                    throw new Error();
+                }
+                const where = {
+                    and: [idsWhere, objectNode.args.filter].filter((it) => it !== undefined),
+                };
+                const objectWithWhere = objectNode.withArg('filter', where);
+                return this.mapper.selectAssoc(targetEntity, objectWithWhere, [
+                    ...this.relationPath,
+                    relationContext,
+                ], targetEntity.primary);
+            },
+            defaultValue: null,
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
     }
-    visitOneHasOneOwning(entity, relation, targetEntity, targetRelation) {
-        this.executionContext.addData(relation.name, async (ids) => {
-            const idsWhere = {
-                [targetEntity.primary]: {
-                    in: ids,
-                },
-            };
-            const objectNode = this.executionContext.objectNode;
-            if (!objectNode) {
-                throw new Error();
-            }
-            const where = {
-                and: [idsWhere, objectNode.args.filter].filter((it) => it !== undefined),
-            };
-            const objectWithWhere = objectNode.withArg('filter', where);
-            return this.mapper.select(targetEntity, objectWithWhere, targetRelation, targetEntity.primary);
-        }, null);
+    visitManyHasOne(relationContext) {
+        const { relation, targetEntity } = relationContext;
+        this.executionContext.addData({
+            field: relation.name,
+            dataProvider: async (ids) => {
+                const idsWhere = {
+                    [targetEntity.primary]: {
+                        in: ids,
+                    },
+                };
+                const objectNode = this.executionContext.objectNode;
+                if (!objectNode) {
+                    throw new Error();
+                }
+                const where = {
+                    and: [idsWhere, objectNode.args.filter].filter((it) => it !== undefined),
+                };
+                const objectWithWhere = objectNode.withArg('filter', where);
+                return this.mapper.selectAssoc(targetEntity, objectWithWhere, [
+                    ...this.relationPath,
+                    relationContext,
+                ], targetEntity.primary);
+            },
+            defaultValue: null,
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
     }
-    visitManyHasOne(entity, relation, targetEntity, targetRelation) {
-        this.executionContext.addData(relation.name, async (ids) => {
-            const idsWhere = {
-                [targetEntity.primary]: {
-                    in: ids,
-                },
-            };
-            const objectNode = this.executionContext.objectNode;
-            if (!objectNode) {
-                throw new Error();
-            }
-            const where = {
-                and: [idsWhere, objectNode.args.filter].filter((it) => it !== undefined),
-            };
-            const objectWithWhere = objectNode.withArg('filter', where);
-            return this.mapper.select(targetEntity, objectWithWhere, targetRelation, targetEntity.primary);
-        }, null);
+    getRequiredPredicate(entity, field) {
+        const fieldPredicate = this.predicateFactory.getFieldPredicate(entity, schema_1.Acl.Operation.read, field.name);
+        return fieldPredicate.isSameAsPrimary ? undefined : fieldPredicate.predicate;
     }
 }
 exports.FieldsVisitor = FieldsVisitor;