@spinajs/orm-mysql 1.0.1 → 2.0.16

package/README.md

@@ -0,0 +1,11 @@
+# `orm-mysql`
+
+> TODO: description
+
+## Usage
+
+```
+const ormMysql = require('orm-mysql');
+
+// TODO: DEMONSTRATE API
+```

package/lib/compilers.d.ts

@@ -0,0 +1,6 @@
+import { TableExistsCompiler, TableExistsQueryBuilder, ICompilerOutput } from '@spinajs/orm';
+export declare class MySqlTableExistsCompiler implements TableExistsCompiler {
+    protected builder: TableExistsQueryBuilder;
+    constructor(builder: TableExistsQueryBuilder);
+    compile(): ICompilerOutput;
+}

package/lib/compilers.js

@@ -1 +1,38 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MySqlTableExistsCompiler = void 0;
+const di_1 = require("@spinajs/di");
+const orm_1 = require("@spinajs/orm");
+let MySqlTableExistsCompiler = class MySqlTableExistsCompiler {
+    constructor(builder) {
+        this.builder = builder;
+        if (builder === null) {
+            throw new Error('table exists query builder cannot be null');
+        }
+    }
+    compile() {
+        return {
+            bindings: [this.builder.Database, this.builder.Table],
+            expression: `SELECT * 
+      FROM information_schema.tables
+      WHERE table_schema = ? 
+          AND table_name = ?
+      LIMIT 1;`,
+        };
+    }
+};
+MySqlTableExistsCompiler = __decorate([
+    (0, di_1.NewInstance)(),
+    __metadata("design:paramtypes", [orm_1.TableExistsQueryBuilder])
+], MySqlTableExistsCompiler);
+exports.MySqlTableExistsCompiler = MySqlTableExistsCompiler;
 //# sourceMappingURL=compilers.js.map

package/lib/compilers.js.map

