@sqb/connect 4.20.7 → 4.21.0

package/cjs/client/sqb-connection.js

@@ -1,293 +0,0 @@
-"use strict";
-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 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");
-const helpers_js_1 = require("./helpers.js");
-const sqb_error_js_1 = require("./sqb-error.js");
-const debug = (0, debug_1.default)('sqb:connection');
-class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
-    client;
-    _intlcon;
-    _tasks = new power_tasks_1.TaskQueue();
-    _options;
-    _inTransaction = false;
-    _refCount = 1;
-    constructor(client, adapterConnection, options) {
-        super();
-        this.client = client;
-        this._intlcon = adapterConnection;
-        this._options = options || {};
-    }
-    /**
-     * Returns session id
-     */
-    get sessionId() {
-        return this._intlcon && this._intlcon.sessionId;
-    }
-    /**
-     * Returns reference counter value
-     */
-    get refCount() {
-        return this._refCount;
-    }
-    /**
-     * Returns true if transaction started
-     */
-    get inTransaction() {
-        if (this._intlcon && typeof this._intlcon.getInTransaction === 'function') {
-            this._inTransaction = this._intlcon.getInTransaction();
-        }
-        return this._inTransaction;
-    }
-    /**
-     * Increases internal reference counter to keep session alive
-     */
-    retain() {
-        this._refCount++;
-        debug('[%s] retain | refCount: %s', this.sessionId, this._refCount);
-        this.emit('retain', this._refCount);
-    }
-    /**
-     * Decreases the internal reference counter.
-     * When reference count is 0, connection returns to the pool.
-     * Returns true if connection released.
-     */
-    release() {
-        if (!this._intlcon)
-            return true;
-        const ref = --this._refCount;
-        this.emit('release', this._refCount);
-        debug('[%s] release | refCount: %s', this.sessionId, ref);
-        if (!ref) {
-            this.close().catch(() => 0);
-            return true;
-        }
-        return false;
-    }
-    /**
-     * Immediately releases the connection.
-     */
-    async close() {
-        if (!this._intlcon)
-            return;
-        await this.emitAsyncSerial('close');
-        const intlcon = this._intlcon;
-        this._intlcon = undefined;
-        this.client.pool.release(intlcon, (e) => {
-            if (e)
-                this.client.emit('error', e);
-        });
-        debug('[%s] closed', intlcon.sessionId);
-    }
-    async execute(query, options) {
-        if (!this._intlcon)
-            throw new Error(`Can't execute query, because connection is released`);
-        return this._tasks.enqueue(() => this._execute(query, options)).toPromise();
-    }
-    getRepository(entity, opts) {
-        let ctor;
-        if (typeof entity === 'string') {
-            ctor = this.client.getEntity(entity);
-            if (!ctor)
-                throw new Error(`Repository "${entity}" is not registered`);
-        }
-        else
-            ctor = entity;
-        const entityDef = entity_metadata_js_1.EntityMetadata.get(ctor);
-        if (!entityDef)
-            throw new Error(`You must provide an @Entity annotated constructor`);
-        return new repository_class_js_1.Repository(entityDef, this, opts?.schema);
-    }
-    async getSchema() {
-        assert_1.default.ok(this._intlcon, `Can't set schema, because connection is released`);
-        assert_1.default.ok(this._intlcon.getSchema, `${this.client.dialect} adapter does have Schema support`);
-        return await this._intlcon.getSchema();
-    }
-    async setSchema(schema) {
-        assert_1.default.ok(this._intlcon, `Can't set schema, because connection is released`);
-        assert_1.default.ok(this._intlcon.setSchema, `${this.client.dialect} adapter does have Schema support`);
-        await this._intlcon.setSchema(schema);
-    }
-    /**
-     * Executes a query
-     */
-    async _execute(query, options) {
-        assert_1.default.ok(this._intlcon, `Can't execute query, because connection is released`);
-        const intlcon = this._intlcon;
-        this.retain();
-        let request;
-        try {
-            const startTime = Date.now();
-            request = this._prepareQueryRequest(query, options);
-            debug('[%s] execute | %o', this.sessionId, request);
-            this.emit('execute', request);
-            // Call execute hooks
-            if (request.executeHooks) {
-                for (const fn of request.executeHooks) {
-                    await fn(this, request);
-                }
-            }
-            const response = await intlcon.execute(request);
-            if (!response)
-                throw new Error('Database adapter returned an empty response');
-            const result = {
-                executeTime: Date.now() - startTime,
-            };
-            if (request.showSql)
-                result.query = request;
-            if (response.rows || response.cursor) {
-                if (!response.fields)
-                    throw new Error('Adapter did not returned fields info');
-                if (!response.rowType)
-                    throw new Error('Adapter did not returned rowType');
-                result.fields = (0, helpers_js_1.wrapAdapterFields)(response.fields, request.fieldNaming);
-                result.rowType = response.rowType;
-                if (response.rows) {
-                    result.rows = request.objectRows
-                        ? (0, helpers_js_1.normalizeRowsToObjectRows)(result.fields, response.rowType, response.rows, request)
-                        : (0, helpers_js_1.normalizeRowsToArrayRows)(result.fields, response.rowType, response.rows, request);
-                    (0, helpers_js_1.callFetchHooks)(result.rows, request);
-                }
-                else if (response.cursor) {
-                    const cursor = (result.cursor = new cursor_js_1.Cursor(this, result.fields, response.cursor, request));
-                    const hook = () => cursor.close();
-                    cursor.once('close', () => this.off('close', hook));
-                    this.on('close', hook);
-                }
-            }
-            if (response.rowsAffected)
-                result.rowsAffected = response.rowsAffected;
-            return result;
-        }
-        catch (e) {
-            const error = new sqb_error_js_1.SQBError(e.message, e);
-            error.query = query;
-            error.queryOptions = options;
-            error.request = request;
-            this.emit('error', error);
-            throw error;
-        }
-        finally {
-            this.release();
-        }
-    }
-    async startTransaction() {
-        if (!this._intlcon)
-            throw new Error('Can not call startTransaction() on a released connection');
-        await this._intlcon.startTransaction();
-        this._inTransaction = true;
-        this.emit('start-transaction');
-    }
-    async commit() {
-        if (!this._intlcon)
-            throw new Error('Can not call commit() on a released connection');
-        await this._intlcon.commit();
-        this._inTransaction = false;
-        this.emit('commit');
-    }
-    async rollback() {
-        if (!this._intlcon)
-            throw new Error('Can not call rollback() on a released connection');
-        await this._intlcon.rollback();
-        this._inTransaction = false;
-        this.emit('rollback');
-    }
-    async setSavepoint(savepoint) {
-        if (!this._intlcon)
-            throw new Error('Can not call setSavepoint() on a released connection');
-        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);
-        this.emit('set-savepoint');
-    }
-    async releaseSavepoint(savepoint) {
-        if (!this._intlcon)
-            throw new Error('Can not call releaseSavepoint() on a released connection');
-        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') {
-            throw new Error(this.client.driver + ' does not support rollbackSavepoint method');
-        }
-        await this._intlcon.rollbackSavepoint(savepoint);
-        this.emit('rollback-savepoint');
-    }
-    async test() {
-        if (!this._intlcon)
-            throw new Error('Can not call test() on a released connection');
-        await this._intlcon.test();
-    }
-    _prepareQueryRequest(query, options = {}) {
-        if (!this._intlcon)
-            throw new Error('Session released');
-        const defaults = this.client.defaults;
-        const request = {
-            dialect: this.client.dialect,
-            sql: '',
-            autoCommit: this.inTransaction
-                ? false
-                : (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.autoCommit, this._options?.autoCommit, defaults.autoCommit), true),
-            cursor: (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.cursor, defaults.cursor), false),
-            objectRows: (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.objectRows, defaults.objectRows), true),
-            ignoreNulls: (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.ignoreNulls, defaults.ignoreNulls), false),
-            fetchRows: (0, putil_varhelpers_1.coerceToInt)((0, putil_varhelpers_1.coalesce)(options.fetchRows, defaults.fetchRows), 100),
-            fieldNaming: (0, putil_varhelpers_1.coalesce)(options.namingStrategy, defaults.fieldNaming),
-            transform: (0, putil_varhelpers_1.coalesce)(options.transform, defaults.transform),
-            showSql: (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.showSql, defaults.showSql), false),
-            prettyPrint: (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.prettyPrint, defaults.prettyPrint), false),
-            action: (0, putil_varhelpers_1.coerceToString)(options.action),
-            fetchAsString: options.fetchAsString,
-        };
-        request.ignoreNulls = request.ignoreNulls && request.objectRows;
-        if (query instanceof builder_1.classes.Query) {
-            if (this._intlcon.onGenerateQuery)
-                this._intlcon.onGenerateQuery(request, query);
-            const q = query.generate({
-                dialect: request.dialect,
-                dialectVersion: request.dialectVersion,
-                params: options.params,
-                strictParams: true,
-                prettyPrint: request.prettyPrint,
-            });
-            request.sql = q.sql;
-            request.params = q.params;
-            request.paramOptions = q.paramOptions;
-            if (q.returningFields)
-                request.returningFields = q.returningFields;
-            if (query.listenerCount('execute'))
-                request.executeHooks = query.listeners('execute');
-            if (query.listenerCount('fetch'))
-                request.fetchHooks = query.listeners('fetch');
-        }
-        else {
-            // noinspection SuspiciousTypeOfGuard
-            if (typeof query === 'string') {
-                request.sql = query;
-                request.params = options.params;
-            }
-        }
-        // @ts-ignore
-        if (!request.sql)
-            throw new Error('No sql given');
-        return request;
-    }
-}
-exports.SqbConnection = SqbConnection;

