@sqb/connect 4.12.0 → 4.13.0

package/cjs/client/cursor.js

@@ -180,7 +180,7 @@ class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_ty
             throw new Error('To move cursor back, it needs cache to be enabled');
         const _this = this;
         await this._taskQueue
-            .enqueue(async function () {
+            .enqueue(async () => {
             /* If moving backward */
             if (step < 0) {
                 /* Seek cache */

package/cjs/client/extensions.js

@@ -1,14 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unRegisterAdapter = exports.registerAdapter = exports.adapters = void 0;
-exports.adapters = [];
-function registerAdapter(adapter) {
-    if (!adapter.driver)
-        throw new TypeError('A DatabaseAdapter must contain "driver" property');
-    exports.adapters.push(adapter);
+exports.AdapterRegistry = void 0;
+class AdapterRegistry {
+    static get size() {
+        return this.adapters.length;
+    }
+    static register(...adapters) {
+        for (const adapter of adapters) {
+            if (!adapter.driver)
+                throw new TypeError('A DatabaseAdapter must contain "driver" property');
+            this.adapters.push(adapter);
+        }
+    }
+    static forEach(callback, thisArg) {
+        return this.adapters.forEach(callback, thisArg);
+    }
+    static items() {
+        return this.adapters.values();
+    }
+    static unRegister(...extensions) {
+        this.adapters = extensions.filter(x => !extensions.includes(x));
+    }
+    static getAll(dialect) {
+        return this.adapters.filter(x => x.dialect === dialect);
+    }
+    static get(index) {
+        return this.adapters[index];
+    }
+    static findDialect(dialect) {
+        return this.adapters.find(x => x.dialect === dialect);
+    }
+    static findDriver(dialect) {
+        return this.adapters.find(x => x.driver === dialect);
+    }
+    static has(extension) {
+        return !!this.adapters.find(x => x === extension);
+    }
 }
-exports.registerAdapter = registerAdapter;
-function unRegisterAdapter(...adapter) {
-    exports.adapters = exports.adapters.filter(x => !adapter.includes(x));
-}
-exports.unRegisterAdapter = unRegisterAdapter;
+exports.AdapterRegistry = AdapterRegistry;
+AdapterRegistry.adapters = [];

package/cjs/client/helpers.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callFetchHooks = exports.normalizeRowsToArrayRows = exports.normalizeRowsToObjectRows = exports.wrapAdapterFields = exports.applyNamingStrategy = void 0;
+exports.applyNamingStrategy = applyNamingStrategy;
+exports.wrapAdapterFields = wrapAdapterFields;
+exports.normalizeRowsToObjectRows = normalizeRowsToObjectRows;
+exports.normalizeRowsToArrayRows = normalizeRowsToArrayRows;
+exports.callFetchHooks = callFetchHooks;
 const putil_varhelpers_1 = require("putil-varhelpers");
 const field_info_map_js_1 = require("./field-info-map.js");
 function applyNamingStrategy(value, namingStrategy) {
@@ -19,13 +23,14 @@ function applyNamingStrategy(value, namingStrategy) {
                 if (!value.match(/[a-z]/))
                     return (0, putil_varhelpers_1.pascalCase)(value.toLowerCase());
                 return (0, putil_varhelpers_1.pascalCase)(value);
+            default:
+                break;
         }
     }
     else if (typeof namingStrategy === 'function')
         return namingStrategy(value);
     return value;
 }
-exports.applyNamingStrategy = applyNamingStrategy;
 function wrapAdapterFields(oldFields, fieldNaming) {
     const mapFieldInfo = (f, index) => {
         const name = applyNamingStrategy(f.fieldName, fieldNaming);
@@ -43,15 +48,12 @@ function wrapAdapterFields(oldFields, fieldNaming) {
     });
     return result;
 }
-exports.wrapAdapterFields = wrapAdapterFields;
 function normalizeRowsToObjectRows(fields, rowType, oldRows, options) {
     return normalizeRows(fields, rowType, oldRows, { ...options, objectRows: true });
 }
-exports.normalizeRowsToObjectRows = normalizeRowsToObjectRows;
 function normalizeRowsToArrayRows(fields, rowType, oldRows, options) {
     return normalizeRows(fields, rowType, oldRows, { ...options, objectRows: false });
 }
-exports.normalizeRowsToArrayRows = normalizeRowsToArrayRows;
 function normalizeRows(fields, rowType, oldRows, options) {
     const ignoreNulls = options.ignoreNulls && options.objectRows;
     const transform = options.transform;
@@ -130,4 +132,3 @@ function callFetchHooks(rows, request) {
         }
     }
 }
-exports.callFetchHooks = callFetchHooks;

package/cjs/client/sqb-client.js

@@ -20,12 +20,12 @@ class SqbClient extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict
             throw new TypeError('Configuration object required');
         let adapter;
         if (config.driver) {
-            adapter = extensions_js_1.adapters.find(x => x.driver === config.driver);
+            adapter = extensions_js_1.AdapterRegistry.findDriver(config.driver);
             if (!adapter)
                 throw new Error(`No database adapter registered for "${config.driver}" driver`);
         }
         else if (config.dialect) {
-            adapter = extensions_js_1.adapters.find(x => x.dialect === config.dialect);
+            adapter = extensions_js_1.AdapterRegistry.findDialect(config.dialect);
             if (!adapter)
                 throw new Error(`No database adapter registered for "${config.dialect}" dialect`);
         }

package/cjs/client/sqb-connection.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqbConnection = void 0;
 const tslib_1 = require("tslib");
+const builder_1 = require("@sqb/builder");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const debug_1 = tslib_1.__importDefault(require("debug"));
 const power_tasks_1 = require("power-tasks");
 const putil_varhelpers_1 = require("putil-varhelpers");
 const strict_typed_events_1 = require("strict-typed-events");
-const builder_1 = require("@sqb/builder");
 const entity_metadata_js_1 = require("../orm/model/entity-metadata.js");
 const repository_class_js_1 = require("../orm/repository.class.js");
 const cursor_js_1 = require("./cursor.js");
@@ -191,8 +191,9 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
     async setSavepoint(savepoint) {
         if (!this._intlcon)
             throw new Error('Can not call setSavepoint() on a released connection');
-        if (typeof this._intlcon.setSavepoint !== 'function')
+        if (typeof this._intlcon.setSavepoint !== 'function') {
             throw new Error(this.client.driver + ' does not support setSavepoint method');
+        }
         if (!this.inTransaction)
             await this.startTransaction();
         await this._intlcon.setSavepoint(savepoint);
@@ -201,16 +202,18 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
     async releaseSavepoint(savepoint) {
         if (!this._intlcon)
             throw new Error('Can not call releaseSavepoint() on a released connection');
-        if (typeof this._intlcon.releaseSavepoint !== 'function')
+        if (typeof this._intlcon.releaseSavepoint !== 'function') {
             throw new Error(this.client.driver + ' does not support releaseSavepoint method');
+        }
         await this._intlcon.releaseSavepoint(savepoint);
         this.emit('release-savepoint');
     }
     async rollbackSavepoint(savepoint) {
         if (!this._intlcon)
             throw new Error('Can not call rollbackSavepoint() on a released connection');
-        if (typeof this._intlcon.rollbackSavepoint !== 'function')
+        if (typeof this._intlcon.rollbackSavepoint !== 'function') {
             throw new Error(this.client.driver + ' does not support rollbackSavepoint method');
+        }
         await this._intlcon.rollbackSavepoint(savepoint);
         this.emit('rollback-savepoint');
     }

package/cjs/index.js

@@ -1,29 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEntityClass = exports.isAssociationField = exports.isEmbeddedField = exports.isColumnField = exports.unRegisterAdapter = exports.registerAdapter = void 0;
+exports.isEntityClass = exports.isEmbeddedField = exports.isColumnField = exports.isAssociationField = void 0;
 const tslib_1 = require("tslib");
 require("reflect-metadata");
-tslib_1.__exportStar(require("./client/types.js"), exports);
 tslib_1.__exportStar(require("./client/adapter.js"), exports);
+tslib_1.__exportStar(require("./client/cursor.js"), exports);
+tslib_1.__exportStar(require("./client/extensions.js"), exports);
 tslib_1.__exportStar(require("./client/sqb-client.js"), exports);
 tslib_1.__exportStar(require("./client/sqb-connection.js"), exports);
-tslib_1.__exportStar(require("./client/cursor.js"), exports);
-var extensions_js_1 = require("./client/extensions.js");
-Object.defineProperty(exports, "registerAdapter", { enumerable: true, get: function () { return extensions_js_1.registerAdapter; } });
-Object.defineProperty(exports, "unRegisterAdapter", { enumerable: true, get: function () { return extensions_js_1.unRegisterAdapter; } });
-tslib_1.__exportStar(require("./orm/orm.type.js"), exports);
-tslib_1.__exportStar(require("./orm/orm.const.js"), exports);
+tslib_1.__exportStar(require("./client/types.js"), exports);
+tslib_1.__exportStar(require("./orm/backward.js"), exports);
 tslib_1.__exportStar(require("./orm/base-entity.js"), exports);
-tslib_1.__exportStar(require("./orm/repository.class.js"), exports);
-tslib_1.__exportStar(require("./orm/model/entity-metadata.js"), exports);
-tslib_1.__exportStar(require("./orm/model/field-metadata.js"), exports);
-tslib_1.__exportStar(require("./orm/model/column-field-metadata.js"), exports);
-tslib_1.__exportStar(require("./orm/model/embedded-field-metadata.js"), exports);
-tslib_1.__exportStar(require("./orm/model/association-field-metadata.js"), exports);
-tslib_1.__exportStar(require("./orm/model/association.js"), exports);
-tslib_1.__exportStar(require("./orm/model/association-node.js"), exports);
-tslib_1.__exportStar(require("./orm/model/index-metadata.js"), exports);
-tslib_1.__exportStar(require("./orm/model/link-chain.js"), exports);
 tslib_1.__exportStar(require("./orm/decorators/column.decorator.js"), exports);
 tslib_1.__exportStar(require("./orm/decorators/embedded.decorator.js"), exports);
 tslib_1.__exportStar(require("./orm/decorators/entity.decorator.js"), exports);
@@ -33,9 +20,21 @@ tslib_1.__exportStar(require("./orm/decorators/index.decorator.js"), exports);
 tslib_1.__exportStar(require("./orm/decorators/link.decorator.js"), exports);
 tslib_1.__exportStar(require("./orm/decorators/primarykey.decorator.js"), exports);
 tslib_1.__exportStar(require("./orm/decorators/transform.decorator.js"), exports);
+tslib_1.__exportStar(require("./orm/model/association.js"), exports);
+tslib_1.__exportStar(require("./orm/model/association-field-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/association-node.js"), exports);
+tslib_1.__exportStar(require("./orm/model/column-field-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/embedded-field-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/entity-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/field-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/index-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/link-chain.js"), exports);
+tslib_1.__exportStar(require("./orm/orm.const.js"), exports);
+tslib_1.__exportStar(require("./orm/orm.type.js"), exports);
+tslib_1.__exportStar(require("./orm/repository.class.js"), exports);
 var orm_helper_js_1 = require("./orm/util/orm.helper.js");
+Object.defineProperty(exports, "isAssociationField", { enumerable: true, get: function () { return orm_helper_js_1.isAssociationField; } });
 Object.defineProperty(exports, "isColumnField", { enumerable: true, get: function () { return orm_helper_js_1.isColumnField; } });
 Object.defineProperty(exports, "isEmbeddedField", { enumerable: true, get: function () { return orm_helper_js_1.isEmbeddedField; } });
-Object.defineProperty(exports, "isAssociationField", { enumerable: true, get: function () { return orm_helper_js_1.isAssociationField; } });
 Object.defineProperty(exports, "isEntityClass", { enumerable: true, get: function () { return orm_helper_js_1.isEntityClass; } });
-tslib_1.__exportStar(require("./orm/backward.js"), exports);
+tslib_1.__exportStar(require("./orm/util/parse-fields-projection.js"), exports);

package/cjs/orm/backward.js

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnionEntity = exports.PickEntity = exports.OmitEntity = exports.mixinEntities = exports.getNonAssociationElementNames = exports.getUpdateColumnNames = exports.getInsertColumnNames = void 0;
+exports.UnionEntity = exports.PickEntity = exports.OmitEntity = void 0;
+exports.getInsertColumnNames = getInsertColumnNames;
+exports.getUpdateColumnNames = getUpdateColumnNames;
+exports.getNonAssociationElementNames = getNonAssociationElementNames;
+exports.mixinEntities = mixinEntities;
 const entity_decorator_js_1 = require("./decorators/entity.decorator.js");
 function getInsertColumnNames(ctor) {
     return entity_decorator_js_1.Entity.getInsertColumnNames(ctor);
 }
-exports.getInsertColumnNames = getInsertColumnNames;
 function getUpdateColumnNames(ctor) {
     return entity_decorator_js_1.Entity.getUpdateColumnNames(ctor);
 }
-exports.getUpdateColumnNames = getUpdateColumnNames;
 function getNonAssociationElementNames(ctor) {
     return entity_decorator_js_1.Entity.getNonAssociationFieldNames(ctor);
 }
-exports.getNonAssociationElementNames = getNonAssociationElementNames;
 function mixinEntities(derivedCtor, ...bases) {
     // @ts-ignore
     return entity_decorator_js_1.Entity.mixin(derivedCtor, ...bases);
 }
-exports.mixinEntities = mixinEntities;
 exports.OmitEntity = entity_decorator_js_1.Entity.Omit;
 exports.PickEntity = entity_decorator_js_1.Entity.Pick;
 exports.UnionEntity = entity_decorator_js_1.Entity.Union;

package/cjs/orm/commands/command.helper.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareFilter = exports.joinAssociation = exports.joinAssociationGetLast = exports.joinAssociationGetFirst = void 0;
+exports.joinAssociationGetFirst = joinAssociationGetFirst;
+exports.joinAssociationGetLast = joinAssociationGetLast;
+exports.joinAssociation = joinAssociation;
+exports.prepareFilter = prepareFilter;
 const builder_1 = require("@sqb/builder");
 const embedded_field_metadata_js_1 = require("../model/embedded-field-metadata.js");
 const entity_metadata_js_1 = require("../model/entity-metadata.js");
@@ -9,12 +12,10 @@ async function joinAssociationGetFirst(joinInfos, association, parentAlias, inne
     const joins = await joinAssociation(joinInfos, association, parentAlias, innerJoin);
     return joins[0];
 }
-exports.joinAssociationGetFirst = joinAssociationGetFirst;
 async function joinAssociationGetLast(joinInfos, association, parentAlias, innerJoin) {
     const joins = await joinAssociation(joinInfos, association, parentAlias, innerJoin);
     return joins[joins.length - 1];
 }
-exports.joinAssociationGetLast = joinAssociationGetLast;
 async function joinAssociation(joinInfos, association, parentAlias, innerJoin) {
     let joinInfo;
     let node = association;
@@ -50,10 +51,9 @@ async function joinAssociation(joinInfos, association, parentAlias, innerJoin) {
     }
     return result;
 }
-exports.joinAssociation = joinAssociation;
 async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
     let srcOp;
-    if ((0, builder_1.isLogicalOperator)(filter))
+    if ((0, builder_1.isLogicalOperator)(filter) && filter._operatorType === trgOp._operatorType)
         srcOp = filter;
     else {
         srcOp = (0, builder_1.And)();
@@ -62,6 +62,7 @@ async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
         else
             srcOp.add(filter);
     }
+    const associationPathCache = {};
     for (const item of srcOp._items) {
         if ((0, builder_1.isLogicalOperator)(item)) {
             const ctor = Object.getPrototypeOf(item).constructor;
@@ -80,19 +81,34 @@ async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
                 let _curPrefix = '';
                 let _curSuffix = '';
                 let subSelect;
-                for (let i = 0; i < l; i++) {
+                let currentOp = trgOp;
+                let i = 0;
+                const parentPath = itemPath
+                    .slice(0, l - 2)
+                    .join('.')
+                    .toLowerCase();
+                const cached = associationPathCache[parentPath];
+                if (cached) {
+                    /** Jump to last item */
+                    i = l - 1;
+                    _curEntity = cached._curEntity;
+                    _curAlias = cached._curAlias;
+                    currentOp = cached.currentOp;
+                }
+                for (i; i < l; i++) {
                     pt = itemPath[i];
                     const col = entity_metadata_js_1.EntityMetadata.getField(_curEntity, pt);
                     if (!col)
                         throw new Error(`Unknown property (${item._left}) defined in filter`);
-                    // if last item on path
+                    /** if last item on path */
                     if (i === l - 1) {
                         if (!(0, orm_helper_js_1.isColumnField)(col))
                             throw new Error(`Invalid column expression (${item._left}) defined in filter`);
                         const ctor = Object.getPrototypeOf(item).constructor;
-                        trgOp.add(new ctor((0, builder_1.Field)(_curAlias + '.' + _curPrefix + col.fieldName + _curSuffix, col.dataType, col.isArray), item._right));
+                        currentOp.add(new ctor((0, builder_1.Field)(_curAlias + '.' + _curPrefix + col.fieldName + _curSuffix, col.dataType, col.isArray), item._right));
                     }
                     else {
+                        /** if not last item on path */
                         if ((0, orm_helper_js_1.isColumnField)(col))
                             throw new Error(`Invalid column (${item._left}) defined in filter`);
                         if ((0, orm_helper_js_1.isEmbeddedField)(col)) {
@@ -110,8 +126,13 @@ async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
                             const targetCol = await col.association.resolveTargetProperty();
                             subSelect = (0, builder_1.Select)((0, builder_1.Raw)('1')).from(_curEntity.tableName + ' K');
                             subSelect.where((0, builder_1.Eq)((0, builder_1.Field)('K.' + targetCol.fieldName, targetCol.dataType, targetCol.isArray), (0, builder_1.Field)(tableAlias + '.' + keyCol.fieldName, keyCol.dataType, keyCol.isArray)));
-                            trgOp.add((0, builder_1.Exists)(subSelect));
-                            trgOp = subSelect._where;
+                            currentOp.add((0, builder_1.Exists)(subSelect));
+                            if (currentOp._operatorType !== builder_1.OperatorType.and) {
+                                currentOp = builder_1.op.or();
+                                subSelect.where(currentOp);
+                            }
+                            else
+                                currentOp = subSelect._where;
                             if (col.association.conditions) {
                                 await prepareFilter(_curEntity, col.association.conditions, trgOp, 'K');
                             }
@@ -130,6 +151,14 @@ async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
                             _curAlias = joinAlias;
                             node = node.next;
                         }
+                        /** If next path is the last one */
+                        if (i === l - 2) {
+                            associationPathCache[parentPath] = {
+                                _curEntity,
+                                _curAlias,
+                                currentOp,
+                            };
+                        }
                     }
                 }
                 continue;
@@ -138,4 +167,3 @@ async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
         trgOp.add(item);
     }
 }
-exports.prepareFilter = prepareFilter;

package/cjs/orm/commands/create.command.js

@@ -63,8 +63,9 @@ class CreateCommand {
                 if (typeof col.serialize === 'function')
                     v = col.serialize(v, col.name);
                 if (v == null) {
-                    if (col.notNull && !col.autoGenerated)
+                    if (col.notNull && !col.autoGenerated) {
                         throw new Error(`${entity.name}.${col.name} is required and can't be null`);
+                    }
                     continue;
                 }
                 column_field_metadata_js_1.ColumnFieldMetadata.checkEnumValue(col, v);

package/cjs/orm/commands/find.command.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FindCommand = void 0;
 const builder_1 = require("@sqb/builder");
-const entity_decorator_js_1 = require("../decorators/entity.decorator.js");
 const association_node_js_1 = require("../model/association-node.js");
 const embedded_field_metadata_js_1 = require("../model/embedded-field-metadata.js");
 const entity_metadata_js_1 = require("../model/entity-metadata.js");
 const orm_helper_js_1 = require("../util/orm.helper.js");
+const parse_fields_projection_js_1 = require("../util/parse-fields-projection.js");
 const command_helper_js_1 = require("./command.helper.js");
 const row_converter_js_1 = require("./row-converter.js");
 const SORT_ORDER_PATTERN = /^([-+])?(.*)$/;
@@ -56,9 +56,7 @@ class FindCommand {
             maxEagerFetch: args.maxEagerFetch,
         });
         await command.addFields({
-            pick: args.pick,
-            include: args.include,
-            omit: args.omit,
+            projection: args.projection,
             sort: args.sort,
         });
         if (args.filter)
@@ -71,22 +69,10 @@ class FindCommand {
         const tableAlias = opts.tableAlias || this.resultAlias;
         const entity = opts.entity || this._getEntityFromAlias(tableAlias);
         const converter = opts.converter || this.converter;
-        const _pick = opts.pick ? opts.pick.map(x => x.toLowerCase()) : undefined;
-        const _omit = opts.omit ? opts.omit.map(x => x.toLowerCase()) : undefined;
-        const _include = opts.include ? opts.include.map(x => x.toLowerCase()) : undefined;
-        let requestedFields;
-        if (_pick)
-            requestedFields = [..._pick];
-        else {
-            requestedFields = entity_decorator_js_1.Entity.getFieldNames(entity.ctor).reduce((a, x) => {
-                const f = entity_decorator_js_1.Entity.getField(entity.ctor, x);
-                if (f && !f.exclusive)
-                    a.push(x.toLowerCase());
-                return a;
-            }, []);
-        }
-        if (_include)
-            requestedFields.push(..._include);
+        const projection = typeof opts.projection === 'string' || Array.isArray(opts.projection)
+            ? (0, parse_fields_projection_js_1.parseFieldsProjection)(opts.projection)
+            : opts.projection;
+        const defaultFields = !projection || !Object.values(projection).find(p => !p.sign);
         const sortFields = opts.sort && opts.sort.length ? opts.sort.map(x => x.toLowerCase()) : undefined;
         const prefix = opts.prefix || '';
         const suffix = opts.suffix || '';
@@ -95,12 +81,16 @@ class FindCommand {
             if (!col || col.hidden)
                 continue;
             const colNameLower = col.name.toLowerCase();
-            // Ignore field if in excluded list
-            if (_omit && _omit.includes(colNameLower))
-                continue;
-            // Check if field request list
-            if (!requestedFields.find((x) => x === colNameLower || x.startsWith(colNameLower + '.')))
+            const p = projection?.[colNameLower];
+            if (
+            /** Ignore if field is omitted */
+            p?.sign === '-' ||
+                /** Ignore if default fields and field is not in projection */
+                (!defaultFields && !p) ||
+                /** Ignore if default fields enabled and fields is exclusive */
+                (defaultFields && col.exclusive && !p)) {
                 continue;
+            }
             // Add field to select list if field is a column
             if ((0, orm_helper_js_1.isColumnField)(col)) {
                 const fieldAlias = this._selectColumn(tableAlias, col, prefix, suffix);
@@ -125,9 +115,7 @@ class FindCommand {
                     entity: typ,
                     prefix: col.fieldNamePrefix,
                     suffix: col.fieldNameSuffix,
-                    pick: _pick?.includes(colNameLower) ? undefined : extractSubFields(colNameLower, _pick),
-                    include: extractSubFields(colNameLower, _include),
-                    omit: extractSubFields(colNameLower, _omit),
+                    projection: p?.projection,
                     sort: extractSubFields(colNameLower, sortFields),
                 });
                 continue;
@@ -145,9 +133,7 @@ class FindCommand {
                         tableAlias: joinInfo.joinAlias,
                         converter: subConverter,
                         entity: joinInfo.targetEntity,
-                        pick: _pick?.includes(colNameLower) ? undefined : extractSubFields(colNameLower, _pick),
-                        include: extractSubFields(colNameLower, _include),
-                        omit: extractSubFields(colNameLower, _omit),
+                        projection: p?.projection,
                         sort: extractSubFields(colNameLower, sortFields),
                     });
                     continue;
@@ -167,9 +153,7 @@ class FindCommand {
                     await findCommand.filter((0, builder_1.In)(targetCol.name, (0, builder_1.Param)(parentField)));
                     const sort = sortFields && extractSubFields(colNameLower, sortFields);
                     await findCommand.addFields({
-                        pick: _pick?.includes(colNameLower) ? undefined : extractSubFields(colNameLower, _pick),
-                        include: extractSubFields(colNameLower, _include),
-                        omit: extractSubFields(colNameLower, _omit),
+                        projection: p?.projection,
                         sort,
                     });
                     if (sort)
@@ -263,16 +247,18 @@ class FindCommand {
         if (args.offset)
             query.offset(args.offset);
         // joins must be added last
-        if (this._joins)
+        if (this._joins) {
             for (const j of this._joins) {
                 query.join(j.join);
             }
+        }
         // Execute query
         const resp = await args.connection.execute(query, {
             params: args?.params,
             fetchRows: args?.limit,
             objectRows: false,
             cursor: false,
+            prettyPrint: args.prettyPrint,
         });
         // Create objects
         if (resp.rows && resp.fields) {

package/cjs/orm/commands/row-converter.js

@@ -2,15 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RowConverter = void 0;
 const builder_1 = require("@sqb/builder");
-const isValueProperty = (prop) => {
-    return prop.fieldAlias && !prop.converter;
-};
-const isObjectProperty = (prop) => {
-    return prop.converter && !prop.findCommand;
-};
-const isNestedProperty = (prop) => {
-    return prop.converter && prop.findCommand;
-};
+const isValueProperty = (prop) => prop.fieldAlias && !prop.converter;
+const isObjectProperty = (prop) => prop.converter && !prop.findCommand;
+const isNestedProperty = (prop) => prop.converter && prop.findCommand;
 class RowConverter {
     constructor(resultType, parent) {
         this.resultType = resultType;
@@ -153,8 +147,9 @@ class RowConverter {
                             }
                         },
                     });
-                    if (r.length > findCommand.maxEagerFetch)
+                    if (r.length > findCommand.maxEagerFetch) {
                         throw new Error(`Number of returning rows for "${propKey}" exceeds maxEagerFetch limit`);
+                    }
                     for (let i = 0; i < result.length; i++) {
                         const row = rows[i];
                         let obj = result[i];

package/cjs/orm/decorators/column.decorator.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Column = void 0;
+exports.Column = Column;
 const entity_metadata_js_1 = require("../model/entity-metadata.js");
+const orm_const_js_1 = require("../orm.const.js");
 function Column(arg0) {
+    return Column[orm_const_js_1.DECORATOR_FACTORY](arg0);
+}
+Column[orm_const_js_1.DECORATOR_FACTORY] = function (arg0) {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('Symbol properties are not accepted');
@@ -19,5 +23,4 @@ function Column(arg0) {
         }
         entity_metadata_js_1.EntityMetadata.defineColumnField(entity, propertyKey, options);
     };
-}
-exports.Column = Column;
+};

package/cjs/orm/decorators/embedded.decorator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Embedded = void 0;
+exports.Embedded = Embedded;
 const entity_metadata_js_1 = require("../model/entity-metadata.js");
 function Embedded(type, options) {
     return (target, propertyKey) => {
@@ -13,4 +13,3 @@ function Embedded(type, options) {
         entity_metadata_js_1.EntityMetadata.defineEmbeddedField(entity, propertyKey, type, options);
     };
 }
-exports.Embedded = Embedded;

package/cjs/orm/decorators/entity.decorator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Entity = void 0;
+exports.Entity = Entity;
 const entity_metadata_js_1 = require("../model/entity-metadata.js");
 const apply_mixins_js_1 = require("../util/apply-mixins.js");
 function Entity(options) {
@@ -15,7 +15,6 @@ function Entity(options) {
             entity.comment = opts.comment;
     };
 }
-exports.Entity = Entity;
 (function (Entity) {
     Entity.getMetadata = entity_metadata_js_1.EntityMetadata.get;
     Entity.getOwnMetadata = entity_metadata_js_1.EntityMetadata.getOwn;