@joktec/mysql 0.2.13 → 0.2.14

package/dist/helpers/mysql.helper.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlHelper = void 0;
+const typeorm_1 = require("typeorm");
+const mysql_exception_1 = require("../mysql.exception");
+const services_1 = require("../services");
 class MysqlHelper {
     static applyPagination(qb, query = {}) {
         const limit = typeof query.limit === 'number' && query.limit > 0 ? query.limit : undefined;
@@ -11,108 +14,130 @@ class MysqlHelper {
         else if (limit)
             qb.take(limit).skip(offset ?? 0);
     }
-    static applyCondition(qb, condition) {
+    static applyCondition(qb, condition, context = {}) {
         if (!condition)
             return;
-        for (const [key, value] of Object.entries(condition)) {
-            if (key === '$or') {
-                const orConditions = value.map((c) => MysqlHelper.buildCondition(qb, c));
-                qb.orWhere(orConditions.join(' OR '));
-            }
-            else if (key === '$and') {
-                const andConditions = value.map((c) => MysqlHelper.buildCondition(qb, c));
-                qb.andWhere(andConditions.join(' AND '));
-            }
-            else {
-                const whereClause = MysqlHelper.buildCondition(qb, { [key]: value });
-                qb.andWhere(whereClause);
+        const conditionContext = { ...context, alias: qb.alias, paramIndex: 0 };
+        for (const [key, value] of Object.entries(condition || {})) {
+            MysqlHelper.applyConditionEntry(qb, key, value, conditionContext);
+        }
+    }
+    static applyConditionEntry(qb, key, value, context) {
+        if (key === '$or' || key === '$and') {
+            const nested = Array.isArray(value) ? value : [];
+            if (!nested.length)
+                return;
+            qb.andWhere(new typeorm_1.Brackets(child => {
+                nested.forEach((condition, index) => {
+                    const method = key === '$or' && index > 0 ? 'orWhere' : 'andWhere';
+                    child[method](new typeorm_1.Brackets(grandChild => {
+                        Object.entries(condition || {}).forEach(([childKey, childValue]) => {
+                            MysqlHelper.applyConditionEntry(grandChild, childKey, childValue, context);
+                        });
+                    }));
+                });
+            }));
+            return;
+        }
+        const column = MysqlHelper.column(qb, key, context);
+        if (value && typeof value === 'object' && !Array.isArray(value) && !(value instanceof Date)) {
+            for (const [op, val] of Object.entries(value)) {
+                MysqlHelper.applyOperator(qb, column, key, op, val, context);
             }
+            return;
         }
+        const param = MysqlHelper.nextParam(key, context);
+        qb.andWhere(`${column} = :${param}`, { [param]: value });
     }
-    static buildCondition(qb, condition) {
-        for (const [key, value] of Object.entries(condition)) {
-            if (typeof value === 'object') {
-                for (const [op, val] of Object.entries(value)) {
-                    switch (op) {
-                        case '$eq':
-                            qb.andWhere(`${qb.alias}.${key} = :${key}`, { [key]: val });
-                            break;
-                        case '$gt':
-                            qb.andWhere(`${qb.alias}.${key} > :${key}`, { [key]: val });
-                            break;
-                        case '$gte':
-                            qb.andWhere(`${qb.alias}.${key} >= :${key}`, { [key]: val });
-                            break;
-                        case '$lt':
-                            qb.andWhere(`${qb.alias}.${key} < :${key}`, { [key]: val });
-                            break;
-                        case '$lte':
-                            qb.andWhere(`${qb.alias}.${key} <= :${key}`, { [key]: val });
-                            break;
-                        case '$ne':
-                            qb.andWhere(`${qb.alias}.${key} != :${key}`, { [key]: val });
-                            break;
-                        case '$in':
-                            qb.andWhere(`${qb.alias}.${key} IN (:...${key})`, { [key]: val });
-                            break;
-                        case '$nin':
-                            qb.andWhere(`${qb.alias}.${key} NOT IN (:...${key})`, { [key]: val });
-                            break;
-                        case '$all':
-                            qb.andWhere(`${qb.alias}.${key} @> ARRAY[:...${key}]`, { [key]: val });
-                            break;
-                        case '$like':
-                            qb.andWhere(`${qb.alias}.${key} LIKE :${key}`, { [key]: `%${val}%` });
-                            break;
-                        case '$begin':
-                            qb.andWhere(`${qb.alias}.${key} LIKE :${key}`, { [key]: `${val}%` });
-                            break;
-                        case '$end':
-                            qb.andWhere(`${qb.alias}.${key} LIKE :${key}`, { [key]: `%${val}` });
-                            break;
-                        case '$exists':
-                            qb.andWhere(`${qb.alias}.${key} IS NOT NULL`);
-                            break;
-                        case '$nil':
-                            qb.andWhere(`${qb.alias}.${key} IS NULL`);
-                            break;
-                        case '$empty':
-                            qb.andWhere(`${qb.alias}.${key} = ''`);
-                            break;
-                        case '$not':
-                            qb.andWhere(`${qb.alias}.${key} != :${key}`, { [key]: val });
-                            break;
-                        case '$size':
-                            qb.andWhere(`array_length(${key}, 1) = :${key}`, { [key]: val });
-                            break;
-                        default:
-                            throw new Error(`Unsupported operator: ${op}`);
-                    }
+    static applyOperator(qb, column, key, op, val, context) {
+        const capabilities = (0, services_1.getMysqlDialectCapabilities)(context.dialect);
+        const param = MysqlHelper.nextParam(key, context);
+        switch (op) {
+            case '$eq':
+                qb.andWhere(`${column} = :${param}`, { [param]: val });
+                return;
+            case '$gt':
+                qb.andWhere(`${column} > :${param}`, { [param]: val });
+                return;
+            case '$gte':
+                qb.andWhere(`${column} >= :${param}`, { [param]: val });
+                return;
+            case '$lt':
+                qb.andWhere(`${column} < :${param}`, { [param]: val });
+                return;
+            case '$lte':
+                qb.andWhere(`${column} <= :${param}`, { [param]: val });
+                return;
+            case '$ne':
+                qb.andWhere(`${column} != :${param}`, { [param]: val });
+                return;
+            case '$in':
+                MysqlHelper.assertNonEmptyArray(op, key, val);
+                qb.andWhere(`${column} IN (:...${param})`, { [param]: val });
+                return;
+            case '$nin':
+                MysqlHelper.assertNonEmptyArray(op, key, val);
+                qb.andWhere(`${column} NOT IN (:...${param})`, { [param]: val });
+                return;
+            case '$like':
+                qb.andWhere(`${column} ${capabilities.caseInsensitiveLike} :${param} ${MysqlHelper.LIKE_ESCAPE_SQL}`, {
+                    [param]: `%${MysqlHelper.escapeLikePattern(val)}%`,
+                });
+                return;
+            case '$begin':
+                qb.andWhere(`${column} ${capabilities.caseInsensitiveLike} :${param} ${MysqlHelper.LIKE_ESCAPE_SQL}`, {
+                    [param]: `${MysqlHelper.escapeLikePattern(val)}%`,
+                });
+                return;
+            case '$end':
+                qb.andWhere(`${column} ${capabilities.caseInsensitiveLike} :${param} ${MysqlHelper.LIKE_ESCAPE_SQL}`, {
+                    [param]: `%${MysqlHelper.escapeLikePattern(val)}`,
+                });
+                return;
+            case '$nil':
+                qb.andWhere(`${column} IS ${val === false ? 'NOT ' : ''}NULL`);
+                return;
+            case '$exists':
+                qb.andWhere(`${column} IS ${val === false ? '' : 'NOT '}NULL`);
+                return;
+            case '$empty':
+                qb.andWhere(`${column} = ''`);
+                return;
+            case '$not':
+                qb.andWhere(`${column} != :${param}`, { [param]: val });
+                return;
+            case '$all':
+            case '$size':
+                if (!capabilities.arrayOperators) {
+                    throw new mysql_exception_1.MysqlException('MYSQL_OPERATOR_UNSUPPORTED_BY_DIALECT', { op, dialect: capabilities.dialect });
                 }
-            }
-            else {
-                qb.andWhere(`${qb.alias}.${key} = :${key}`, { [key]: value });
-            }
+                if (op === '$all')
+                    qb.andWhere(`${column} @> ARRAY[:...${param}]`, { [param]: val });
+                else
+                    qb.andWhere(`array_length(${column}, 1) = :${param}`, { [param]: val });
+                return;
+            default:
+                throw new mysql_exception_1.MysqlException('MYSQL_OPERATOR_UNSUPPORTED', { op, key });
         }
-        return qb;
     }
-    static applyProjection(qb, select) {
+    static applyProjection(qb, select, context = {}) {
         if (!select)
             return;
         const fields = Array.isArray(select) ? select : select.split(',');
-        qb.select(fields.map(field => `${qb.alias}.${field.trim()}`));
+        qb.select(fields.map(field => MysqlHelper.column(qb, field.trim(), context)));
     }
-    static applyOrder(qb, sort) {
+    static applyOrder(qb, sort, context = {}) {
         if (!sort)
             return;
         for (const [key, value] of Object.entries(sort)) {
-            qb.addOrderBy(`${qb.alias}.${key}`, value === 'asc' ? 'ASC' : 'DESC');
+            qb.addOrderBy(MysqlHelper.column(qb, key, context), value === 'asc' ? 'ASC' : 'DESC');
         }
     }
-    static applyRelations(qb, populate) {
+    static applyRelations(qb, populate, context = {}) {
         if (!populate)
             return;
         for (const [relation, value] of Object.entries(populate)) {
+            MysqlHelper.assertRelation(relation, context);
             if (value === '*') {
                 qb.leftJoinAndSelect(`${qb.alias}.${relation}`, relation);
             }
@@ -121,6 +146,51 @@ class MysqlHelper {
             }
         }
     }
+    static assertColumn(path, context = {}) {
+        MysqlHelper.assertSafePath(path);
+        if (!context.metadata)
+            return;
+        const exists = context.metadata.columns.some(column => {
+            return column.propertyPath === path || column.propertyName === path || column.databasePath === path;
+        });
+        if (!exists)
+            throw new mysql_exception_1.MysqlException('MYSQL_UNKNOWN_COLUMN', { path, entity: context.metadata.name });
+    }
+    static assertRelation(path, context = {}) {
+        MysqlHelper.assertSafePath(path);
+        if (!context.metadata)
+            return;
+        const exists = context.metadata.relations?.some(relation => {
+            return relation.propertyPath === path || relation.propertyName === path;
+        });
+        if (!exists)
+            throw new mysql_exception_1.MysqlException('MYSQL_UNKNOWN_RELATION', { path, entity: context.metadata.name });
+    }
+    static column(qb, path, context) {
+        MysqlHelper.assertColumn(path, context);
+        const alias = context.alias || qb.alias;
+        return `${alias}.${path}`;
+    }
+    static escapeLikePattern(value) {
+        return String(value).replace(/[\\%_]/g, '\\$&');
+    }
+    static assertSafePath(path) {
+        if (!MysqlHelper.FIELD_PATTERN.test(path))
+            throw new mysql_exception_1.MysqlException('MYSQL_UNSAFE_FIELD_PATH', { path });
+    }
+    static nextParam(key, context) {
+        const safeKey = key.replace(/\./g, '_');
+        const param = `${safeKey}_${context.paramIndex}`;
+        context.paramIndex += 1;
+        return param;
+    }
+    static assertNonEmptyArray(op, key, val) {
+        if (!Array.isArray(val) || val.length === 0) {
+            throw new mysql_exception_1.MysqlException('MYSQL_INVALID_OPERATOR_VALUE', { op, key, expected: 'non-empty array' });
+        }
+    }
 }
 exports.MysqlHelper = MysqlHelper;
+MysqlHelper.FIELD_PATTERN = /^[a-zA-Z0-9_.]+$/;
+MysqlHelper.LIKE_ESCAPE_SQL = "ESCAPE '\\\\'";
 //# sourceMappingURL=mysql.helper.js.map

package/dist/helpers/mysql.helper.js.map

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

package/dist/helpers/mysql.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.utils.d.ts","sourceRoot":"","sources":["../../src/helpers/mysql.utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE7C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,GAAE,GAAG,EAAO,GAAG,MAAM,CAWtE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,UAGzD"}
+{"version":3,"file":"mysql.utils.d.ts","sourceRoot":"","sources":["../../src/helpers/mysql.utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAK7C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,GAAE,GAAG,EAAO,GAAG,MAAM,CAYtE;AAKD,wBAAgB,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,UAGzD"}

package/dist/helpers/mysql.utils.js

@@ -5,17 +5,14 @@ exports.exportSql = exportSql;
 const utils_1 = require("@joktec/utils");
 function printSql(query, parameters = []) {
     let sql = query;
-    (0, utils_1.toArray)(parameters).forEach((param) => {
-        sql = sql.replace('?', () => {
-            if (typeof param === 'string')
-                return `'${param}'`;
-            else if (param instanceof Date)
-                return `'${param.toISOString()}'`;
-            else if (param === null || param === undefined)
-                return 'NULL';
-            else
-                return param.toString();
-        });
+    (0, utils_1.toArray)(parameters).forEach((param, index) => {
+        const value = formatSqlValue(param);
+        const postgresToken = new RegExp(`\\$${index + 1}(?!\\d)`, 'g');
+        if (postgresToken.test(sql)) {
+            sql = sql.replace(postgresToken, value);
+            return;
+        }
+        sql = sql.replace('?', value);
     });
     return sql;
 }
@@ -23,4 +20,24 @@ function exportSql(builder) {
     const [query, params] = builder.getQueryAndParameters();
     return printSql(query, params);
 }
+function formatSqlValue(param) {
+    if (param === null || param === undefined)
+        return 'NULL';
+    if (param instanceof Date)
+        return `'${param.toISOString()}'`;
+    if (Buffer.isBuffer(param))
+        return `X'${param.toString('hex')}'`;
+    if (Array.isArray(param))
+        return `(${param.map(item => formatSqlValue(item)).join(', ')})`;
+    if (typeof param === 'boolean')
+        return param ? 'TRUE' : 'FALSE';
+    if (typeof param === 'number' || typeof param === 'bigint')
+        return param.toString();
+    if (typeof param === 'object')
+        return `'${escapeSqlString(JSON.stringify(param))}'`;
+    return `'${escapeSqlString(String(param))}'`;
+}
+function escapeSqlString(value) {
+    return value.replace(/\\/g, '\\\\').replace(/'/g, "''");
+}
 //# sourceMappingURL=mysql.utils.js.map

package/dist/helpers/mysql.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.utils.js","sourceRoot":"","sources":["../../src/helpers/mysql.utils.ts"],"names":[],"mappings":";;AAGA,4BAWC;AAED,8BAGC;AAnBD,yCAAwC;AAGxC,SAAgB,QAAQ,CAAC,KAAa,EAAE,aAAoB,EAAE;IAC5D,IAAI,GAAG,GAAW,KAAK,CAAC;IACxB,IAAA,eAAO,EAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;QACzC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE;YAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,OAAO,IAAI,KAAK,GAAG,CAAC;iBAC9C,IAAI,KAAK,YAAY,IAAI;gBAAE,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC;iBAC7D,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;gBAAE,OAAO,MAAM,CAAC;;gBACzD,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAgB,SAAS,CAAC,OAAgC;IACxD,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;IACxD,OAAO,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"mysql.utils.js","sourceRoot":"","sources":["../../src/helpers/mysql.utils.ts"],"names":[],"mappings":";;AAMA,4BAYC;AAKD,8BAGC;AA1BD,yCAAwC;AAMxC,SAAgB,QAAQ,CAAC,KAAa,EAAE,aAAoB,EAAE;IAC5D,IAAI,GAAG,GAAW,KAAK,CAAC;IACxB,IAAA,eAAO,EAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,KAAa,EAAE,EAAE;QACxD,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAChE,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QACD,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAKD,SAAgB,SAAS,CAAC,OAAgC;IACxD,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;IACxD,OAAO,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,cAAc,CAAC,KAAU;IAChC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACzD,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC;IAC7D,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACjE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAC3F,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAChE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;IACpF,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;IACpF,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;AAC/C,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC1D,CAAC"}

package/dist/index.d.ts

@@ -8,5 +8,6 @@ export * from './decorators';
 export * from './helpers';
 export * from './models';
 export * from 'typeorm';
+export { Column, PrimaryColumn, PrimaryGeneratedColumn } from './decorators';
 export { UpsertOptions } from 'typeorm/repository/UpsertOptions';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC"}

package/dist/index.js

@@ -14,6 +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 });
+exports.PrimaryGeneratedColumn = exports.PrimaryColumn = exports.Column = void 0;
 __exportStar(require("./mysql.module"), exports);
 __exportStar(require("./mysql.client"), exports);
 __exportStar(require("./mysql.service"), exports);
@@ -24,4 +25,8 @@ __exportStar(require("./decorators"), exports);
 __exportStar(require("./helpers"), exports);
 __exportStar(require("./models"), exports);
 __exportStar(require("typeorm"), exports);
+var decorators_1 = require("./decorators");
+Object.defineProperty(exports, "Column", { enumerable: true, get: function () { return decorators_1.Column; } });
+Object.defineProperty(exports, "PrimaryColumn", { enumerable: true, get: function () { return decorators_1.PrimaryColumn; } });
+Object.defineProperty(exports, "PrimaryGeneratedColumn", { enumerable: true, get: function () { return decorators_1.PrimaryGeneratedColumn; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,iDAA+B;AAC/B,+CAA6B;AAC7B,oDAAkC;AAClC,+CAA6B;AAC7B,4CAA0B;AAC1B,2CAAyB;AACzB,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,iDAA+B;AAC/B,+CAA6B;AAC7B,oDAAkC;AAClC,+CAA6B;AAC7B,4CAA0B;AAC1B,2CAAyB;AACzB,0CAAwB;AACxB,2CAA6E;AAApE,oGAAA,MAAM,OAAA;AAAE,2GAAA,aAAa,OAAA;AAAE,oHAAA,sBAAsB,OAAA"}

package/dist/models/mysql.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.model.d.ts","sourceRoot":"","sources":["../../src/models/mysql.model.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,qBAAa,UAAW,YAAW,WAAW;IAI5C,SAAS,CAAC,EAAE,IAAI,CAAC;IAKjB,SAAS,CAAC,EAAE,IAAI,CAAC;IAKjB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB"}
+{"version":3,"file":"mysql.model.d.ts","sourceRoot":"","sources":["../../src/models/mysql.model.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB;AAKD,qBAAa,UAAW,YAAW,WAAW;IAI5C,SAAS,CAAC,EAAE,IAAI,CAAC;IAKjB,SAAS,CAAC,EAAE,IAAI,CAAC;IAKjB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB"}

package/dist/models/mysql.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.model.js","sourceRoot":"","sources":["../../src/models/mysql.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAkD;AAClD,qCAA+E;AAQ/E,MAAa,UAAU;CAetB;AAfD,gCAeC;AAXC;IAHC,IAAA,0BAAgB,GAAE;IAClB,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC;AAKjB;IAHC,IAAA,0BAAgB,GAAE;IAClB,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC;AAKjB;IAHC,IAAA,0BAAgB,GAAE;IAClB,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC"}
+{"version":3,"file":"mysql.model.js","sourceRoot":"","sources":["../../src/models/mysql.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAkD;AAClD,qCAA+E;AAW/E,MAAa,UAAU;CAetB;AAfD,gCAeC;AAXC;IAHC,IAAA,0BAAgB,GAAE;IAClB,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC;AAKjB;IAHC,IAAA,0BAAgB,GAAE;IAClB,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC;AAKjB;IAHC,IAAA,0BAAgB,GAAE;IAClB,IAAA,kBAAW,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC1B,IAAI;6CAAC"}

package/dist/models/mysql.option.d.ts

@@ -1,4 +1,13 @@
-import { FindOneOptions, SaveOptions } from 'typeorm';
-export interface IMysqlOption<T = any> extends SaveOptions, FindOneOptions<T> {
+import { EntityManager, FindManyOptions, FindOneOptions, QueryRunner, RemoveOptions, SaveOptions } from 'typeorm';
+export interface IMysqlTransactionOption {
+    manager?: EntityManager;
+    queryRunner?: QueryRunner;
 }
+export interface IMysqlReadOption<T = any> extends FindManyOptions<T>, FindOneOptions<T>, IMysqlTransactionOption {
+}
+export interface IMysqlWriteOption extends SaveOptions, RemoveOptions, IMysqlTransactionOption {
+    force?: boolean;
+    chunkSize?: number;
+}
+export type IMysqlOption<T = any> = IMysqlReadOption<T> & IMysqlWriteOption;
 //# sourceMappingURL=mysql.option.d.ts.map

package/dist/models/mysql.option.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.option.d.ts","sourceRoot":"","sources":["../../src/models/mysql.option.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtD,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;CAAG"}
+{"version":3,"file":"mysql.option.d.ts","sourceRoot":"","sources":["../../src/models/mysql.option.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAElH,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,eAAe,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,uBAAuB;CAAG;AAEpH,MAAM,WAAW,iBAAkB,SAAQ,WAAW,EAAE,aAAa,EAAE,uBAAuB;IAC5F,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,gBAAgB,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC"}

package/dist/mysql.config.d.ts

@@ -10,23 +10,7 @@ export declare class MysqlSlaveConfig {
 export declare enum Dialect {
     MYSQL = "mysql",
     POSTGRES = "postgres",
-    COCKROACHDB = "cockroachdb",
-    SAP = "sap",
-    MARIADB = "mariadb",
-    SQLITE = "sqlite",
-    CORDOVA = "cordova",
-    REACT_NATIVE = "react-native",
-    NATIVESCRIPT = "nativescript",
-    SQLJS = "sqljs",
-    ORACLE = "oracle",
-    MSSQL = "mssql",
-    MONGODB = "mongodb",
-    AURORA_MYSQL = "aurora-mysql",
-    AURORA_POSTGRES = "aurora-postgres",
-    EXPO = "expo",
-    BETTER_SQLITE3 = "better-sqlite3",
-    CAPACITOR = "capacitor",
-    SPANNER = "spanner"
+    MARIADB = "mariadb"
 }
 export declare enum MysqlLogLevel {
     query = "query",

package/dist/mysql.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.config.d.ts","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,qBAAa,gBAAgB;IAG3B,IAAI,EAAE,MAAM,CAAC;IAIb,IAAI,EAAE,MAAM,CAAC;IAIb,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;gBAEL,KAAK,EAAE,gBAAgB;CAGpC;AAED,oBAAY,OAAO;IACjB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,WAAW,gBAAgB;IAC3B,GAAG,QAAQ;IACX,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,YAAY,iBAAiB;IAC7B,YAAY,iBAAiB;IAC7B,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;IACnC,IAAI,SAAS;IACb,cAAc,mBAAmB;IACjC,SAAS,cAAc;IACvB,OAAO,YAAY;CACpB;AAED,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,SAAS,cAAc;CACxB;AAED,qBAAa,oBAAoB;IAG/B,MAAM,CAAC,EAAE,OAAO,CAAS;IAIzB,GAAG,CAAC,EAAE,OAAO,CAAS;IAKtB,KAAK,CAAC,EAAE,aAAa,EAAE,CAAM;gBAEjB,KAAK,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC;CAGlD;AAED,qBAAa,WAAY,SAAQ,YAAY;IAG3C,OAAO,CAAC,EAAE,OAAO,CAAiB;IAIlC,IAAI,CAAC,EAAE,MAAM,CAAe;IAI5B,IAAI,CAAC,EAAE,MAAM,CAAQ;IAIrB,QAAQ,EAAG,MAAM,CAAC;IAIlB,QAAQ,EAAG,MAAM,CAAC;IAIlB,QAAQ,EAAG,MAAM,CAAC;IAIlB,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAIlB,cAAc,CAAC,EAAE,MAAM,CAAS;IAKhC,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAM;IAIjC,IAAI,CAAC,EAAE,OAAO,CAAQ;IAItB,SAAS,CAAC,EAAE,oBAAoB,CAAC;gBAErB,KAAK,EAAE,WAAW;CAW/B"}
+{"version":3,"file":"mysql.config.d.ts","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,qBAAa,gBAAgB;IAG3B,IAAI,EAAE,MAAM,CAAC;IAIb,IAAI,EAAE,MAAM,CAAC;IAIb,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;IAIjB,QAAQ,EAAE,MAAM,CAAC;gBAEL,KAAK,EAAE,gBAAgB;CAGpC;AAED,oBAAY,OAAO;IACjB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,OAAO,YAAY;CACpB;AAED,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,SAAS,cAAc;CACxB;AAED,qBAAa,oBAAoB;IAG/B,MAAM,CAAC,EAAE,OAAO,CAAS;IAIzB,GAAG,CAAC,EAAE,OAAO,CAAS;IAKtB,KAAK,CAAC,EAAE,aAAa,EAAE,CAAM;gBAEjB,KAAK,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC;CAGlD;AAED,qBAAa,WAAY,SAAQ,YAAY;IAG3C,OAAO,CAAC,EAAE,OAAO,CAAiB;IAIlC,IAAI,CAAC,EAAE,MAAM,CAAe;IAI5B,IAAI,CAAC,EAAE,MAAM,CAAQ;IAIrB,QAAQ,EAAG,MAAM,CAAC;IAIlB,QAAQ,EAAG,MAAM,CAAC;IAIlB,QAAQ,EAAG,MAAM,CAAC;IAIlB,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAIlB,cAAc,CAAC,EAAE,MAAM,CAAS;IAKhC,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAM;IAIjC,IAAI,CAAC,EAAE,OAAO,CAAS;IAIvB,SAAS,CAAC,EAAE,oBAAoB,CAAC;gBAErB,KAAK,EAAE,WAAW;CAW/B"}

package/dist/mysql.config.js

@@ -48,23 +48,7 @@ var Dialect;
 (function (Dialect) {
     Dialect["MYSQL"] = "mysql";
     Dialect["POSTGRES"] = "postgres";
-    Dialect["COCKROACHDB"] = "cockroachdb";
-    Dialect["SAP"] = "sap";
     Dialect["MARIADB"] = "mariadb";
-    Dialect["SQLITE"] = "sqlite";
-    Dialect["CORDOVA"] = "cordova";
-    Dialect["REACT_NATIVE"] = "react-native";
-    Dialect["NATIVESCRIPT"] = "nativescript";
-    Dialect["SQLJS"] = "sqljs";
-    Dialect["ORACLE"] = "oracle";
-    Dialect["MSSQL"] = "mssql";
-    Dialect["MONGODB"] = "mongodb";
-    Dialect["AURORA_MYSQL"] = "aurora-mysql";
-    Dialect["AURORA_POSTGRES"] = "aurora-postgres";
-    Dialect["EXPO"] = "expo";
-    Dialect["BETTER_SQLITE3"] = "better-sqlite3";
-    Dialect["CAPACITOR"] = "capacitor";
-    Dialect["SPANNER"] = "spanner";
 })(Dialect || (exports.Dialect = Dialect = {}));
 var MysqlLogLevel;
 (function (MysqlLogLevel) {
@@ -109,7 +93,7 @@ class MysqlConfig extends core_1.ClientConfig {
         this.port = 3306;
         this.connectTimeout = 20000;
         this.slaves = [];
-        this.sync = true;
+        this.sync = false;
         Object.assign(this, {
             ...props,
             benchmark: new MysqlBenchmarkConfig(props?.benchmark),

package/dist/mysql.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.config.js","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA4C;AAC5C,yCAA6G;AAC7G,mCAA8B;AAE9B,MAAa,gBAAgB;IAqB3B,YAAY,KAAuB;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;IACpC,CAAC;CACF;AAxBD,4CAwBC;AArBC;IAFC,IAAA,gBAAQ,GAAE;IACV,IAAA,kBAAU,GAAE;;8CACA;AAIb;IAFC,IAAA,aAAK,GAAE;IACP,IAAA,kBAAU,GAAE;;8CACA;AAIb;IAFC,IAAA,gBAAQ,GAAE;IACV,IAAA,kBAAU,GAAE;;kDACI;AAIjB;IAFC,IAAA,gBAAQ,GAAE;IACV,IAAA,kBAAU,GAAE;;kDACI;AAIjB;IAFC,IAAA,gBAAQ,GAAE;IACV,IAAA,kBAAU,GAAE;;kDACI;AAOnB,IAAY,OAoBX;AApBD,WAAY,OAAO;IACjB,0BAAe,CAAA;IACf,gCAAqB,CAAA;IACrB,sCAA2B,CAAA;IAC3B,sBAAW,CAAA;IACX,8BAAmB,CAAA;IACnB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,wCAA6B,CAAA;IAC7B,wCAA6B,CAAA;IAC7B,0BAAe,CAAA;IACf,4BAAiB,CAAA;IACjB,0BAAe,CAAA;IACf,8BAAmB,CAAA;IACnB,wCAA6B,CAAA;IAC7B,8CAAmC,CAAA;IACnC,wBAAa,CAAA;IACb,4CAAiC,CAAA;IACjC,kCAAuB,CAAA;IACvB,8BAAmB,CAAA;AACrB,CAAC,EApBW,OAAO,uBAAP,OAAO,QAoBlB;AAED,IAAY,aAQX;AARD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,gCAAe,CAAA;IACf,8BAAa,CAAA;IACb,8BAAa,CAAA;IACb,4BAAW,CAAA;IACX,wCAAuB,CAAA;AACzB,CAAC,EARW,aAAa,6BAAb,aAAa,QAQxB;AAED,MAAa,oBAAoB;IAc/B,YAAY,KAAqC;QAXjD,WAAM,GAAa,KAAK,CAAC;QAIzB,QAAG,GAAa,KAAK,CAAC;QAKtB,UAAK,GAAqB,EAAE,CAAC;QAG3B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;CACF;AAjBD,oDAiBC;AAdC;IAFC,IAAA,kBAAU,GAAE;IACZ,IAAA,iBAAS,GAAE;;oDACa;AAIzB;IAFC,IAAA,kBAAU,GAAE;IACZ,IAAA,iBAAS,GAAE;;iDACU;AAKtB;IAHC,IAAA,kBAAU,GAAE;IACZ,IAAA,eAAO,GAAE;IACT,IAAA,cAAM,EAAC,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;mDACT;AAO/B,MAAa,WAAY,SAAQ,mBAAY;IAkD3C,YAAY,KAAkB;QAC5B,KAAK,CAAC,KAAK,CAAC,CAAC;QAhDf,YAAO,GAAa,OAAO,CAAC,KAAK,CAAC;QAIlC,SAAI,GAAY,WAAW,CAAC;QAI5B,SAAI,GAAY,IAAI,CAAC;QAwBrB,mBAAc,GAAY,KAAK,CAAC;QAKhC,WAAM,GAAwB,EAAE,CAAC;QAIjC,SAAI,GAAa,IAAI,CAAC;QAQpB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,GAAG,KAAK;YACR,SAAS,EAAE,IAAI,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC;SACtD,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,IAAA,aAAI,EAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;YACvF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,gBAAgB,CAAC,EAAE,GAAG,YAAY,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;QAC/F,CAAC;IACH,CAAC;CACF;AA7DD,kCA6DC;AA1DC;IAFC,IAAA,cAAM,EAAC,OAAO,CAAC;IACf,IAAA,kBAAU,GAAE;;4CACqB;AAIlC;IAFC,IAAA,gBAAQ,GAAE;IACV,IAAA,kBAAU,GAAE;;yCACe;AAI5B;IAFC,IAAA,aAAK,GAAE;IACP,IAAA,kBAAU,GAAE;;yCACQ;AAIrB;IAFC,IAAA,gBAAQ,GAAE;IACV,IAAA,kBAAU,GAAE;;6CACK;AAIlB;IAFC,IAAA,gBAAQ,GAAE;IACV,IAAA,kBAAU,GAAE;;6CACK;AAIlB;IAFC,IAAA,gBAAQ,GAAE;IACV,IAAA,kBAAU,GAAE;;6CACK;AAIlB;IAFC,IAAA,gBAAQ,GAAE;IACV,IAAA,kBAAU,GAAE;;4CACI;AAIjB;IAFC,IAAA,gBAAQ,GAAE;IACV,IAAA,kBAAU,GAAE;;6CACK;AAIlB;IAFC,IAAA,aAAK,GAAE;IACP,IAAA,kBAAU,GAAE;;mDACmB;AAKhC;IAHC,IAAA,eAAO,GAAE;IACT,IAAA,eAAO,EAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACzC,IAAA,kBAAU,GAAE;;2CACoB;AAIjC;IAFC,IAAA,kBAAU,GAAE;IACZ,IAAA,iBAAS,GAAE;;yCACU;AAItB;IAFC,IAAA,kBAAU,GAAE;IACZ,IAAA,eAAO,EAAC,oBAAoB,CAAC;8BAClB,oBAAoB;8CAAC"}
+{"version":3,"file":"mysql.config.js","sourceRoot":"","sources":["../src/mysql.config.ts"],"names":[],"mappings":"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"}

package/dist/mysql.exception.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.exception.d.ts","sourceRoot":"","sources":["../src/mysql.exception.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAInG,qBAAa,cAAe,SAAQ,uBAAuB;gBAC7C,GAAG,GAAE,MAA0B,EAAE,KAAK,CAAC,EAAE,GAAG;CAGzD;AAED,eAAO,MAAM,UAAU,iBAWrB,CAAC"}
+{"version":3,"file":"mysql.exception.d.ts","sourceRoot":"","sources":["../src/mysql.exception.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAGnG,qBAAa,cAAe,SAAQ,uBAAuB;gBAC7C,GAAG,GAAE,MAA0B,EAAE,KAAK,CAAC,EAAE,GAAG;CAGzD;AAKD,eAAO,MAAM,UAAU,iBAWrB,CAAC"}

package/dist/mysql.exception.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlCatch = exports.MysqlException = void 0;
 const core_1 = require("@joktec/core");
-const lodash_1 = require("lodash");
 const typeorm_1 = require("typeorm");
 class MysqlException extends core_1.InternalServerException {
     constructor(msg = 'MYSQL_EXCEPTION', error) {
@@ -17,10 +16,55 @@ exports.MysqlCatch = (0, core_1.BaseMethodDecorator)(async (options) => {
     }
     catch (err) {
         if (err instanceof typeorm_1.QueryFailedError) {
-            const msg = (0, lodash_1.snakeCase)(err.message).toUpperCase();
-            throw new MysqlException(msg, err);
+            throw new MysqlException(normalizeMysqlErrorCode(err), err);
         }
-        throw new MysqlException(err, err.message);
+        if (err instanceof MysqlException)
+            throw err;
+        throw new MysqlException('MYSQL_EXCEPTION', err);
     }
 });
+function normalizeMysqlErrorCode(err) {
+    const driverError = err.driverError || {};
+    const code = driverError.code || driverError.errno || driverError.sqlState;
+    switch (code) {
+        case 'ER_DUP_ENTRY':
+        case 1062:
+        case '23505':
+            return 'MYSQL_DUPLICATE_KEY';
+        case 'ER_NO_REFERENCED_ROW':
+        case 'ER_NO_REFERENCED_ROW_2':
+        case 'ER_ROW_IS_REFERENCED':
+        case 'ER_ROW_IS_REFERENCED_2':
+        case 1216:
+        case 1217:
+        case 1451:
+        case 1452:
+        case '23503':
+            return 'MYSQL_FOREIGN_KEY_VIOLATION';
+        case 'ER_BAD_NULL_ERROR':
+        case 1048:
+        case '23502':
+            return 'MYSQL_NOT_NULL_VIOLATION';
+        case 'ER_BAD_FIELD_ERROR':
+        case 1054:
+        case '42703':
+            return 'MYSQL_UNKNOWN_COLUMN';
+        case 'ER_LOCK_DEADLOCK':
+        case 1213:
+        case '40P01':
+            return 'MYSQL_DEADLOCK';
+        case 'ER_LOCK_WAIT_TIMEOUT':
+        case 1205:
+        case '55P03':
+            return 'MYSQL_LOCK_TIMEOUT';
+        case 'ECONNREFUSED':
+        case 'ETIMEDOUT':
+        case 'ENOTFOUND':
+            return 'MYSQL_CONNECTION_FAILED';
+        case '40001':
+            return 'MYSQL_TRANSACTION_CONFLICT';
+        default:
+            return 'MYSQL_QUERY_FAILED';
+    }
+}
 //# sourceMappingURL=mysql.exception.js.map