package/cjs/client/sqb-error.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQBError = void 0;
-class SQBError extends Error {
-    cause;
-    queryOptions;
-    request;
-    constructor(message, cause) {
-        super(message);
-        this.cause = cause;
-        if (cause)
-            this.stack = cause.stack;
-    }
-}
-exports.SQBError = SQBError;

package/cjs/client/types.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataType = void 0;
-var builder_1 = require("@sqb/builder");
-Object.defineProperty(exports, "DataType", { enumerable: true, get: function () { return builder_1.DataType; } });

package/cjs/index.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEntityClass = exports.isEmbeddedField = exports.isColumnField = exports.isAssociationField = void 0;
-const tslib_1 = require("tslib");
-require("reflect-metadata");
-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/sqb-error.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/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);
-tslib_1.__exportStar(require("./orm/decorators/events.decorator.js"), exports);
-tslib_1.__exportStar(require("./orm/decorators/foreignkey.decorator.js"), exports);
-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, "isEntityClass", { enumerable: true, get: function () { return orm_helper_js_1.isEntityClass; } });
-tslib_1.__exportStar(require("./orm/util/parse-fields-projection.js"), exports);

package/cjs/orm/backward.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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);
-}
-function getUpdateColumnNames(ctor) {
-    return entity_decorator_js_1.Entity.getUpdateColumnNames(ctor);
-}
-function getNonAssociationElementNames(ctor) {
-    return entity_decorator_js_1.Entity.getNonAssociationFieldNames(ctor);
-}
-function mixinEntities(derivedCtor, ...bases) {
-    // @ts-ignore
-    return entity_decorator_js_1.Entity.mixin(derivedCtor, ...bases);
-}
-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/base-entity.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseEntity = void 0;
-const entity_decorator_js_1 = require("./decorators/entity.decorator.js");
-const orm_const_js_1 = require("./orm.const.js");
-class BaseEntity {
-    [orm_const_js_1.REPOSITORY_KEY];
-    constructor(partial) {
-        const fields = entity_decorator_js_1.Entity.getColumnFieldNames(Object.getPrototypeOf(this).constructor);
-        if (fields && partial) {
-            for (const k of fields)
-                if (partial[k] !== undefined)
-                    this[k] = partial[k];
-        }
-    }
-    async destroy() {
-        const repo = this[orm_const_js_1.REPOSITORY_KEY];
-        return !!(repo && repo.destroy(this));
-    }
-    async exists() {
-        const repo = this[orm_const_js_1.REPOSITORY_KEY];
-        return !!(repo && repo.exists(this));
-    }
-    toJSON() {
-        // this method is a placeholder and will be overwritten by declareEntity() method
-        return this;
-    }
-}
-exports.BaseEntity = BaseEntity;

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