@@ -1 +1 @@
-{"version":3,"file":"compilers.js","sourceRoot":"","sources":["../src/compilers.ts"],"names":[],"mappings":""}
+{"version":3,"file":"compilers.js","sourceRoot":"","sources":["../src/compilers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAA0C;AAC1C,sCAA6F;AAG7F,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IACnC,YAAsB,OAAgC;QAAhC,YAAO,GAAP,OAAO,CAAyB;QACpD,IAAI,OAAO,KAAK,IAAI,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAC9D;IACH,CAAC;IAEM,OAAO;QACZ,OAAO;YACL,QAAQ,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YACrD,UAAU,EAAE;;;;eAIH;SACV,CAAC;IACJ,CAAC;CACF,CAAA;AAjBY,wBAAwB;IADpC,IAAA,gBAAW,GAAE;qCAEmB,6BAAuB;GAD3C,wBAAwB,CAiBpC;AAjBY,4DAAwB"}

package/lib/index.d.ts

@@ -1,22 +1,14 @@
-import { IColumnDescriptor, QueryContext, OrmDriver, QueryBuilder, TransactionCallback } from '@spinajs/orm';
-import * as mysql from "mysql";
+import { QueryContext, OrmDriver, IColumnDescriptor, QueryBuilder, TransactionCallback } from '@spinajs/orm';
 import { SqlDriver } from '@spinajs/orm-sql';
-import { Container } from '@spinajs/di';
-export declare class MysqlOrmDriver extends SqlDriver {
-    protected _connectionPool: mysql.Pool;
-    execute(stmt: string, params: any[], queryContext: QueryContext): Promise<any>;
+import * as mysql from 'mysql';
+export declare class MySqlOrmDriver extends SqlDriver {
+    protected Pool: mysql.Pool;
+    protected _executionId: number;
+    execute(stmt: string, params: any[], context: QueryContext): Promise<any>;
+    resolve(): void;
     ping(): Promise<boolean>;
     connect(): Promise<OrmDriver>;
     disconnect(): Promise<OrmDriver>;
-    resolve(container: Container): Promise<void>;
-    transaction(qrOrCallback: QueryBuilder[] | TransactionCallback): Promise<void>;
-    /**
-     *
-     * Retrieves information about specific DB table if exists. If table not exists returns null
-     *
-     * @param name table name to retrieve info
-     * @param _schema - optional schema name
-     * @returns {[] | null}
-     */
-    tableInfo(tableName: string, _schema?: string): Promise<IColumnDescriptor[]>;
+    tableInfo(name: string, schema?: string): Promise<IColumnDescriptor[]>;
+    transaction(queryOrCallback?: QueryBuilder<any>[] | TransactionCallback): Promise<void>;
 }

package/lib/index.js

@@ -1,4 +1,20 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -8,137 +24,179 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MySqlOrmDriver = void 0;
+/* eslint-disable promise/no-promise-in-callback */
+const di_1 = require("@spinajs/di");
+const log_1 = require("@spinajs/log");
 const orm_1 = require("@spinajs/orm");
-const mysql = __importStar(require("mysql"));
 const orm_sql_1 = require("@spinajs/orm-sql");
-const di_1 = require("@spinajs/di");
-let MysqlOrmDriver = class MysqlOrmDriver extends orm_sql_1.SqlDriver {
-    execute(stmt, params, queryContext) {
-        const queryParams = params !== null && params !== void 0 ? params : [];
-        if (!this._connectionPool) {
-            throw new Error('cannot execute mysql statement, connection pool not created');
-        }
-        super.execute(stmt, queryParams, queryContext);
-        return new Promise((res, rej) => {
-            switch (queryContext) {
-                case orm_1.QueryContext.Update:
-                case orm_1.QueryContext.Delete:
-                case orm_1.QueryContext.Schema:
-                case orm_1.QueryContext.Transaction:
-                case orm_1.QueryContext.Insert:
-                case orm_1.QueryContext.Select:
-                    this._connectionPool.query(stmt, queryParams, (err, result, _fields) => {
-                        if (err) {
-                            rej(err);
-                            return;
-                        }
-                        res(result);
+const mysql = __importStar(require("mysql"));
+const compilers_1 = require("./compilers");
+let MySqlOrmDriver = class MySqlOrmDriver extends orm_sql_1.SqlDriver {
+    constructor() {
+        super(...arguments);
+        this._executionId = 0;
+    }
+    execute(stmt, params, context) {
+        const tName = `query-${this._executionId++}`;
+        this.Log.timeStart(`query-${tName}`);
+        return new Promise((resolve, reject) => {
+            this.Pool.query(stmt, params, function (err, results) {
+                const tDiff = this.Log.timeEnd(`query-${tName}`);
+                if (err) {
+                    void this.Log.write({
+                        Level: log_1.LogLevel.Error,
+                        Variables: {
+                            error: err,
+                            message: `Failed: ${stmt}, bindings: ${params ? params.join(',') : 'none'}`,
+                            logger: this.Log.Name,
+                            level: 'Error',
+                            duration: tDiff,
+                        },
                     });
-                    break;
-            }
+                    reject(err);
+                }
+                else {
+                    switch (context) {
+                        case orm_1.QueryContext.Update:
+                        case orm_1.QueryContext.Delete:
+                            resolve({
+                                RowsAffected: results.changedRows,
+                            });
+                            break;
+                        case orm_1.QueryContext.Insert:
+                            resolve({ LastInsertId: results.insertId, RowsAffected: results.changedRows });
+                            break;
+                        default:
+                            resolve(results);
+                            break;
+                    }
+                    void this.Log.write({
+                        Level: log_1.LogLevel.Trace,
+                        Variables: {
+                            error: null,
+                            message: `Executed: ${stmt}, bindings: ${params ? params.join(',') : 'none'}`,
+                            logger: this.Log.Name,
+                            level: 'TRACE',
+                            duration: tDiff,
+                        },
+                    });
+                }
+            });
         });
     }
-    async ping() {
-        const result = await this.execute("SELECT 1", [], orm_1.QueryContext.Select);
-        return result !== null || result !== undefined;
+    resolve() {
+        super.resolve();
+        this.Container.register(compilers_1.MySqlTableExistsCompiler).as(orm_1.TableExistsCompiler);
     }
-    async connect() {
-        const { PoolLimit, Host, User, Password, Database, Encoding, Options } = this.Options;
-        if (this._connectionPool != null) {
-            await this.disconnect();
+    async ping() {
+        try {
+            await this.execute('SELECT 1', [], orm_1.QueryContext.Select);
+            return true;
+        }
+        catch (_a) {
+            return false;
         }
-        this._connectionPool = mysql.createPool(Object.assign({ connectionLimit: PoolLimit, host: Host, user: User, password: Password, database: Database, charset: Encoding }, Options));
-        return this;
     }
-    async disconnect() {
+    connect() {
+        this.Pool = mysql.createPool({
+            host: this.Options.Host,
+            user: this.Options.User,
+            database: this.Options.Database,
+            waitForConnections: true,
+            connectionLimit: this.Options.PoolLimit,
+            queueLimit: 0,
+        });
+        return Promise.resolve(this);
+    }
+    disconnect() {
         return new Promise((resolve, reject) => {
-            var _a;
-            (_a = this._connectionPool) === null || _a === void 0 ? void 0 : _a.end((err) => {
+            this.Pool.end((err) => {
                 if (err) {
                     reject(err);
                 }
                 else {
-                    this._connectionPool = null;
                     resolve(this);
                 }
             });
         });
     }
-    async resolve(container) {
-        super.resolve(container);
-        this.Container = this.Container.child();
-    }
-    async transaction(qrOrCallback) {
-        if (!qrOrCallback) {
-            return;
-        }
-        await this.execute('START TRANSACTION', null, orm_1.QueryContext.Transaction);
-        try {
-            if (Array.isArray(qrOrCallback)) {
-                for (const q of qrOrCallback) {
-                    await q;
-                }
-            }
-            else {
-                await qrOrCallback(this);
-            }
-            await this.execute('COMMIT', null, orm_1.QueryContext.Transaction);
+    async tableInfo(name, schema) {
+        const tblInfo = (await this.execute(`SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME=? ${schema ? 'AND TABLE_SCHEMA=?' : ''} `, schema ? [name, schema] : [name], orm_1.QueryContext.Select));
+        const indexInfo = (await this.execute(`SHOW INDEXES FROM ${name}`, [], orm_1.QueryContext.Select));
+        if (!tblInfo || !Array.isArray(tblInfo) || tblInfo.length === 0) {
+            return null;
         }
-        catch (ex) {
-            await this.execute('ROLLBACK', null, orm_1.QueryContext.Transaction);
-            throw ex;
-        }
-    }
-    /**
-     *
-     * Retrieves information about specific DB table if exists. If table not exists returns null
-     *
-     * @param name table name to retrieve info
-     * @param _schema - optional schema name
-     * @returns {[] | null}
-     */
-    async tableInfo(tableName, _schema) {
-        const tableSchema = _schema ? _schema : this.Options.Database;
-        const select = [
-            'COLUMN_NAME',
-            'TABLE_NAME',
-            'DATA_TYPE',
-            'CHARACTER_MAXIMUM_LENGTH',
-            'COLUMN_COMMENT',
-            'COLUMN_DEFAULT',
-            'COLUMN_TYPE',
-            'IS_NULLABLE',
-            'EXTRA',
-            'COLUMN_KEY'
-        ];
-        const tblInfo = (await this.execute(`information_schema.columns SELECT ${select.join(",")} WHERE table_schema = '${tableSchema}' AND TABLE_NAME = '${tableName}'`, null, orm_1.QueryContext.Select));
-        const tblIndices = (await this.execute(`SHOW INDEX FROM ${tableName}`, null, orm_1.QueryContext.Select));
         return tblInfo.map((r) => {
+            const isPrimary = indexInfo.find((c) => c.Key_name === 'PRIMARY' && c.Column_name === r.COLUMN_NAME) !== undefined;
+            const sUnique = indexInfo.find((c) => c.Non_unique === 0 && c.Column_name === r.COLUMN_NAME) !== undefined;
             return {
-                Type: r.DATA_TYPE.toLowerCase(),
-                MaxLength: r.CHARACTER_MAXIMUM_LENGTH,
-                Comment: r.COLUMN_COMMENT,
+                Type: r.DATA_TYPE,
+                MaxLength: -1,
+                Comment: '',
                 DefaultValue: r.COLUMN_DEFAULT,
-                NativeType: r.COLUMN_TYPE,
+                NativeType: r.DATA_TYPE,
                 Unsigned: false,
-                Nullable: r.IS_NULLABLE === "YES",
-                PrimaryKey: r.COLUMN_KEY === 'PRI',
-                AutoIncrement: r.EXTRA.includes('auto_increment'),
+                Nullable: r.IS_NULLABLE === 'YES',
+                PrimaryKey: isPrimary,
+                Uuid: false,
+                Ignore: false,
+                // simply assumpt that integer pkeys are autoincement / auto fill  by default
+                AutoIncrement: isPrimary && r.DATA_TYPE === 'int',
                 Name: r.COLUMN_NAME,
                 Converter: null,
-                Schema: _schema ? _schema : this.Options.Database,
-                Unique: tblIndices.find((i) => i.Column_name === r.name && i.Non_unique === 0) !== undefined,
+                Schema: schema ? schema : this.Options.Database,
+                Unique: sUnique,
             };
         });
     }
+    // todo fix transactions
+    transaction(queryOrCallback) {
+        return new Promise((resolve, reject) => {
+            this.Pool.getConnection((err, connection) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    connection.beginTransaction((err) => {
+                        if (err) {
+                            reject(err);
+                        }
+                        else {
+                            if (Array.isArray(queryOrCallback)) {
+                                Promise.all(queryOrCallback)
+                                    .then(() => {
+                                    resolve();
+                                    return;
+                                })
+                                    .catch((err) => {
+                                    reject(err);
+                                });
+                            }
+                            else {
+                                queryOrCallback(this)
+                                    .then(() => {
+                                    resolve();
+                                    return;
+                                })
+                                    .catch((err) => {
+                                    reject(err);
+                                });
+                            }
+                        }
+                    });
+                }
+            });
+        });
+    }
 };
-MysqlOrmDriver = __decorate([
-    di_1.Injectable('orm-driver-mysql')
-], MysqlOrmDriver);
-exports.MysqlOrmDriver = MysqlOrmDriver;
+MySqlOrmDriver = __decorate([
+    (0, di_1.Injectable)('orm-driver-mysql')
+], MySqlOrmDriver);
+exports.MySqlOrmDriver = MySqlOrmDriver;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

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

package/lib/orm-mysql/src/index.d.ts

@@ -0,0 +1,13 @@
+import { QueryContext, OrmDriver, IColumnDescriptor, QueryBuilder, TransactionCallback } from '@spinajs/orm';
+import { SqlDriver } from '@spinajs/orm-sql';
+import * as mysql from 'mysql';
+export declare class MySqlOrmDriver extends SqlDriver {
+    protected Pool: mysql.Pool;
+    protected _executionId: number;
+    execute(stmt: string, params: any[], context: QueryContext): Promise<any>;
+    ping(): Promise<boolean>;
+    connect(): Promise<OrmDriver>;
+    disconnect(): Promise<OrmDriver>;
+    tableInfo(name: string, schema?: string): Promise<IColumnDescriptor[]>;
+    transaction(queryOrCallback?: QueryBuilder<any>[] | TransactionCallback): Promise<void>;
+}

package/lib/orm-mysql/src/index.js

@@ -0,0 +1,197 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MySqlOrmDriver = void 0;
+/* eslint-disable promise/no-promise-in-callback */
+const di_1 = require("@spinajs/di");
+const log_1 = require("@spinajs/log");
+const orm_1 = require("@spinajs/orm");
+const orm_sql_1 = require("@spinajs/orm-sql");
+const mysql = __importStar(require("mysql"));
+let MySqlOrmDriver = class MySqlOrmDriver extends orm_sql_1.SqlDriver {
+    constructor() {
+        super(...arguments);
+        this._executionId = 0;
+    }
+    execute(stmt, params, context) {
+        const tName = `query-${this._executionId++}`;
+        this.Log.timeStart(`query-${tName}`);
+        return new Promise((resolve, reject) => {
+            this.Pool.query(stmt, params, function (err, results) {
+                const tDiff = this.Log.timeEnd(`query-${tName}`);
+                if (err) {
+                    void this.Log.write({
+                        Level: log_1.LogLevel.Error,
+                        Variables: {
+                            error: err,
+                            message: `Failed: ${stmt}, bindings: ${params ? params.join(',') : 'none'}`,
+                            logger: this.Log.Name,
+                            level: 'Error',
+                            duration: tDiff,
+                        },
+                    });
+                    reject(err);
+                }
+                else {
+                    switch (context) {
+                        case orm_1.QueryContext.Update:
+                        case orm_1.QueryContext.Delete:
+                            resolve({
+                                RowsAffected: results.changedRows,
+                            });
+                            break;
+                        case orm_1.QueryContext.Insert:
+                            resolve({ LastInsertId: results.insertId, RowsAffected: results.changedRows });
+                            break;
+                        default:
+                            resolve(results);
+                            break;
+                    }
+                    void this.Log.write({
+                        Level: log_1.LogLevel.Trace,
+                        Variables: {
+                            error: null,
+                            message: `Executed: ${stmt}, bindings: ${params ? params.join(',') : 'none'}`,
+                            logger: this.Log.Name,
+                            level: 'TRACE',
+                            duration: tDiff,
+                        },
+                    });
+                }
+            });
+        });
+    }
+    async ping() {
+        try {
+            await this.execute('SELECT 1', [], orm_1.QueryContext.Select);
+            return true;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+    connect() {
+        this.Pool = mysql.createPool({
+            host: this.Options.Host,
+            user: this.Options.User,
+            database: this.Options.Database,
+            waitForConnections: true,
+            connectionLimit: this.Options.PoolLimit,
+            queueLimit: 0,
+        });
+        return Promise.resolve(this);
+    }
+    disconnect() {
+        return new Promise((resolve, reject) => {
+            this.Pool.end((err) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(this);
+                }
+            });
+        });
+    }
+    async tableInfo(name, schema) {
+        const tblInfo = (await this.execute(`SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME=? ${schema ? 'AND TABLE_SCHEMA=?' : ''} `, schema ? [name, schema] : [name], orm_1.QueryContext.Select));
+        const indexInfo = (await this.execute(`SHOW INDEXES FROM ${name}`, [], orm_1.QueryContext.Select));
+        if (!tblInfo || !Array.isArray(tblInfo) || tblInfo.length === 0) {
+            return null;
+        }
+        return tblInfo.map((r) => {
+            const isPrimary = indexInfo.find((c) => c.Key_name === 'PRIMARY' && c.Column_name === r.COLUMN_NAME) !== undefined;
+            const sUnique = indexInfo.find((c) => c.Non_unique === 0 && c.Column_name === r.COLUMN_NAME) !== undefined;
+            return {
+                Type: r.DATA_TYPE,
+                MaxLength: -1,
+                Comment: '',
+                DefaultValue: r.COLUMN_DEFAULT,
+                NativeType: r.DATA_TYPE,
+                Unsigned: false,
+                Nullable: r.IS_NULLABLE === 'YES',
+                PrimaryKey: isPrimary,
+                Uuid: false,
+                Ignore: false,
+                // simply assumpt that integer pkeys are autoincement / auto fill  by default
+                AutoIncrement: isPrimary && r.DATA_TYPE === 'int',
+                Name: r.COLUMN_NAME,
+                Converter: null,
+                Schema: schema ? schema : this.Options.Database,
+                Unique: sUnique,
+            };
+        });
+    }
+    // todo fix transactions
+    transaction(queryOrCallback) {
+        return new Promise((resolve, reject) => {
+            this.Pool.getConnection((err, connection) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    connection.beginTransaction((err) => {
+                        if (err) {
+                            reject(err);
+                        }
+                        else {
+                            if (Array.isArray(queryOrCallback)) {
+                                Promise.all(queryOrCallback)
+                                    .then(() => {
+                                    resolve();
+                                    return;
+                                })
+                                    .catch((err) => {
+                                    reject(err);
+                                });
+                            }
+                            else {
+                                queryOrCallback(this)
+                                    .then(() => {
+                                    resolve();
+                                    return;
+                                })
+                                    .catch((err) => {
+                                    reject(err);
+                                });
+                            }
+                        }
+                    });
+                }
+            });
+        });
+    }
+};
+MySqlOrmDriver = __decorate([
+    (0, di_1.Injectable)('orm-driver-mysql')
+], MySqlOrmDriver);
+exports.MySqlOrmDriver = MySqlOrmDriver;
+//# sourceMappingURL=index.js.map

package/lib/orm-mysql/src/index.js.map

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

package/lib/orm-mysql/src/types.d.ts

@@ -0,0 +1,18 @@
+export interface ITableColumnInfo {
+    TABLE_NAME: string;
+    TABLE_SCHEMA: string;
+    COLUMN_NAME: string;
+    COLUMN_DEFAULT: string;
+    IS_NULLABLE: string;
+    DATA_TYPE: string;
+    CHARACTER_MAXIMUM_LENGTH: number;
+    COLUMN_TYPE: string;
+    COLUMN_KEY: string;
+    EXTRA: string;
+    COLUMN_COMMENT: string;
+}
+export interface IIndexInfo {
+    Key_name: string;
+    Column_name: string;
+    Non_unique: number;
+}

package/lib/orm-mysql/src/types.js

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

package/lib/orm-mysql/src/types.js.map

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

package/lib/orm-mysql.js

@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = ormMysql;
+
+function ormMysql() {
+    // TODO
+}

package/lib/orm-sqlite/src/types.d.ts

@@ -0,0 +1,19 @@
+export interface IIndexInfoList {
+    seq: number;
+    name: string;
+    unique: number;
+    origin: string;
+    partial: number;
+}
+export interface IIndexInfo {
+    seqno: number;
+    cid: number;
+    name: string;
+}
+export interface ITableInfo {
+    dflt_value: unknown;
+    type: string;
+    notnull: number;
+    pk: number;
+    name: string;
+}

package/lib/orm-sqlite/src/types.js

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

package/lib/orm-sqlite/src/types.js.map

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

package/lib/types.d.ts

@@ -0,0 +1,18 @@
+export interface ITableColumnInfo {
+    TABLE_NAME: string;
+    TABLE_SCHEMA: string;
+    COLUMN_NAME: string;
+    COLUMN_DEFAULT: string;
+    IS_NULLABLE: string;
+    DATA_TYPE: string;
+    CHARACTER_MAXIMUM_LENGTH: number;
+    COLUMN_TYPE: string;
+    COLUMN_KEY: string;
+    EXTRA: string;
+    COLUMN_COMMENT: string;
+}
+export interface IIndexInfo {
+    Key_name: string;
+    Column_name: string;
+    Non_unique: number;
+}

package/lib/types.js

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

package/lib/types.js.map

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

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "@spinajs/orm-mysql",
-  "version": "1.0.1",
-  "description": "SpinaJS orm mysql support. Contains mysql driver.",
+  "version": "2.0.16",
+  "description": "orm mysql integration",
   "main": "lib/index.js",
   "private": false,
   "scripts": {
+    "build": "npm run clean && npm run compile",
+    "compile": "tsc -p tsconfig.build.json",
+    "clean": "",
     "test": "ts-mocha -p tsconfig.json test/**/*.test.ts",
     "coverage": "nyc npm run test",
     "build-docs": "rimraf docs && typedoc --options typedoc.json src/",
-    "build": "tsc",
     "prepare": "npm run build",
-    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "tslint -p tsconfig.json",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "lint": "eslint -c .eslintrc.js --ext .ts src --fix",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
@@ -20,9 +22,10 @@
   "files": [
     "lib/**/*"
   ],
+  "types": "lib",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/spinajs/orm-mysql.git"
+    "url": "git+https://github.com/spinajs/main.git"
   },
   "keywords": [
     "di",
@@ -30,44 +33,23 @@
     "spinajs",
     "di"
   ],
-  "author": "SpinaJS <spinajs@coderush.pl> (https://github.com/spinajs/core)",
+  "author": "SpinaJS <spinajs@coderush.pl> (https://github.com/spinajs/main)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/spinajs/orm-mysql/issues"
+    "url": "https://github.com/spinajs/main/issues"
+  },
+  "homepage": "https://github.com/spinajs/main#readme",
+  "devDependencies": {
+    "@types/mysql": "^2.15.21",
+    "chai": "^4.3.6",
+    "chai-as-promised": "^7.1.1"
   },
-  "homepage": "https://github.com/spinajs/orm-mysql#readme",
   "dependencies": {
-    "@spinajs/configuration": "^1.0.5",
-    "@spinajs/di": "^1.0.7",
-    "@spinajs/exceptions": "^1.0.0",
-    "@spinajs/log": "^1.0.2",
-    "@spinajs/orm": "^1.0.31",
-    "@spinajs/orm-sql": "^1.0.15",
-    "lodash": "^4.17.15",
+    "@spinajs/configuration": "^2.0.12",
+    "@spinajs/di": "^2.0.12",
+    "@spinajs/orm": "^2.0.14",
+    "@spinajs/orm-sql": "^2.0.14",
     "mysql": "^2.18.1"
   },
-  "devDependencies": {
-    "@types/bunyan": "^1.8.6",
-    "@types/chai": "^4.1.7",
-    "@types/chai-as-promised": "^7.1.0",
-    "@types/lodash": "^4.14.136",
-    "@types/mysql": "^2.15.9",
-    "@types/sinon": "^7.5.1",
-    "@types/sqlite3": "^3.1.5",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
-    "mocha": "^6.1.4",
-    "nyc": "^14.1.1",
-    "prettier": "^1.18.2",
-    "sinon": "^8.1.1",
-    "ts-mocha": "^6.0.0",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.20.1",
-    "tslint-circular-dependencies": "^0.1.0",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-config-standard": "^8.0.1",
-    "tslint-no-unused-expression-chai": "^0.1.4",
-    "typedoc": "^0.14.2",
-    "typescript": "^3.7.3"
-  }
+  "gitHead": "6c9da7c791409c20e391b7a39c428f1df76324e3"
 }

package/lib/converters.js

@@ -1 +0,0 @@
-//# sourceMappingURL=converters.js.map

package/lib/converters.js.map

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

package/lib/decorators.js

@@ -1 +0,0 @@
-//# sourceMappingURL=decorators.js.map

package/lib/decorators.js.map

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

package/lib/statements.js

@@ -1 +0,0 @@
-//# sourceMappingURL=statements.js.map

package/lib/statements.js.map

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