@node-c/persistance-rdb 1.0.0-alpha3 → 1.0.0-alpha31

package/dist/index.js

@@ -15,8 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./common/definitions"), exports);
-__exportStar(require("./entityService"), exports);
-__exportStar(require("./module"), exports);
+__exportStar(require("./entity"), exports);
+__exportStar(require("./ormQueryBuilder"), exports);
 __exportStar(require("./repository"), exports);
 __exportStar(require("./sqlQueryBuilder"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,kDAAgC;AAChC,2CAAyB;AACzB,+CAA6B;AAC7B,oDAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,2CAAyB;AACzB,oDAAkC;AAClC,+CAA6B;AAC7B,oDAAkC"}

package/dist/ormQueryBuilder/index.d.ts

@@ -0,0 +1 @@
+export * from './rdb.ormQueryBuilder';

package/dist/{module → ormQueryBuilder}/index.js

@@ -14,6 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./rdb.module.definitions"), exports);
-__exportStar(require("./rdb.module"), exports);
+__exportStar(require("./rdb.ormQueryBuilder"), exports);
 //# sourceMappingURL=index.js.map

package/dist/ormQueryBuilder/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ormQueryBuilder/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC"}

package/dist/ormQueryBuilder/rdb.ormQueryBuilder.d.ts

@@ -0,0 +1,38 @@
+import { PersistanceOrderByDirection } from '@node-c/core';
+export declare abstract class OrmBaseQueryBuilder<Entity> {
+    abstract andWhere(..._args: unknown[]): OrmBaseQueryBuilder<Entity>;
+    abstract orWhere(..._args: unknown[]): OrmBaseQueryBuilder<Entity>;
+    abstract where(..._args: unknown[]): OrmBaseQueryBuilder<Entity>;
+}
+export declare abstract class OrmDeleteQueryBuilder<Entity> extends OrmBaseQueryBuilder<Entity> {
+    abstract execute(): Promise<OrmDeleteQueryBuilderDeleteResult>;
+}
+export interface OrmDeleteQueryBuilderDeleteResult {
+    affected?: number | null;
+    raw: unknown;
+}
+export declare abstract class OrmSelectQueryBuilder<Entity> extends OrmBaseQueryBuilder<Entity> {
+    abstract addOrderBy(_field: string, _direction: PersistanceOrderByDirection): OrmSelectQueryBuilder<Entity>;
+    abstract delete(): OrmDeleteQueryBuilder<Entity>;
+    abstract getCount(): Promise<number>;
+    abstract getMany(): Promise<Entity[]>;
+    abstract getOne(): Promise<Entity | null>;
+    abstract leftJoinAndSelect(..._args: unknown[]): OrmSelectQueryBuilder<Entity>;
+    abstract orderBy(_field: string, _direction: PersistanceOrderByDirection): OrmSelectQueryBuilder<Entity>;
+    abstract select(_selection: string[]): OrmSelectQueryBuilder<Entity>;
+    abstract skip(_skipCount: number): OrmSelectQueryBuilder<Entity>;
+    abstract softDelete(): OrmDeleteQueryBuilder<Entity>;
+    abstract take(_takeCount: number): OrmSelectQueryBuilder<Entity>;
+    abstract update(): OrmUpdateQueryBuilder<Entity>;
+    abstract withDeleted(): OrmSelectQueryBuilder<Entity>;
+}
+export declare abstract class OrmUpdateQueryBuilder<Entity> extends OrmBaseQueryBuilder<Entity> {
+    abstract execute(): Promise<OrmUpdateQueryBuilderUpdateResult>;
+    abstract returning(_selection: string | string[]): OrmUpdateQueryBuilder<Entity>;
+    abstract set(..._args: unknown[]): OrmUpdateQueryBuilder<Entity>;
+}
+export interface OrmUpdateQueryBuilderUpdateResult {
+    affected?: number;
+    generatedMaps?: object[];
+    raw: unknown;
+}

package/dist/ormQueryBuilder/rdb.ormQueryBuilder.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrmUpdateQueryBuilder = exports.OrmSelectQueryBuilder = exports.OrmDeleteQueryBuilder = exports.OrmBaseQueryBuilder = void 0;
+class OrmBaseQueryBuilder {
+}
+exports.OrmBaseQueryBuilder = OrmBaseQueryBuilder;
+class OrmDeleteQueryBuilder extends OrmBaseQueryBuilder {
+}
+exports.OrmDeleteQueryBuilder = OrmDeleteQueryBuilder;
+class OrmSelectQueryBuilder extends OrmBaseQueryBuilder {
+}
+exports.OrmSelectQueryBuilder = OrmSelectQueryBuilder;
+class OrmUpdateQueryBuilder extends OrmBaseQueryBuilder {
+}
+exports.OrmUpdateQueryBuilder = OrmUpdateQueryBuilder;
+//# sourceMappingURL=rdb.ormQueryBuilder.js.map

package/dist/ormQueryBuilder/rdb.ormQueryBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rdb.ormQueryBuilder.js","sourceRoot":"","sources":["../../src/ormQueryBuilder/rdb.ormQueryBuilder.ts"],"names":[],"mappings":";;;AAEA,MAAsB,mBAAmB;CAIxC;AAJD,kDAIC;AAED,MAAsB,qBAA8B,SAAQ,mBAA2B;CAEtF;AAFD,sDAEC;AAOD,MAAsB,qBAA8B,SAAQ,mBAA2B;CActF;AAdD,sDAcC;AAED,MAAsB,qBAA8B,SAAQ,mBAA2B;CAItF;AAJD,sDAIC"}

package/dist/repository/index.d.ts

@@ -1,2 +1 @@
-export * from './rdb.repository.definitions';
-export * from './rdb.repository.module';
+export * from './rdb.repository';

package/dist/repository/index.js

@@ -14,6 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./rdb.repository.definitions"), exports);
-__exportStar(require("./rdb.repository.module"), exports);
+__exportStar(require("./rdb.repository"), exports);
 //# sourceMappingURL=index.js.map

package/dist/repository/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/repository/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,0DAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/repository/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC"}

package/dist/repository/rdb.repository.d.ts

@@ -0,0 +1,22 @@
+import { GenericObject, GenericObjectType } from '@node-c/core';
+import { OrmSelectQueryBuilder } from '../ormQueryBuilder';
+export declare abstract class RDBEntityManager {
+    abstract getRepository<Entity extends GenericObject<unknown>>(_target: unknown): RDBRepository<Entity>;
+    abstract query(_query: string, _params?: unknown[]): Promise<unknown>;
+    abstract save<Entity extends GenericObject<unknown> = GenericObject<unknown>>(_target: unknown, _data: Partial<Entity> | Partial<Entity[]>, _options?: unknown): Promise<unknown>;
+    abstract transaction(_callback: (_em: RDBEntityManager) => Promise<unknown>): Promise<unknown>;
+}
+export type RDBEntityTarget<Entity> = string | {
+    name: string;
+    type: Entity;
+} | GenericObjectType<Entity>;
+export declare abstract class RDBRepository<Entity extends GenericObject<unknown>> {
+    manager: RDBEntityManager;
+    metadata: {
+        name: string;
+        tableName: string;
+    };
+    target: unknown;
+    abstract createQueryBuilder(_entityName: string, _queryRunner?: unknown): OrmSelectQueryBuilder<Entity>;
+    abstract save(_data: Partial<Entity> | Partial<Entity[]>, _options?: unknown): Promise<unknown>;
+}

package/dist/repository/rdb.repository.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RDBRepository = exports.RDBEntityManager = void 0;
+class RDBEntityManager {
+}
+exports.RDBEntityManager = RDBEntityManager;
+class RDBRepository {
+}
+exports.RDBRepository = RDBRepository;
+//# sourceMappingURL=rdb.repository.js.map

package/dist/repository/rdb.repository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rdb.repository.js","sourceRoot":"","sources":["../../src/repository/rdb.repository.ts"],"names":[],"mappings":";;;AAIA,MAAsB,gBAAgB;CASrC;AATD,4CASC;AAID,MAAsB,aAAa;CAUlC;AAVD,sCAUC"}

package/dist/sqlQueryBuilder/index.d.ts

@@ -1,3 +1,3 @@
-export * from './sqlQueryBuilder.definitions';
-export * from './sqlQueryBuilder.module';
-export * from './sqlQueryBuilder.service';
+export * from './rdb.sqlQueryBuilder.definitions';
+export * from './rdb.sqlQueryBuilder.module';
+export * from './rdb.sqlQueryBuilder.service';

package/dist/sqlQueryBuilder/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./sqlQueryBuilder.definitions"), exports);
-__exportStar(require("./sqlQueryBuilder.module"), exports);
-__exportStar(require("./sqlQueryBuilder.service"), exports);
+__exportStar(require("./rdb.sqlQueryBuilder.definitions"), exports);
+__exportStar(require("./rdb.sqlQueryBuilder.module"), exports);
+__exportStar(require("./rdb.sqlQueryBuilder.service"), exports);
 //# sourceMappingURL=index.js.map

package/dist/sqlQueryBuilder/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sqlQueryBuilder/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gEAA8C;AAC9C,2DAAyC;AACzC,4DAA0C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sqlQueryBuilder/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oEAAkD;AAClD,+DAA6C;AAC7C,gEAA8C"}

package/dist/sqlQueryBuilder/{sqlQueryBuilder.definitions.d.ts → rdb.sqlQueryBuilder.definitions.d.ts}

@@ -1,8 +1,8 @@
-import { GenericObject } from '@node-c/core';
+import { GenericObject, PersistanceOrderBy } from '@node-c/core';
 export interface BuildQueryOptions {
     deletedColumnName?: string;
     include?: IncludeItems;
-    orderBy?: OrderBy[];
+    orderBy?: PersistanceOrderBy[];
     select?: string[];
     where?: {
         [fieldName: string]: ParsedFilter;
@@ -12,10 +12,6 @@ export interface BuildQueryOptions {
 export interface IncludeItems {
     [relationProperty: string]: string;
 }
-export interface OrderBy {
-    field: string;
-    direction: 'ASC' | 'DESC';
-}
 export interface ParsedFilter {
     params?: GenericObject<unknown>;
     query: string;

package/dist/{repository/rdb.repository.definitions.js → sqlQueryBuilder/rdb.sqlQueryBuilder.definitions.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=rdb.repository.definitions.js.map
+//# sourceMappingURL=rdb.sqlQueryBuilder.definitions.js.map

package/dist/sqlQueryBuilder/rdb.sqlQueryBuilder.definitions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rdb.sqlQueryBuilder.definitions.js","sourceRoot":"","sources":["../../src/sqlQueryBuilder/rdb.sqlQueryBuilder.definitions.ts"],"names":[],"mappings":""}

package/dist/sqlQueryBuilder/{sqlQueryBuilder.module.d.ts → rdb.sqlQueryBuilder.module.d.ts}

@@ -1,5 +1,5 @@
 import { DynamicModule } from '@nestjs/common';
-import { SQLQueryBuilderModuleOptions } from './sqlQueryBuilder.definitions';
+import { SQLQueryBuilderModuleOptions } from './rdb.sqlQueryBuilder.definitions';
 export declare class SQLQueryBuilderModule {
     static register(options: SQLQueryBuilderModuleOptions): DynamicModule;
 }

package/dist/sqlQueryBuilder/{sqlQueryBuilder.module.js → rdb.sqlQueryBuilder.module.js}

@@ -9,7 +9,8 @@ var SQLQueryBuilderModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLQueryBuilderModule = void 0;
 const common_1 = require("@nestjs/common");
-const sqlQueryBuilder_service_1 = require("./sqlQueryBuilder.service");
+const core_1 = require("@node-c/core");
+const rdb_sqlQueryBuilder_service_1 = require("./rdb.sqlQueryBuilder.service");
 const definitions_1 = require("../common/definitions");
 let SQLQueryBuilderModule = SQLQueryBuilderModule_1 = class SQLQueryBuilderModule {
     static register(options) {
@@ -23,9 +24,13 @@ let SQLQueryBuilderModule = SQLQueryBuilderModule_1 = class SQLQueryBuilderModul
                     provide: definitions_1.Constants.SQL_BUILDER_DB_CONFIG_PATH,
                     useValue: `config.persistance.${persistanceModuleName}`
                 },
-                { provide: serviceToken, useClass: sqlQueryBuilder_service_1.SQLQueryBuilderService }
+                {
+                    provide: core_1.Constants.PERSISTANCE_MODULE_NAME,
+                    useValue: persistanceModuleName
+                },
+                { provide: serviceToken, useClass: rdb_sqlQueryBuilder_service_1.SQLQueryBuilderService }
             ],
-            exports: [{ provide: serviceToken, useClass: sqlQueryBuilder_service_1.SQLQueryBuilderService }]
+            exports: [{ provide: serviceToken, useClass: rdb_sqlQueryBuilder_service_1.SQLQueryBuilderService }]
         };
     }
 };
@@ -33,4 +38,4 @@ exports.SQLQueryBuilderModule = SQLQueryBuilderModule;
 exports.SQLQueryBuilderModule = SQLQueryBuilderModule = SQLQueryBuilderModule_1 = __decorate([
     (0, common_1.Module)({})
 ], SQLQueryBuilderModule);
-//# sourceMappingURL=sqlQueryBuilder.module.js.map
+//# sourceMappingURL=rdb.sqlQueryBuilder.module.js.map

package/dist/sqlQueryBuilder/rdb.sqlQueryBuilder.module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rdb.sqlQueryBuilder.module.js","sourceRoot":"","sources":["../../src/sqlQueryBuilder/rdb.sqlQueryBuilder.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAuD;AAEvD,uCAA0D;AAG1D,+EAAuE;AAEvE,uDAAkD;AAG3C,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAChC,MAAM,CAAC,QAAQ,CAAC,OAAqC;QACnD,MAAM,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC;QAC1C,MAAM,YAAY,GAAG,GAAG,qBAAqB,GAAG,uBAAS,CAAC,gCAAgC,EAAE,CAAC;QAC7F,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,uBAAqB;YAC7B,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,uBAAS,CAAC,0BAA0B;oBAC7C,QAAQ,EAAE,sBAAsB,qBAAqB,EAAE;iBACxD;gBACD;oBACE,OAAO,EAAE,gBAAa,CAAC,uBAAuB;oBAC9C,QAAQ,EAAE,qBAAqB;iBAChC;gBACD,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,oDAAsB,EAAE;aAC5D;YACD,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,oDAAsB,EAAE,CAAC;SACvE,CAAC;IACJ,CAAC;CACF,CAAA;AArBY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,qBAAqB,CAqBjC"}

package/dist/sqlQueryBuilder/rdb.sqlQueryBuilder.service.d.ts

@@ -0,0 +1,47 @@
+import { ConfigProviderService, GenericObject, PersistanceOrderBy, PersistanceOrderByDirection, PersistanceSelectOperator, RDBType } from '@node-c/core';
+import { BuildQueryOptions, IncludeItems, ParsedFilter } from './rdb.sqlQueryBuilder.definitions';
+import { OrmBaseQueryBuilder, OrmSelectQueryBuilder } from '../ormQueryBuilder';
+export declare class SQLQueryBuilderService {
+    configProvider: ConfigProviderService;
+    dbConfigPath: string;
+    persistanceModuleName: string;
+    allowedStringOperators: string[];
+    columnQuotesSymbol: string;
+    dbType: RDBType | string;
+    iLikeSupported: boolean;
+    returningSupported: boolean;
+    constructor(configProvider: ConfigProviderService, dbConfigPath: string, persistanceModuleName: string);
+    buildQuery<Entity>(ormQueryBuilder: OrmBaseQueryBuilder<Entity> | OrmSelectQueryBuilder<Entity>, options: BuildQueryOptions): void;
+    protected getValueForFilter(entityName: string, _fieldName: string, fieldAlias: string, fieldValue: unknown, isNot: boolean, operator?: PersistanceSelectOperator): ParsedFilter;
+    protected parseArrayOfFilters(filtersArray: unknown[], fieldAlias: string): {
+        hasValues: boolean;
+        isSimple: boolean;
+        paramsForQuery: GenericObject;
+        queryTemplateParamNames: string;
+    };
+    parseFilters(entityName: string, filters: GenericObject, options?: {
+        fieldAliases?: {
+            [fieldName: string]: string;
+        };
+        isTopLevel?: boolean;
+        operator?: PersistanceSelectOperator;
+        parameterNamesToFieldAliasesMap?: {
+            [fieldName: string]: string;
+        };
+    }): {
+        where: {
+            [fieldName: string]: ParsedFilter;
+        };
+        include: IncludeItems;
+    };
+    protected parseInnerFilters(entityName: string, filtersObject: GenericObject, fieldName: string, fieldAlias: string, operator?: PersistanceSelectOperator): {
+        parsedFilter: ParsedFilter;
+        include: IncludeItems;
+    };
+    parseRelations(entityName: string, include: string[], currentInclude?: IncludeItems): IncludeItems;
+    parseOrderBy(entityName: string, orderByData: GenericObject<PersistanceOrderByDirection>): {
+        include: IncludeItems;
+        orderBy: PersistanceOrderBy[];
+    };
+    parseSelect(selectFields: string[], include?: IncludeItems): string[];
+}

package/dist/sqlQueryBuilder/{sqlQueryBuilder.service.js → rdb.sqlQueryBuilder.service.js}

@@ -11,52 +11,64 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLQueryBuilderService = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@node-c/core");
-const general_tools_1 = require("@ramster/general-tools");
-const typeorm_1 = require("typeorm");
+const lodash_1 = __importDefault(require("lodash"));
 const definitions_1 = require("../common/definitions");
 let SQLQueryBuilderService = class SQLQueryBuilderService {
-    constructor(configProvider, dbConfigPath) {
+    constructor(configProvider, dbConfigPath, persistanceModuleName) {
         this.configProvider = configProvider;
         this.dbConfigPath = dbConfigPath;
+        this.persistanceModuleName = persistanceModuleName;
         this.allowedStringOperators = Object.values(core_1.PersistanceSelectOperator);
-        const { type } = (0, general_tools_1.getNested)(configProvider, dbConfigPath);
+        const { type } = lodash_1.default.get(configProvider, dbConfigPath);
         this.dbType = type;
-        if (type === core_1.RDBType.MySQL) {
+        if (type === core_1.RDBType.Aurora || type === core_1.RDBType.ClickHouse || type === core_1.RDBType.MySQL) {
             this.columnQuotesSymbol = '`';
             this.iLikeSupported = false;
+            this.returningSupported = false;
         }
         else if (type === core_1.RDBType.PG) {
             this.columnQuotesSymbol = '"';
             this.iLikeSupported = true;
+            this.returningSupported = true;
         }
     }
-    buildQuery(queryBuilder, options) {
-        const { where, include, orderBy, select, withDeleted = false } = options;
+    buildQuery(ormQueryBuilder, options) {
+        const { where: optWhere, include, orderBy, select, withDeleted } = options;
         const cqs = this.columnQuotesSymbol;
         const deletedColumnName = options.deletedColumnName || 'deletedAt';
-        if (queryBuilder instanceof typeorm_1.SelectQueryBuilder) {
+        const where = Object.assign({}, (optWhere || {}));
+        if ('withDeleted' in ormQueryBuilder) {
+            const oqb = ormQueryBuilder;
             if (withDeleted) {
-                queryBuilder.withDeleted();
+                oqb.withDeleted();
             }
             if (include) {
                 for (const relationProperty in include) {
                     if (withDeleted) {
-                        queryBuilder.leftJoinAndSelect(relationProperty, include[relationProperty]);
+                        oqb.leftJoinAndSelect(relationProperty, include[relationProperty]);
                     }
                     else {
-                        queryBuilder.leftJoinAndSelect(relationProperty, include[relationProperty], `${cqs}${include[relationProperty]}${cqs}.${cqs}${deletedColumnName}${cqs} IS NULL`);
+                        oqb.leftJoinAndSelect(relationProperty, include[relationProperty], `${cqs}${include[relationProperty]}${cqs}.${cqs}${deletedColumnName}${cqs} IS NULL`);
                     }
                 }
             }
             if (select && select.length) {
-                queryBuilder.select(this.parseSelect(select, include));
+                oqb.select(this.parseSelect(select, include));
             }
         }
-        if (where) {
+        else if (withDeleted === false) {
+            where[deletedColumnName] = {
+                query: `${cqs}${deletedColumnName}${cqs} IS NULL`
+            };
+        }
+        if (Object.keys(where).length) {
             let isFirst = true;
             for (const fieldName in where) {
                 const whereItem = where[fieldName];
@@ -70,10 +82,11 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
                 else {
                     methodName = fieldName === core_1.PersistanceSelectOperator.Or ? 'orWhere' : 'andWhere';
                 }
-                queryBuilder[methodName](whereItem.query, whereItem.params);
+                ormQueryBuilder[methodName](whereItem.query, whereItem.params);
             }
         }
-        if (orderBy && queryBuilder instanceof typeorm_1.SelectQueryBuilder) {
+        if (orderBy && 'orderBy' in ormQueryBuilder) {
+            const oqb = ormQueryBuilder;
             let isFirst = true;
             for (const item of orderBy) {
                 let methodName = 'addOrderBy';
@@ -81,19 +94,20 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
                     methodName = 'orderBy';
                     isFirst = false;
                 }
-                queryBuilder[methodName](item.field, item.direction);
+                oqb[methodName](item.field, item.direction);
             }
         }
     }
-    getValueForFilter(entityName, fieldName, fieldAlias, fieldValue, isNot, operator) {
+    getValueForFilter(entityName, _fieldName, fieldAlias, fieldValue, isNot, operator) {
         const { columnQuotesSymbol: cqs, dbType } = this;
         const escapedFieldAlias = fieldAlias.replace(/\$/, '__ds__');
-        const fieldString = `${cqs}${entityName}${cqs}.${cqs}${fieldName}${cqs}`;
-        const parsedInnerValue = fieldValue instanceof Date ? fieldValue.valueOf() : fieldValue;
+        const fieldString = `${cqs}${entityName}${cqs}.${cqs}${fieldAlias}${cqs}`;
+        let parsedInnerValue = fieldValue instanceof Date ? fieldValue.valueOf() : fieldValue;
         if (operator === core_1.PersistanceSelectOperator.Contains) {
             let query = '';
-            if (dbType === core_1.RDBType.MySQL) {
+            if (dbType === core_1.RDBType.Aurora || dbType === core_1.RDBType.ClickHouse || dbType === core_1.RDBType.MySQL) {
                 query = `JSON_CONTAINS(${fieldString}, :${escapedFieldAlias})`;
+                parsedInnerValue = `"${parsedInnerValue}"`;
             }
             else if (dbType === core_1.RDBType.PG) {
                 query = `${fieldString} ? :${escapedFieldAlias}`;
@@ -186,6 +200,7 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
         const cqs = this.columnQuotesSymbol;
         const { isTopLevel, operator } = options;
         const fieldAliases = options.fieldAliases || {};
+        const parameterNamesToFieldAliasesMap = options.parameterNamesToFieldAliasesMap || {};
         const where = {};
         let include = {};
         for (const fieldName in filters) {
@@ -193,8 +208,8 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
             if (typeof fieldValue === 'undefined') {
                 continue;
             }
-            const fieldAlias = fieldAliases[fieldName] || fieldName;
             const isNot = operator === core_1.PersistanceSelectOperator.Not;
+            let fieldAlias = fieldAliases[fieldName];
             if (fieldName.match(/\./)) {
                 const fieldData = fieldName.split('.');
                 const finalItemIndex = fieldData.length - 1;
@@ -203,12 +218,16 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
                 let previousEntityAlias = `${entityName}`;
                 for (let i = 0; i < finalItemIndex; i++) {
                     const currentEntityName = fieldData[i];
-                    entityAlias += `_${currentEntityName}`;
+                    entityAlias += `__${currentEntityName}`;
                     include[`${previousEntityAlias}.${currentEntityName}`] = entityAlias;
                     previousEntityAlias = `${entityAlias}`;
                 }
+                if (!fieldAlias) {
+                    fieldAlias = actualFieldName;
+                }
+                const actualFieldAlias = parameterNamesToFieldAliasesMap[fieldAlias] || fieldAlias;
                 const itemData = this.parseFilters(entityAlias, { [actualFieldName]: fieldValue }, {
-                    fieldAliases: { [actualFieldName]: fieldAlias },
+                    fieldAliases: { [actualFieldName]: actualFieldAlias },
                     isTopLevel: false,
                     operator
                 });
@@ -216,14 +235,18 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
                 include = Object.assign(Object.assign({}, include), itemData.include);
                 continue;
             }
+            if (!fieldAlias) {
+                fieldAlias = fieldName;
+            }
+            const actualFieldAlias = parameterNamesToFieldAliasesMap[fieldAlias] || fieldAlias;
             if (fieldValue === null) {
                 where[fieldName] = {
-                    query: `${cqs}${entityName}${cqs}.${cqs}${fieldName}${cqs} is${isNot ? ' not ' : ' '}null`
+                    query: `${cqs}${entityName}${cqs}.${cqs}${actualFieldAlias}${cqs} is${isNot ? ' not ' : ' '}null`
                 };
                 continue;
             }
             if (fieldValue instanceof Array) {
-                const { hasValues, isSimple, paramsForQuery, queryTemplateParamNames } = this.parseArrayOfFilters(fieldValue, fieldAlias);
+                const { hasValues, isSimple, paramsForQuery, queryTemplateParamNames } = this.parseArrayOfFilters(fieldValue, actualFieldAlias);
                 if (!hasValues) {
                     continue;
                 }
@@ -231,14 +254,14 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
                     if (operator === core_1.PersistanceSelectOperator.Between) {
                         where[fieldName] = {
                             params: paramsForQuery,
-                            query: `${cqs}${entityName}${cqs}.${cqs}${fieldName}${cqs}${isNot ? ' not ' : ' '}` +
-                                `between :${fieldAlias}_0 and :${fieldAlias}_1`
+                            query: `${cqs}${entityName}${cqs}.${cqs}${actualFieldAlias}${cqs}${isNot ? ' not ' : ' '}` +
+                                `between :${actualFieldAlias}_0 and :${actualFieldAlias}_1`
                         };
                         continue;
                     }
                     where[fieldName] = {
                         params: paramsForQuery,
-                        query: `${cqs}${entityName}${cqs}.${cqs}${fieldName}${cqs}${isNot ? ' not ' : ' '}` +
+                        query: `${cqs}${entityName}${cqs}.${cqs}${actualFieldAlias}${cqs}${isNot ? ' not ' : ' '}` +
                             `in (${queryTemplateParamNames.replace(/,\s$/, '')})`
                     };
                     continue;
@@ -246,31 +269,30 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
                 if (isTopLevel && fieldName === core_1.PersistanceSelectOperator.Or) {
                     const finalWhereValue = { params: {}, query: '' };
                     fieldValue.forEach((orFieldValue, orFieldIndex) => {
-                        const itemData = this.parseInnerFilters(entityName, orFieldValue, fieldName, `${fieldAlias}_${orFieldIndex}_f`, operator);
+                        const itemData = this.parseInnerFilters(entityName, orFieldValue, fieldName, `${actualFieldAlias}_${orFieldIndex}_f`, operator);
                         finalWhereValue.params = Object.assign(Object.assign({}, finalWhereValue.params), (itemData.parsedFilter.params || {}));
                         finalWhereValue.query += `${finalWhereValue.query.length ? ' or ' : '('}${itemData.parsedFilter.query}`;
                         include = Object.assign(Object.assign({}, include), itemData.include);
                     });
                     finalWhereValue.query += ')';
                     where[fieldName] = finalWhereValue;
+                    continue;
                 }
-                else {
-                    const itemData = this.parseInnerFilters(entityName, fieldValue, fieldName, fieldAlias, operator);
-                    if (itemData.parsedFilter.query === '()') {
-                        continue;
-                    }
-                    where[fieldName] = itemData.parsedFilter;
-                    include = Object.assign(Object.assign({}, include), itemData.include);
+                const itemData = this.parseInnerFilters(entityName, fieldValue, fieldName, actualFieldAlias, operator);
+                if (itemData.parsedFilter.query === '()') {
+                    continue;
                 }
+                where[fieldName] = itemData.parsedFilter;
+                include = Object.assign(Object.assign({}, include), itemData.include);
                 continue;
             }
             if (typeof fieldValue === 'object' && !(fieldValue instanceof Date)) {
-                const itemData = this.parseInnerFilters(entityName, fieldValue, fieldName, fieldAlias, operator);
+                const itemData = this.parseInnerFilters(entityName, fieldValue, fieldName, actualFieldAlias, operator);
                 where[fieldName] = itemData.parsedFilter;
                 include = Object.assign(Object.assign({}, include), itemData.include);
                 continue;
             }
-            where[fieldName] = this.getValueForFilter(entityName, fieldName, fieldAlias, fieldValue, isNot, operator);
+            where[fieldName] = this.getValueForFilter(entityName, fieldName, actualFieldAlias, fieldValue, isNot, operator);
         }
         return { where, include };
     }
@@ -286,11 +308,13 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
                 op = key;
             }
             const actualFieldName = fieldName === core_1.PersistanceSelectOperator.Or ? key : fieldName;
+            const fieldParameterName = `${fieldAlias}_${parsedValueCount}`;
             const innerValue = filtersObject[key];
             const itemData = this.parseFilters(entityName, { [actualFieldName]: innerValue }, {
-                fieldAliases: { [actualFieldName]: `${fieldAlias}_${parsedValueCount}` },
+                fieldAliases: { [actualFieldName]: fieldParameterName },
                 isTopLevel: false,
-                operator: op
+                operator: op,
+                parameterNamesToFieldAliasesMap: { [fieldParameterName]: fieldAlias }
             });
             const fieldWhereData = itemData.where[actualFieldName];
             if (!fieldWhereData) {
@@ -313,7 +337,7 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
             let entityAlias = `${entityName}`;
             let previousEntityAlias = `${entityName}`;
             includeData.forEach(currentEntityName => {
-                entityAlias += `_${currentEntityName}`;
+                entityAlias += `__${currentEntityName}`;
                 resultInclude[`${previousEntityAlias}.${currentEntityName}`] = entityAlias;
                 previousEntityAlias = `${entityAlias}`;
             });
@@ -324,7 +348,9 @@ let SQLQueryBuilderService = class SQLQueryBuilderService {
         const orderBy = [];
         let include = {};
         for (const fieldName in orderByData) {
-            const direction = orderByData[fieldName].toLowerCase() === 'desc' ? 'DESC' : 'ASC';
+            const direction = orderByData[fieldName].toLowerCase() === 'desc'
+                ? core_1.PersistanceOrderByDirection.Desc
+                : core_1.PersistanceOrderByDirection.Asc;
             const item = { field: `${entityName}.${fieldName}`, direction };
             if (fieldName.match(/\./)) {
                 const fieldData = fieldName.split('.');
@@ -370,6 +396,7 @@ exports.SQLQueryBuilderService = SQLQueryBuilderService;
 exports.SQLQueryBuilderService = SQLQueryBuilderService = __decorate([
     (0, common_1.Injectable)(),
     __param(1, (0, common_1.Inject)(definitions_1.Constants.SQL_BUILDER_DB_CONFIG_PATH)),
-    __metadata("design:paramtypes", [core_1.ConfigProviderService, String])
+    __param(2, (0, common_1.Inject)(core_1.Constants.PERSISTANCE_MODULE_NAME)),
+    __metadata("design:paramtypes", [core_1.ConfigProviderService, String, String])
 ], SQLQueryBuilderService);
-//# sourceMappingURL=sqlQueryBuilder.service.js.map
+//# sourceMappingURL=rdb.sqlQueryBuilder.service.js.map

package/dist/sqlQueryBuilder/rdb.sqlQueryBuilder.service.js.map

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