@breautek/storm 9.1.1 → 9.2.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/DatabaseCastObject.js +1 -1
- package/lib/DatabaseCastObject.js.map +1 -1
- package/lib/MySQLConnection.d.ts +1 -1
- package/lib/MySQLConnection.js +3 -3
- package/lib/MySQLConnection.js.map +1 -1
- package/lib/MySQLDatabase.d.ts +3 -3
- package/lib/MySQLDatabase.js +3 -11
- package/lib/MySQLDatabase.js.map +1 -1
- package/lib/mysql/queryFormatter.js +1 -1
- package/lib/mysql/queryFormatter.js.map +1 -1
- package/package.json +9 -10
- package/src/DatabaseCastObject.ts +1 -1
- package/src/MySQLConnection.ts +5 -5
- package/src/MySQLDatabase.ts +6 -15
- package/src/mysql/queryFormatter.ts +1 -1
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.DatabaseCastObject = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
|
-
const MySQL = tslib_1.__importStar(require("
|
|
20
|
+
const MySQL = tslib_1.__importStar(require("mysql2"));
|
|
21
21
|
class DatabaseCastObject {
|
|
22
22
|
toSqlString() {
|
|
23
23
|
return this._toSQLString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabaseCastObject.js","sourceRoot":"","sources":["../src/DatabaseCastObject.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"DatabaseCastObject.js","sourceRoot":"","sources":["../src/DatabaseCastObject.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;;AAEF,sDAAgC;AAEhC,MAAsB,kBAAkB;IAC7B,WAAW;QACd,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,KAAU;QACpB,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;CAGJ;AAVD,gDAUC"}
|
package/lib/MySQLConnection.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DatabaseConnection } from './DatabaseConnection';
|
|
2
|
-
import * as MySQL from '
|
|
2
|
+
import * as MySQL from 'mysql2';
|
|
3
3
|
import { Readable } from 'stream';
|
|
4
4
|
import { IsolationLevel } from './IsolationLevel';
|
|
5
5
|
import { IDatabasePosition } from './IDatabasePosition';
|
package/lib/MySQLConnection.js
CHANGED
|
@@ -30,7 +30,6 @@ const SetIsolationLevelQuery_1 = require("./private/SetIsolationLevelQuery");
|
|
|
30
30
|
const LockWaitTimeoutError_1 = require("./LockWaitTimeoutError");
|
|
31
31
|
const GetSlavePositionQuery_1 = require("./private/GetSlavePositionQuery");
|
|
32
32
|
const GetMasterPositionQuery_1 = require("./private/GetMasterPositionQuery");
|
|
33
|
-
const queryFormatter_1 = require("./mysql/queryFormatter");
|
|
34
33
|
const TransactionAccessLevel_1 = require("./TransactionAccessLevel");
|
|
35
34
|
const GetProcessList_1 = require("./private/GetProcessList");
|
|
36
35
|
const DEFAULT_HIGH_WATERMARK = 512; // in number of result objects
|
|
@@ -53,12 +52,13 @@ let commitQuery = new CommitQuery_1.CommitQuery();
|
|
|
53
52
|
let rollbackQuery = new RollbackQuery_1.RollbackQuery();
|
|
54
53
|
class MySQLConnection extends DatabaseConnection_1.DatabaseConnection {
|
|
55
54
|
constructor(connection, instantiationStack, isReadOnly = true) {
|
|
55
|
+
connection.config.namedPlaceholders = true;
|
|
56
56
|
super(connection, isReadOnly, instantiationStack);
|
|
57
57
|
this.$hasReplicationEnabled = false;
|
|
58
58
|
this.$opened = true;
|
|
59
59
|
this.$transaction = false;
|
|
60
60
|
this.$isMasterConnection = null;
|
|
61
|
-
connection.config.queryFormat =
|
|
61
|
+
// connection.config.queryFormat = queryFormatter.bind(this);
|
|
62
62
|
// connection.config.queryFormat = function(query: string, values: any) {
|
|
63
63
|
// if (!values) return query;
|
|
64
64
|
// return query.replace(/:(\w+)/g, function(this: any, txt: string, key: string): string {
|
|
@@ -92,7 +92,7 @@ class MySQLConnection extends DatabaseConnection_1.DatabaseConnection {
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
formatQuery(query) {
|
|
95
|
-
return this.getAPI().
|
|
95
|
+
return this.getAPI().format(query.getQuery(this), query.getParametersForQuery());
|
|
96
96
|
}
|
|
97
97
|
/**
|
|
98
98
|
* Returns true if this server is the source.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MySQLConnection.js","sourceRoot":"","sources":["../src/MySQLConnection.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;;AAEF,6DAAwD;AACxD,6DAAwD;AACxD,yCAAuC;AAGvC,2EAAwE;AACxE,uDAAoD;AACpD,2DAAwD;AACxD,oEAA8C;AAE9C,mDAA4C;AAE5C,mDAAgD;AAEhD,6EAAwE;AACxE,iEAA8D;AAG9D,2EAAwE;AACxE,6EAA0E;AAE1E,
|
|
1
|
+
{"version":3,"file":"MySQLConnection.js","sourceRoot":"","sources":["../src/MySQLConnection.ts"],"names":[],"mappings":"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"}
|
package/lib/MySQLDatabase.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { Database } from './Database';
|
|
2
2
|
import { MySQLConnection } from './MySQLConnection';
|
|
3
|
-
import * as MySQL from '
|
|
3
|
+
import * as MySQL from 'mysql2';
|
|
4
4
|
import { IDatabasePosition } from './IDatabasePosition';
|
|
5
|
-
export declare class MySQLDatabase extends Database<MySQL.
|
|
5
|
+
export declare class MySQLDatabase extends Database<MySQL.PoolOptions, MySQL.PoolConnection> {
|
|
6
6
|
private $cluster;
|
|
7
7
|
constructor();
|
|
8
8
|
escape(value: any): string;
|
|
9
9
|
static escape(value: any): string;
|
|
10
|
-
protected _addNode(nodeID: string, config: MySQL.
|
|
10
|
+
protected _addNode(nodeID: string, config: MySQL.PoolOptions): void;
|
|
11
11
|
protected _removeNode(nodeID: string): void;
|
|
12
12
|
protected _destroy(): Promise<void>;
|
|
13
13
|
private $getConnectionFromPool;
|
package/lib/MySQLDatabase.js
CHANGED
|
@@ -19,7 +19,7 @@ exports.MySQLDatabase = void 0;
|
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const Database_1 = require("./Database");
|
|
21
21
|
const MySQLConnection_1 = require("./MySQLConnection");
|
|
22
|
-
const MySQL = tslib_1.__importStar(require("
|
|
22
|
+
const MySQL = tslib_1.__importStar(require("mysql2"));
|
|
23
23
|
const instance_1 = require("./instance");
|
|
24
24
|
const ConnectionReplicationWaiter_1 = require("./private/ConnectionReplicationWaiter");
|
|
25
25
|
const TAG = 'MySQLDatabase';
|
|
@@ -49,16 +49,8 @@ class MySQLDatabase extends Database_1.Database {
|
|
|
49
49
|
(0, instance_1.getInstance)().getLogger().trace(TAG, `Removing node to connection pool: "${nodeID}"`);
|
|
50
50
|
this.$cluster.remove(nodeID);
|
|
51
51
|
}
|
|
52
|
-
_destroy() {
|
|
53
|
-
|
|
54
|
-
this.$cluster.end((err) => {
|
|
55
|
-
if (err) {
|
|
56
|
-
reject(err);
|
|
57
|
-
return;
|
|
58
|
-
}
|
|
59
|
-
resolve();
|
|
60
|
-
});
|
|
61
|
-
});
|
|
52
|
+
async _destroy() {
|
|
53
|
+
this.$cluster.end();
|
|
62
54
|
}
|
|
63
55
|
$getConnectionFromPool(query, requireWriteAccess, instantationStack) {
|
|
64
56
|
return new Promise((resolve, reject) => {
|
package/lib/MySQLDatabase.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MySQLDatabase.js","sourceRoot":"","sources":["../src/MySQLDatabase.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;;AAEF,yCAAoC;AACpC,uDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"MySQLDatabase.js","sourceRoot":"","sources":["../src/MySQLDatabase.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.queryFormatter = queryFormatter;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const MySQL = tslib_1.__importStar(require("
|
|
5
|
+
const MySQL = tslib_1.__importStar(require("mysql2"));
|
|
6
6
|
function queryFormatter(query, values) {
|
|
7
7
|
if (!values)
|
|
8
8
|
return query;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryFormatter.js","sourceRoot":"","sources":["../../src/mysql/queryFormatter.ts"],"names":[],"mappings":";;AAGA,wCAUC;;AAZD,
|
|
1
|
+
{"version":3,"file":"queryFormatter.js","sourceRoot":"","sources":["../../src/mysql/queryFormatter.ts"],"names":[],"mappings":";;AAGA,wCAUC;;AAZD,sDAAgC;AAEhC,SAAgB,cAAc,CAAC,KAAa,EAAE,MAAW;IACrD,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE1B,OAAO,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,UAAoB,GAAW,EAAE,GAAW;QACxE,iDAAiD;QACjD,IAAI,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@breautek/storm",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.2.0-beta.0",
|
|
4
4
|
"description": "Object-Oriented REST API framework",
|
|
5
5
|
"main": "lib/api.js",
|
|
6
6
|
"types": "lib/api.d.ts",
|
|
@@ -51,17 +51,16 @@
|
|
|
51
51
|
"@types/formidable": "3.4.5",
|
|
52
52
|
"@types/jsonwebtoken": "9.0.10",
|
|
53
53
|
"@types/mysql": "2.15.27",
|
|
54
|
-
"@types/node": "24.2
|
|
55
|
-
"@types/uuid": "10.0.0",
|
|
54
|
+
"@types/node": "24.5.2",
|
|
56
55
|
"ajv": "8.17.1",
|
|
57
56
|
"body-parser": "2.2.0",
|
|
58
|
-
"commander": "14.0.
|
|
57
|
+
"commander": "14.0.1",
|
|
59
58
|
"express": "5.1.0",
|
|
60
59
|
"form-data": "4.0.4",
|
|
61
60
|
"formidable": "3.5.4",
|
|
62
61
|
"jsonwebtoken": "9.0.2",
|
|
63
|
-
"
|
|
64
|
-
"sql-formatter": "15.6.
|
|
62
|
+
"mysql2": "3.15.0",
|
|
63
|
+
"sql-formatter": "15.6.9",
|
|
65
64
|
"tslib": "2.8.1",
|
|
66
65
|
"uuid": "11.1.0"
|
|
67
66
|
},
|
|
@@ -77,11 +76,11 @@
|
|
|
77
76
|
"@types/jest": "30.0.0",
|
|
78
77
|
"@types/ms": "2.1.0",
|
|
79
78
|
"auto-changelog": "2.5.0",
|
|
80
|
-
"jest": "30.
|
|
81
|
-
"jest-jasmine2": "30.
|
|
82
|
-
"ts-jest": "29.4.
|
|
79
|
+
"jest": "30.1.3",
|
|
80
|
+
"jest-jasmine2": "30.1.3",
|
|
81
|
+
"ts-jest": "29.4.4",
|
|
83
82
|
"ts-node": "10.9.2",
|
|
84
|
-
"typedoc": "0.28.
|
|
83
|
+
"typedoc": "0.28.13",
|
|
85
84
|
"typedoc-plugin-markdown": "4.8.1",
|
|
86
85
|
"typescript": "5.9.2"
|
|
87
86
|
}
|
package/src/MySQLConnection.ts
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import {DatabaseConnection} from './DatabaseConnection';
|
|
18
18
|
import {DatabaseQueryError} from './DatabaseQueryError';
|
|
19
19
|
import {getInstance} from './instance';
|
|
20
|
-
import * as MySQL from '
|
|
20
|
+
import * as MySQL from 'mysql2';
|
|
21
21
|
import {Readable} from 'stream';
|
|
22
22
|
import { StartTransactionQuery } from './private/StartTransactionQuery';
|
|
23
23
|
import { CommitQuery } from './private/CommitQuery';
|
|
@@ -35,7 +35,6 @@ import { GetBinLogPositionQuery } from './private/GetBinLogPositionQuery';
|
|
|
35
35
|
import { GetSlavePositionQuery } from './private/GetSlavePositionQuery';
|
|
36
36
|
import { GetMasterPositionQuery } from './private/GetMasterPositionQuery';
|
|
37
37
|
import { IQueryable } from './IQueryable';
|
|
38
|
-
import { queryFormatter } from './mysql/queryFormatter';
|
|
39
38
|
import { TransactionAccessLevel } from './TransactionAccessLevel';
|
|
40
39
|
import { GetProcessList, IGetProcessListOutput } from './private/GetProcessList';
|
|
41
40
|
|
|
@@ -67,6 +66,7 @@ export class MySQLConnection extends DatabaseConnection<MySQL.PoolConnection> {
|
|
|
67
66
|
private $isMasterConnection: boolean;
|
|
68
67
|
|
|
69
68
|
public constructor(connection: MySQL.PoolConnection, instantiationStack: string, isReadOnly: boolean = true) {
|
|
69
|
+
connection.config.namedPlaceholders = true;
|
|
70
70
|
super(connection, isReadOnly, instantiationStack);
|
|
71
71
|
|
|
72
72
|
this.$hasReplicationEnabled = false;
|
|
@@ -74,7 +74,7 @@ export class MySQLConnection extends DatabaseConnection<MySQL.PoolConnection> {
|
|
|
74
74
|
this.$transaction = false;
|
|
75
75
|
this.$isMasterConnection = null;
|
|
76
76
|
|
|
77
|
-
connection.config.queryFormat = queryFormatter.bind(this);
|
|
77
|
+
// connection.config.queryFormat = queryFormatter.bind(this);
|
|
78
78
|
|
|
79
79
|
// connection.config.queryFormat = function(query: string, values: any) {
|
|
80
80
|
// if (!values) return query;
|
|
@@ -114,7 +114,7 @@ export class MySQLConnection extends DatabaseConnection<MySQL.PoolConnection> {
|
|
|
114
114
|
}
|
|
115
115
|
|
|
116
116
|
public override formatQuery(query: IQueryable<any>): string {
|
|
117
|
-
return this.getAPI().
|
|
117
|
+
return this.getAPI().format(query.getQuery(this), query.getParametersForQuery());
|
|
118
118
|
}
|
|
119
119
|
|
|
120
120
|
/**
|
|
@@ -158,7 +158,7 @@ export class MySQLConnection extends DatabaseConnection<MySQL.PoolConnection> {
|
|
|
158
158
|
let queryObject: MySQL.Query = this.getAPI().query({
|
|
159
159
|
sql: query,
|
|
160
160
|
timeout: this.getTimeout()
|
|
161
|
-
}, params, (error: MySQL.
|
|
161
|
+
}, params, (error: MySQL.QueryError, results: any) => {
|
|
162
162
|
if (error) {
|
|
163
163
|
let sql: string = queryObject.sql;
|
|
164
164
|
// Formatting queries can be an expensive task, so only do it if the log level is actually silly.
|
package/src/MySQLDatabase.ts
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import {Database} from './Database';
|
|
18
18
|
import {MySQLConnection} from './MySQLConnection';
|
|
19
|
-
import * as MySQL from '
|
|
19
|
+
import * as MySQL from 'mysql2';
|
|
20
20
|
import {getInstance} from './instance';
|
|
21
21
|
import { IDatabasePosition } from './IDatabasePosition';
|
|
22
22
|
import { ConnectionReplicationWaiter } from './private/ConnectionReplicationWaiter';
|
|
@@ -24,7 +24,7 @@ import { ILogger } from '@arashi/interfaces';
|
|
|
24
24
|
|
|
25
25
|
const TAG: string = 'MySQLDatabase';
|
|
26
26
|
|
|
27
|
-
export class MySQLDatabase extends Database<MySQL.
|
|
27
|
+
export class MySQLDatabase extends Database<MySQL.PoolOptions, MySQL.PoolConnection> {
|
|
28
28
|
private $cluster: MySQL.PoolCluster;
|
|
29
29
|
|
|
30
30
|
constructor() {
|
|
@@ -47,7 +47,7 @@ export class MySQLDatabase extends Database<MySQL.PoolConfig, MySQL.PoolConnecti
|
|
|
47
47
|
return MySQL.escape(value);
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
protected _addNode(nodeID: string, config: MySQL.
|
|
50
|
+
protected _addNode(nodeID: string, config: MySQL.PoolOptions): void {
|
|
51
51
|
getInstance().getLogger().trace(TAG, `Adding node to connection pool: "${nodeID}"`);
|
|
52
52
|
this.$cluster.add(nodeID, config);
|
|
53
53
|
}
|
|
@@ -57,22 +57,13 @@ export class MySQLDatabase extends Database<MySQL.PoolConfig, MySQL.PoolConnecti
|
|
|
57
57
|
this.$cluster.remove(nodeID);
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
-
protected _destroy(): Promise<void> {
|
|
61
|
-
|
|
62
|
-
this.$cluster.end((err: MySQL.MysqlError) => {
|
|
63
|
-
if (err) {
|
|
64
|
-
reject(err);
|
|
65
|
-
return;
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
resolve();
|
|
69
|
-
});
|
|
70
|
-
});
|
|
60
|
+
protected async _destroy(): Promise<void> {
|
|
61
|
+
this.$cluster.end();
|
|
71
62
|
}
|
|
72
63
|
|
|
73
64
|
private $getConnectionFromPool(query: string, requireWriteAccess: boolean, instantationStack: string): Promise<MySQLConnection> {
|
|
74
65
|
return new Promise<MySQLConnection>((resolve, reject) => {
|
|
75
|
-
this.$cluster.getConnection(query, (error: MySQL.
|
|
66
|
+
this.$cluster.getConnection(query, (error: MySQL.QueryError, connection: MySQL.PoolConnection) => {
|
|
76
67
|
if (error) {
|
|
77
68
|
reject(error);
|
|
78
69
|
return;
|