@breautek/storm 9.1.0 → 9.2.0-beta.0

package/src/MySQLConnection.ts

@@ -17,7 +17,7 @@
 import {DatabaseConnection} from './DatabaseConnection';
 import {DatabaseQueryError} from './DatabaseQueryError';
 import {getInstance} from './instance';
-import * as MySQL from 'mysql';
+import * as MySQL from 'mysql2';
 import {Readable} from 'stream';
 import { StartTransactionQuery } from './private/StartTransactionQuery';
 import { CommitQuery } from './private/CommitQuery';
@@ -35,7 +35,6 @@ import { GetBinLogPositionQuery } from './private/GetBinLogPositionQuery';
 import { GetSlavePositionQuery } from './private/GetSlavePositionQuery';
 import { GetMasterPositionQuery } from './private/GetMasterPositionQuery';
 import { IQueryable } from './IQueryable';
-import { queryFormatter } from './mysql/queryFormatter';
 import { TransactionAccessLevel } from './TransactionAccessLevel';
 import { GetProcessList, IGetProcessListOutput } from './private/GetProcessList';
 
@@ -67,6 +66,7 @@ export class MySQLConnection extends DatabaseConnection<MySQL.PoolConnection> {
     private $isMasterConnection: boolean;
 
     public constructor(connection: MySQL.PoolConnection, instantiationStack: string, isReadOnly: boolean = true) {
+        connection.config.namedPlaceholders = true;
         super(connection, isReadOnly, instantiationStack);
 
         this.$hasReplicationEnabled = false;
@@ -74,7 +74,7 @@ export class MySQLConnection extends DatabaseConnection<MySQL.PoolConnection> {
         this.$transaction = false;
         this.$isMasterConnection = null;
 
-        connection.config.queryFormat = queryFormatter.bind(this);
+        // connection.config.queryFormat = queryFormatter.bind(this);
 
         // connection.config.queryFormat = function(query: string, values: any) {
         //     if (!values) return query;
@@ -114,7 +114,7 @@ export class MySQLConnection extends DatabaseConnection<MySQL.PoolConnection> {
     }
 
     public override formatQuery(query: IQueryable<any>): string {
-        return this.getAPI().config.queryFormat(query.getQuery(this), query.getParametersForQuery());
+        return this.getAPI().format(query.getQuery(this), query.getParametersForQuery());
     }
 
     /**
@@ -158,7 +158,7 @@ export class MySQLConnection extends DatabaseConnection<MySQL.PoolConnection> {
             let queryObject: MySQL.Query = this.getAPI().query({
                 sql: query,
                 timeout: this.getTimeout()
-            }, params, (error: MySQL.MysqlError, results: any) => {
+            }, params, (error: MySQL.QueryError, results: any) => {
                 if (error) {
                     let sql: string = queryObject.sql;
                     // Formatting queries can be an expensive task, so only do it if the log level is actually silly.

package/src/MySQLDatabase.ts

@@ -16,7 +16,7 @@
 
 import {Database} from './Database';
 import {MySQLConnection} from './MySQLConnection';
-import * as MySQL from 'mysql';
+import * as MySQL from 'mysql2';
 import {getInstance} from './instance';
 import { IDatabasePosition } from './IDatabasePosition';
 import { ConnectionReplicationWaiter } from './private/ConnectionReplicationWaiter';
@@ -24,7 +24,7 @@ import { ILogger } from '@arashi/interfaces';
 
 const TAG: string = 'MySQLDatabase';
 
-export class MySQLDatabase extends Database<MySQL.PoolConfig, MySQL.PoolConnection> {
+export class MySQLDatabase extends Database<MySQL.PoolOptions, MySQL.PoolConnection> {
     private $cluster: MySQL.PoolCluster;
 
     constructor() {
@@ -47,7 +47,7 @@ export class MySQLDatabase extends Database<MySQL.PoolConfig, MySQL.PoolConnecti
         return MySQL.escape(value);
     }
 
-    protected _addNode(nodeID: string, config: MySQL.PoolConfig): void {
+    protected _addNode(nodeID: string, config: MySQL.PoolOptions): void {
         getInstance().getLogger().trace(TAG, `Adding node to connection pool: "${nodeID}"`);
         this.$cluster.add(nodeID, config);
     }
@@ -57,22 +57,13 @@ export class MySQLDatabase extends Database<MySQL.PoolConfig, MySQL.PoolConnecti
         this.$cluster.remove(nodeID);
     }
 
-    protected _destroy(): Promise<void> {
-        return new Promise<void>((resolve, reject) => {
-            this.$cluster.end((err: MySQL.MysqlError) => {
-                if (err) {
-                    reject(err);
-                    return;
-                }
-
-                resolve();
-            });
-        });
+    protected async _destroy(): Promise<void> {
+        this.$cluster.end();
     }
 
     private $getConnectionFromPool(query: string, requireWriteAccess: boolean, instantationStack: string): Promise<MySQLConnection> {
         return new Promise<MySQLConnection>((resolve, reject) => {
-            this.$cluster.getConnection(query, (error: MySQL.MysqlError, connection: MySQL.PoolConnection) => {
+            this.$cluster.getConnection(query, (error: MySQL.QueryError, connection: MySQL.PoolConnection) => {
                 if (error) {
                     reject(error);
                     return;

package/src/api.ts

@@ -114,3 +114,5 @@ export {Polygon} from './Polygon';
 // Third-party
 import * as formidable from 'formidable';
 export {formidable};
+
+export {Command} from 'commander';

package/src/mysql/queryFormatter.ts

@@ -1,5 +1,5 @@
 
-import * as MySQL from 'mysql';
+import * as MySQL from 'mysql2';
 
 export function queryFormatter(query: string, values: any): string {
     if (!values) return query;