tspace-mysql 1.8.2 → 1.8.3

package/build/lib/core/Nest/index.d.ts

@@ -1,7 +1,9 @@
 import { Model, Repository } from "..";
 export type NestRepository<M extends Model> = ReturnType<typeof Repository<M>>;
 export declare const NestInject: <M extends Model<any, unknown>>(model: string | (new () => M)) => string;
-export declare const NestProvider: <M extends Model<any, unknown>>(model: new () => M) => {
+export declare const NestProvider: <M extends Model<any, unknown>>(model: new () => M, options?: {
+    pattern?: 'repository' | 'model';
+}) => {
     provide: string;
     useValue: unknown;
 };

package/build/lib/core/Nest/index.js

@@ -12,10 +12,12 @@ const NestInject = (model) => {
         : nameOfModel(model);
 };
 exports.NestInject = NestInject;
-const NestProvider = (model) => {
+const NestProvider = (model, options = { pattern: 'repository' }) => {
     return {
         provide: nameOfModel(model),
-        useValue: (0, __1.Repository)(model)
+        useValue: options.pattern === 'repository'
+            ? (0, __1.Repository)(model)
+            : new __1.Model()
     };
 };
 exports.NestProvider = NestProvider;

package/build/lib/core/Nest/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/core/Nest/index.ts"],"names":[],"mappings":";;;AAAA,0BAAyD;AAEzD,MAAM,WAAW,GAAG,CAAkB,KAAmB,EAAW,EAAE;;IAEpE,OAAO,GAAG,MAAA,MAAA,IAAI,KAAK,EAAE,CAAC,WAAW,0CAAE,IAAI,mCAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAA;AAC7F,CAAC,CAAA;AAIM,MAAM,UAAU,GAAG,CAAoB,KAA8B,EAAE,EAAE;IAC9E,OAAO,OAAO,KAAK,KAAK,QAAQ;QAC9B,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA;AAJY,QAAA,UAAU,cAItB;AAEM,MAAM,YAAY,GAAG,CAAkB,KAAmB,EAAE,EAAE;IACnE,OAAO;QACL,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC;QAC3B,QAAQ,EAAG,IAAA,cAAU,EAAI,KAAK,CAAY;KAC3C,CAAA;AACH,CAAC,CAAA;AALY,QAAA,YAAY,gBAKxB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/core/Nest/index.ts"],"names":[],"mappings":";;;AAAA,0BAAuC;AAEvC,MAAM,WAAW,GAAG,CAAkB,KAAmB,EAAW,EAAE;;IAEpE,OAAO,GAAG,MAAA,MAAA,IAAI,KAAK,EAAE,CAAC,WAAW,0CAAE,IAAI,mCAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAA;AAC7F,CAAC,CAAA;AAIM,MAAM,UAAU,GAAG,CAAoB,KAA8B,EAAE,EAAE;IAC9E,OAAO,OAAO,KAAK,KAAK,QAAQ;QAC9B,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA;AAJY,QAAA,UAAU,cAItB;AAEM,MAAM,YAAY,GAAG,CAC1B,KAAmB,EACnB,UAEI,EAAE,OAAO,EAAE,YAAY,EAAE,EAC7B,EAAE;IACF,OAAO;QACL,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC;QAC3B,QAAQ,EAAE,OAAO,CAAC,OAAO,KAAK,YAAY;YACxC,CAAC,CAAC,IAAA,cAAU,EAAI,KAAK,CAAY;YACjC,CAAC,CAAC,IAAI,SAAK,EAAE;KAChB,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,YAAY,gBAYxB"}

package/build/lib/{connection/index.d.ts → core/Pool.d.ts}

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
 import { loadOptionsEnvironment } from '../options';
-import type { TConnection, TOptions } from '../types';
+import type { TConnection, TNewConnection, TOptions } from '../types';
 export declare class PoolConnection extends EventEmitter {
     private OPTIONS;
     /**
@@ -17,6 +17,7 @@ export declare class PoolConnection extends EventEmitter {
      * @property {Function} Connection.connection
      */
     connected(): TConnection;
+    newConnected(): TNewConnection;
     private _detectEventQuery;
     private _detectQueryType;
     private _defaultOptions;

package/build/lib/{connection/index.js → core/Pool.js}

@@ -99,19 +99,70 @@ class PoolConnection extends events_1.EventEmitter {
                             return reject(err);
                         const query = (sql) => {
                             const start = Date.now();
-                            return new Promise((resolveQ, rejectQ) => {
+                            return new Promise((ok, fail) => {
                                 connection.query(sql, (err, results) => {
                                     connection.release();
                                     if (err) {
-                                        return rejectQ(err);
+                                        return fail(err);
                                     }
                                     this._detectEventQuery({ start, sql, results });
-                                    return resolveQ(results);
+                                    return ok(results);
+                                });
+                            });
+                        };
+                        return resolve({
+                            on: (event, data) => this.on(event, data),
+                            query
+                        });
+                    });
+                });
+            }
+        };
+    }
+    newConnected() {
+        const pool = (0, mysql2_1.createPool)(Object.fromEntries(this.OPTIONS));
+        return {
+            on: (event, data) => {
+                return this.on(event, data);
+            },
+            query: (sql) => {
+                return new Promise((resolve, reject) => {
+                    const start = Date.now();
+                    pool.query(sql, (err, results) => {
+                        if (err)
+                            return reject(err);
+                        this._detectEventQuery({
+                            start,
+                            sql,
+                            results
+                        });
+                        return resolve(results);
+                    });
+                });
+            },
+            connection: () => {
+                let closeTransction = false;
+                return new Promise((resolve, reject) => {
+                    pool.getConnection((err, connection) => {
+                        if (err)
+                            return reject(err);
+                        const query = (sql) => {
+                            const start = Date.now();
+                            return new Promise((ok, fail) => {
+                                if (closeTransction) {
+                                    return fail(new Error('The transaction has either been closed'));
+                                }
+                                connection.query(sql, (err, results) => {
+                                    connection.release();
+                                    if (err) {
+                                        return fail(err);
+                                    }
+                                    this._detectEventQuery({ start, sql, results });
+                                    return ok(results);
                                 });
                             });
                         };
                         const startTransaction = () => __awaiter(this, void 0, void 0, function* () {
-                            // don't use await as it blocks all connection pools. and ignore the .bind(...) method.
                             yield query('START TRANSACTION')
                                 .catch(err => reject(err));
                             return;
@@ -124,6 +175,19 @@ class PoolConnection extends events_1.EventEmitter {
                         const rollback = () => __awaiter(this, void 0, void 0, function* () {
                             yield query('ROLLBACK')
                                 .catch(err => reject(err));
+                            // when rollback will end of transction
+                            yield end();
+                            return;
+                        });
+                        const end = () => __awaiter(this, void 0, void 0, function* () {
+                            yield new Promise(resolve => setTimeout(() => {
+                                // After commit the transaction, you can't perform any actions with this transaction.
+                                connection.destroy();
+                                // After destroying the connection, it will be removed from the connection pool.
+                                pool.end();
+                                closeTransction = true;
+                                return resolve();
+                            }, 500));
                             return;
                         });
                         return resolve({
@@ -131,7 +195,8 @@ class PoolConnection extends events_1.EventEmitter {
                             query,
                             startTransaction,
                             commit,
-                            rollback
+                            rollback,
+                            end
                         });
                     });
                 });
@@ -282,6 +347,9 @@ class PoolConnection extends events_1.EventEmitter {
                 if (err) {
                     const message = this._messageError.bind(this);
                     process.nextTick(() => {
+                        if (String(err.message).includes('Pool is close')) {
+                            return;
+                        }
                         console.log(message(err.message == null || err.message === '' ? err.code : err.message));
                         if (options_1.default.CONNECTION_ERROR)
                             return process.exit();
@@ -351,4 +419,4 @@ exports.PoolConnection = PoolConnection;
 const pool = new PoolConnection().connected();
 exports.Pool = pool;
 exports.default = pool;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=Pool.js.map

package/build/lib/core/Pool.js.map

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

package/build/lib/core/Repository.d.ts

@@ -13,7 +13,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * It allows you to retrieve a single record from a database table that meets the specified criteria.
      * @type     {?Object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -54,8 +54,8 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      *
      * It allows you to retrieve a single record from a database table that meets the specified criteria.
      * @type     {?Object}  options
-      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.select
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -97,7 +97,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * It allows you to retrieve a single record from a database table that meets the specified criteria.
      * @type     {?Object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -139,7 +139,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * It allows you to retrieve a single record from a database table that meets the specified criteria.
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -182,7 +182,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * making it easier to display data in a web application and improve user experience.
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -226,7 +226,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * making it easier to display data in a web application and improve user experience
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -268,7 +268,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * It returns a boolean value indicating whether there are any matching records.
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -291,7 +291,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * This method is particularly useful for debugging and understanding the SQL queries generated by your application.
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -317,7 +317,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * It returns a JSON formatted.
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -344,7 +344,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -369,7 +369,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -394,7 +394,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -419,7 +419,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -444,7 +444,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -469,7 +469,7 @@ declare class RepositoryHandler<TS extends Record<string, any> = any, TR = unkno
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having

package/build/lib/core/Repository.js

@@ -21,7 +21,7 @@ class RepositoryHandler {
      * It allows you to retrieve a single record from a database table that meets the specified criteria.
      * @type     {?Object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -72,8 +72,8 @@ class RepositoryHandler {
      *
      * It allows you to retrieve a single record from a database table that meets the specified criteria.
      * @type     {?Object}  options
-      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.select
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -119,7 +119,7 @@ class RepositoryHandler {
      * It allows you to retrieve a single record from a database table that meets the specified criteria.
      * @type     {?Object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -171,7 +171,7 @@ class RepositoryHandler {
      * It allows you to retrieve a single record from a database table that meets the specified criteria.
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -218,7 +218,7 @@ class RepositoryHandler {
      * making it easier to display data in a web application and improve user experience.
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -274,7 +274,7 @@ class RepositoryHandler {
      * making it easier to display data in a web application and improve user experience
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -320,7 +320,7 @@ class RepositoryHandler {
      * It returns a boolean value indicating whether there are any matching records.
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -352,7 +352,7 @@ class RepositoryHandler {
      * This method is particularly useful for debugging and understanding the SQL queries generated by your application.
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -385,7 +385,7 @@ class RepositoryHandler {
      * It returns a JSON formatted.
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -421,7 +421,7 @@ class RepositoryHandler {
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -455,7 +455,7 @@ class RepositoryHandler {
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -489,7 +489,7 @@ class RepositoryHandler {
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -523,7 +523,7 @@ class RepositoryHandler {
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -557,7 +557,7 @@ class RepositoryHandler {
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -591,7 +591,7 @@ class RepositoryHandler {
      * @param    {string} column
      * @type     {?object}  options
      * @property {?object} options.select
-     * @property {?object} options.omit
+     * @property {?object} options.except
      * @property {?object[]} options.orderBy
      * @property {?string[]} options.groupBy
      * @property {?string} options.having
@@ -1000,7 +1000,7 @@ class RepositoryHandler {
             return yield instance.deleteMany();
         });
     }
-    _handleRelationQuery({ instance, name, options }) {
+    _handleRelationQuery({ instance, name, options, exists }) {
         const cbRelation = instance.findWithQuery(name);
         if (cbRelation == null)
             return null;
@@ -1010,28 +1010,43 @@ class RepositoryHandler {
             });
             if (instanceRelation == null)
                 return null;
-            instance.relationQuery(name, () => instanceRelation);
+            if (exists) {
+                instance.relationQueryExists(name, () => instanceRelation);
+            }
+            else {
+                instance.relationQuery(name, () => instanceRelation);
+            }
             return cbRelation;
         }
         const instanceRelation = this._handlerRequest(Object.assign(Object.assign({}, options), { instance: cbRelation }));
         if (instanceRelation == null)
             return null;
-        instance.relationQuery(name, () => instanceRelation);
+        if (exists) {
+            instance.relationQueryExists(name, () => instanceRelation);
+        }
+        else {
+            instance.relationQuery(name, () => instanceRelation);
+        }
         return cbRelation;
     }
     _handlerRequest(options) {
-        let { cache, select, omit, join, leftJoin, rightJoin, where, whereRaw, whereQuery, groupBy, having, orderBy, limit, offset, relations, relationsExists, when, instance } = options;
+        let { cache, select, except, join, leftJoin, rightJoin, where, whereRaw, whereQuery, groupBy, having, orderBy, limit, offset, relations, relationsExists, when, instance } = options;
         instance = (instance == null ? new this._model() : instance);
         if (relations != null) {
             const filterRelations = [];
             for (const name in relations) {
                 const value = relations[name];
-                if (typeof value === 'boolean') {
-                    if (value) {
-                        filterRelations.push(name);
-                    }
+                if (typeof value === 'boolean' && value) {
+                    filterRelations.push(name);
                     continue;
                 }
+                const cbRelation = this._handleRelationQuery({
+                    instance,
+                    name,
+                    options: { relations: value }
+                });
+                if (cbRelation == null)
+                    continue;
                 this._handleRelationQuery({
                     instance,
                     name,
@@ -1044,17 +1059,26 @@ class RepositoryHandler {
             const filterRelations = [];
             for (const name in relationsExists) {
                 const value = relationsExists[name];
-                if (typeof value === 'boolean') {
-                    if (value) {
-                        filterRelations.push(name);
-                    }
+                if (typeof value === 'boolean' && value) {
+                    filterRelations.push(name);
                     continue;
                 }
+                const cbRelation = this._handleRelationQuery({
+                    instance,
+                    name,
+                    options: { relationsExists: value },
+                    exists: true
+                });
+                if (cbRelation == null)
+                    continue;
+                // console.log('hi!')
                 this._handleRelationQuery({
                     instance,
                     name,
-                    options: value
+                    options: value,
+                    exists: true
                 });
+                // filterRelations.push(name)
             }
             instance.relationsExists(...filterRelations);
         }
@@ -1079,30 +1103,28 @@ class RepositoryHandler {
                         name: column,
                         options: { select: value }
                     });
-                    if (cbRelation == null) {
-                        selects.push(column);
+                    if (cbRelation != null)
                         continue;
-                    }
+                    selects.push(column);
                 }
                 instance.select(...selects);
             }
         }
-        if (omit != null) {
-            const omits = [];
-            for (const column in omit) {
+        if (except != null) {
+            const excepts = [];
+            for (const column in except) {
                 //@ts-ignore
-                const value = omit[column];
+                const value = except[column];
                 const cbRelation = this._handleRelationQuery({
                     instance,
                     name: column,
-                    options: { omit: value }
+                    options: { except: value }
                 });
-                if (cbRelation == null) {
-                    omits.push(column);
+                if (cbRelation != null)
                     continue;
-                }
+                excepts.push(column);
             }
-            instance.except(...omits);
+            instance.except(...excepts);
         }
         if (join != null) {
             for (const v of join) {
@@ -1128,9 +1150,8 @@ class RepositoryHandler {
                     name: column,
                     options: { where: value }
                 });
-                if (cbRelation == null) {
+                if (cbRelation == null)
                     continue;
-                }
                 //@ts-ignore
                 delete where[column];
             }
@@ -1155,8 +1176,15 @@ class RepositoryHandler {
         if (orderBy != null) {
             for (const column in orderBy) {
                 //@ts-ignore
-                const orderby = orderBy[column];
-                instance.orderBy(column, orderby);
+                const value = orderBy[column];
+                const cbRelation = this._handleRelationQuery({
+                    instance,
+                    name: column,
+                    options: { orderBy: value }
+                });
+                if (cbRelation != null)
+                    continue;
+                instance.orderBy(column, value);
             }
         }
         if (limit != null) {