@@ -1,170 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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");
-const orm_helper_js_1 = require("../util/orm.helper.js");
-async function joinAssociationGetFirst(joinInfos, association, parentAlias, innerJoin) {
-    const joins = await joinAssociation(joinInfos, association, parentAlias, innerJoin);
-    return joins[0];
-}
-async function joinAssociationGetLast(joinInfos, association, parentAlias, innerJoin) {
-    const joins = await joinAssociation(joinInfos, association, parentAlias, innerJoin);
-    return joins[joins.length - 1];
-}
-async function joinAssociation(joinInfos, association, parentAlias, innerJoin) {
-    let joinInfo;
-    let node = association;
-    const result = [];
-    while (node) {
-        joinInfo = joinInfos.find(j => j.association === node && j.parentAlias === parentAlias);
-        if (!joinInfo) {
-            const targetEntity = await node.resolveTarget();
-            const sourceEntity = await node.resolveSource();
-            const keyCol = await node.resolveSourceProperty();
-            const targetCol = await node.resolveTargetProperty();
-            const joinAlias = 'J' + (joinInfos.length + 1);
-            const join = innerJoin
-                ? (0, builder_1.InnerJoin)(targetEntity.tableName + ' as ' + joinAlias)
-                : (0, builder_1.LeftOuterJoin)(targetEntity.tableName + ' as ' + joinAlias);
-            join.on((0, builder_1.Eq)((0, builder_1.Field)(joinAlias + '.' + targetCol.fieldName, targetCol.dataType, targetCol.isArray), (0, builder_1.Field)(parentAlias + '.' + keyCol.fieldName, keyCol.dataType, keyCol.isArray)));
-            if (node.conditions)
-                await prepareFilter(targetEntity, node.conditions, join._conditions, joinAlias);
-            joinInfo = {
-                association: node,
-                sourceEntity,
-                targetEntity,
-                parentAlias,
-                joinAlias,
-                join,
-            };
-            joinInfos.push(joinInfo);
-        }
-        result.push(joinInfo);
-        if (!node.next)
-            break;
-        parentAlias = joinInfo.joinAlias;
-        node = node.next;
-    }
-    return result;
-}
-async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
-    let srcOp;
-    if ((0, builder_1.isLogicalOperator)(filter) && filter._operatorType === trgOp._operatorType)
-        srcOp = filter;
-    else {
-        srcOp = (0, builder_1.And)();
-        if (Array.isArray(filter))
-            srcOp.add(...filter);
-        else
-            srcOp.add(filter);
-    }
-    // const associationPathCache: Record<string, any> = {};
-    for (const item of srcOp._items) {
-        if ((0, builder_1.isLogicalOperator)(item)) {
-            const ctor = Object.getPrototypeOf(item).constructor;
-            const logOp = new ctor();
-            await prepareFilter(entityDef, item, logOp, tableAlias);
-            trgOp.add(logOp);
-            continue;
-        }
-        if ((0, builder_1.isCompOperator)(item)) {
-            if (typeof item._left === 'string') {
-                const itemPath = item._left.split('.');
-                const l = itemPath.length;
-                let pt;
-                let _curEntity = entityDef;
-                let _curAlias = tableAlias;
-                let _curPrefix = '';
-                let _curSuffix = '';
-                let subSelect;
-                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 (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;
-                        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)) {
-                            _curEntity = await embedded_field_metadata_js_1.EmbeddedFieldMetadata.resolveType(col);
-                            _curPrefix = _curPrefix + (col.fieldNamePrefix || '');
-                            _curSuffix = (col.fieldNameSuffix || '') + _curSuffix;
-                            continue;
-                        }
-                        if (!(0, orm_helper_js_1.isAssociationField)(col))
-                            throw new Error(`Invalid column (${item._left}) defined in filter`);
-                        let node;
-                        _curEntity = await col.association.resolveTarget();
-                        if (!subSelect) {
-                            const keyCol = await col.association.resolveSourceProperty();
-                            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)));
-                            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');
-                            }
-                            node = col.association.next;
-                            _curAlias = 'K';
-                        }
-                        else
-                            node = col.association;
-                        while (node) {
-                            const targetEntity = await node.resolveTarget();
-                            const sourceColumn = await node.resolveSourceProperty();
-                            const targetColumn = await node.resolveTargetProperty();
-                            const joinAlias = 'J' + ((subSelect?._joins?.length || 0) + 1);
-                            subSelect.join((0, builder_1.InnerJoin)(targetEntity.tableName + ' ' + joinAlias).on((0, builder_1.Eq)((0, builder_1.Field)(joinAlias + '.' + targetColumn.fieldName, targetColumn.dataType, targetColumn.isArray), (0, builder_1.Field)(_curAlias + '.' + sourceColumn.fieldName, sourceColumn.dataType, sourceColumn.isArray))));
-                            _curEntity = targetEntity;
-                            _curAlias = joinAlias;
-                            node = node.next;
-                        }
-                        // /** If next path is the last one */
-                        // if (i === l - 2) {
-                        //   associationPathCache[parentPath] = {
-                        //     _curEntity,
-                        //     _curAlias,
-                        //     currentOp,
-                        //   };
-                        // }
-                    }
-                }
-                continue;
-            }
-        }
-        trgOp.add(item);
-    }
-}

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

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CountCommand = void 0;
-const builder_1 = require("@sqb/builder");
-const command_helper_js_1 = require("./command.helper.js");
-class CountCommand {
-    // istanbul ignore next
-    constructor() {
-        throw new Error('This class is abstract');
-    }
-    static async execute(args) {
-        const { connection, entity, filter, params } = args;
-        let where;
-        if (filter) {
-            where = (0, builder_1.And)();
-            await (0, command_helper_js_1.prepareFilter)(entity, filter, where, 'T');
-        }
-        const query = (0, builder_1.Select)((0, builder_1.Count)()).from(entity.tableName + ' T');
-        if (where)
-            query.where(where);
-        // Execute query
-        const resp = await connection.execute(query, {
-            params,
-            objectRows: false,
-            cursor: false,
-        });
-        return (resp && resp.rows && resp.rows[0][0]) || 0;
-    }
-}
-exports.CountCommand = CountCommand;