@simonbackx/simple-database 1.31.0 → 1.32.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.
@@ -1,4 +1,4 @@
1
- import mysql from 'mysql';
1
+ import mysql from 'mysql2/promise';
2
2
  import { DatabaseStoredValue } from './Column';
3
3
  export type SQLResultRow = Record<string, DatabaseStoredValue>;
4
4
  export type SQLResultNamespacedRow = Record<string, SQLResultRow>;
@@ -21,20 +21,24 @@ declare class DatabaseStatic {
21
21
  finishQuery(q: any, hrstart: [number, number]): void;
22
22
  select(query: string, values?: any, options?: SelectOptions & {
23
23
  nestTables: true;
24
- }): Promise<[SQLResultNamespacedRow[], mysql.FieldInfo[] | undefined]>;
24
+ }): Promise<[SQLResultNamespacedRow[], mysql.FieldPacket[] | undefined]>;
25
25
  select(query: string, values?: any, options?: SelectOptions & {
26
26
  nestTables: false;
27
- }): Promise<[SQLResultRow[], mysql.FieldInfo[] | undefined]>;
27
+ }): Promise<[SQLResultRow[], mysql.FieldPacket[] | undefined]>;
28
28
  insert(query: string, values?: any, useConnection?: mysql.PoolConnection): Promise<[{
29
29
  insertId: any;
30
30
  affectedRows: number;
31
- }, mysql.FieldInfo[] | undefined]>;
32
- update(query: string, values?: any, useConnection?: mysql.PoolConnection): Promise<[{
33
- changedRows: number;
34
- }, mysql.FieldInfo[] | undefined]>;
31
+ }, mysql.FieldPacket[] | undefined]>;
32
+ update(query: string, values?: any, useConnection?: mysql.PoolConnection): Promise<[
33
+ {
34
+ changedRows: number;
35
+ affectedRows: number;
36
+ },
37
+ mysql.FieldPacket[] | undefined
38
+ ]>;
35
39
  delete(query: string, values?: any, useConnection?: mysql.PoolConnection): Promise<[{
36
40
  affectedRows: number;
37
- }, mysql.FieldInfo[] | undefined]>;
41
+ }, mysql.FieldPacket[] | undefined]>;
38
42
  statement(query: string, values?: any, useConnection?: mysql.PoolConnection): Promise<[any, any]>;
39
43
  }
40
44
  export declare const Database: DatabaseStatic;
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Database = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const fs_1 = tslib_1.__importDefault(require("fs"));
6
- const mysql_1 = tslib_1.__importDefault(require("mysql"));
6
+ const promise_1 = tslib_1.__importDefault(require("mysql2/promise"));
7
7
  /// Database is a wrapper arround mysql, because we want to use promises + types
8
8
  class DatabaseStatic {
9
9
  constructor(options = {}) {
@@ -12,7 +12,7 @@ class DatabaseStatic {
12
12
  if (!process.env.DB_DATABASE) {
13
13
  throw new Error('Environment variable DB_DATABASE is missing');
14
14
  }
15
- this.pool = mysql_1.default.createPool({
15
+ this.pool = promise_1.default.createPool({
16
16
  host: (_a = process.env.DB_HOST) !== null && _a !== void 0 ? _a : 'localhost',
17
17
  user: (_b = process.env.DB_USER) !== null && _b !== void 0 ? _b : 'root',
18
18
  password: (_c = process.env.DB_PASS) !== null && _c !== void 0 ? _c : 'root',
@@ -23,6 +23,8 @@ class DatabaseStatic {
23
23
  queueLimit: 0,
24
24
  multipleStatements: ((_f = process.env.DB_MULTIPLE_STATEMENTS) !== null && _f !== void 0 ? _f : 'false') === 'true',
25
25
  charset: (_g = process.env.DB_CHARSET) !== null && _g !== void 0 ? _g : 'utf8mb4_0900_ai_ci',
26
+ decimalNumbers: true,
27
+ jsonStrings: true,
26
28
  ssl: ((_h = process.env.DB_USE_SSL) !== null && _h !== void 0 ? _h : false)
27
29
  ? {
28
30
  ca: process.env.DB_CA ? fs_1.default.readFileSync(process.env.DB_CA) : undefined,
@@ -51,32 +53,13 @@ class DatabaseStatic {
51
53
  }
52
54
  async getConnection() {
53
55
  // Todo: use the settings here to provide a good connection pool
54
- return new Promise((resolve, reject) => {
55
- this.pool.getConnection((err, connection) => {
56
- if (err) {
57
- console.error('connection failed');
58
- return reject(err);
59
- }
60
- return resolve(connection);
61
- });
62
- });
56
+ return await this.pool.getConnection();
63
57
  }
64
58
  escapeId(value) {
65
59
  return this.pool.escapeId(value);
66
60
  }
67
61
  async end() {
68
- return new Promise((resolve, reject) => {
69
- this.pool.end((err) => {
70
- if (err) {
71
- console.error(err);
72
- return reject(err);
73
- }
74
- if (this.debug) {
75
- console.log('All connections have ended in the pool');
76
- }
77
- return resolve();
78
- });
79
- });
62
+ return await this.pool.end();
80
63
  }
81
64
  startQuery() {
82
65
  return process.hrtime();
@@ -94,86 +77,80 @@ class DatabaseStatic {
94
77
  }
95
78
  }
96
79
  async select(query, values, options = {}) {
97
- var _a;
80
+ var _a, _b;
98
81
  const connection = (_a = options.connection) !== null && _a !== void 0 ? _a : (await this.getConnection());
99
- return new Promise((resolve, reject) => {
100
- var _a;
101
- const hrstart = this.startQuery();
102
- const q = connection.query({ sql: query, nestTables: (_a = options.nestTables) !== null && _a !== void 0 ? _a : true, values: values }, (err, results, fields) => {
103
- if (!options.connection)
104
- connection.release();
105
- this.finishQuery(q, hrstart);
106
- if (err) {
107
- return reject(err);
108
- }
109
- return resolve([results, fields]);
110
- });
111
- this.logQuery(q, hrstart);
112
- });
82
+ try {
83
+ const q = await connection.query({ sql: query, nestTables: (_b = options.nestTables) !== null && _b !== void 0 ? _b : true, values: values });
84
+ return [
85
+ q[0],
86
+ q[1],
87
+ ];
88
+ }
89
+ finally {
90
+ if (!options.connection) {
91
+ connection.release();
92
+ }
93
+ }
113
94
  }
114
95
  async insert(query, values, useConnection) {
115
96
  const connection = useConnection !== null && useConnection !== void 0 ? useConnection : (await this.getConnection());
116
- return new Promise((resolve, reject) => {
117
- const hrstart = this.startQuery();
118
- const q = connection.query(query, values, (err, results, fields) => {
119
- if (!useConnection)
120
- connection.release();
121
- this.finishQuery(q, hrstart);
122
- if (err) {
123
- return reject(err);
124
- }
125
- return resolve([results, fields]);
126
- });
127
- this.logQuery(q, hrstart);
128
- });
97
+ try {
98
+ const q = await connection.query({ sql: query, values: values });
99
+ return [
100
+ q[0],
101
+ q[1],
102
+ ];
103
+ }
104
+ finally {
105
+ if (!useConnection) {
106
+ connection.release();
107
+ }
108
+ }
129
109
  }
130
110
  async update(query, values, useConnection) {
131
111
  const connection = useConnection !== null && useConnection !== void 0 ? useConnection : (await this.getConnection());
132
- return new Promise((resolve, reject) => {
133
- const hrstart = this.startQuery();
134
- const q = connection.query(query, values, (err, results, fields) => {
135
- if (!useConnection)
136
- connection.release();
137
- this.finishQuery(q, hrstart);
138
- if (err) {
139
- return reject(err);
140
- }
141
- return resolve([results, fields]);
142
- });
143
- this.logQuery(q, hrstart);
144
- });
112
+ try {
113
+ const q = await connection.query({ sql: query, values: values });
114
+ return [
115
+ q[0],
116
+ q[1],
117
+ ];
118
+ }
119
+ finally {
120
+ if (!useConnection) {
121
+ connection.release();
122
+ }
123
+ }
145
124
  }
146
125
  async delete(query, values, useConnection) {
147
126
  const connection = useConnection !== null && useConnection !== void 0 ? useConnection : (await this.getConnection());
148
- return new Promise((resolve, reject) => {
149
- const hrstart = this.startQuery();
150
- const q = connection.query(query, values, (err, results, fields) => {
151
- if (!useConnection)
152
- connection.release();
153
- this.finishQuery(q, hrstart);
154
- if (err) {
155
- return reject(err);
156
- }
157
- return resolve([results, fields]);
158
- });
159
- this.logQuery(q, hrstart);
160
- });
127
+ try {
128
+ const q = await connection.query({ sql: query, values: values });
129
+ return [
130
+ q[0],
131
+ q[1],
132
+ ];
133
+ }
134
+ finally {
135
+ if (!useConnection) {
136
+ connection.release();
137
+ }
138
+ }
161
139
  }
162
140
  async statement(query, values, useConnection) {
163
141
  const connection = useConnection !== null && useConnection !== void 0 ? useConnection : (await this.getConnection());
164
- return new Promise((resolve, reject) => {
165
- const hrstart = this.startQuery();
166
- const q = connection.query(query, values, (err, results, fields) => {
167
- if (!useConnection)
168
- connection.release();
169
- this.finishQuery(q, hrstart);
170
- if (err) {
171
- return reject(err);
172
- }
173
- return resolve([results, fields]);
174
- });
175
- this.logQuery(q, hrstart);
176
- });
142
+ try {
143
+ const q = await connection.query({ sql: query, values: values });
144
+ return [
145
+ q[0],
146
+ q[1],
147
+ ];
148
+ }
149
+ finally {
150
+ if (!useConnection) {
151
+ connection.release();
152
+ }
153
+ }
177
154
  }
178
155
  }
179
156
  exports.Database = new DatabaseStatic();
@@ -1 +1 @@
1
- {"version":3,"file":"Database.js","sourceRoot":"","sources":["../../../src/classes/Database.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Database.js","sourceRoot":"","sources":["../../../src/classes/Database.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@simonbackx/simple-database",
3
3
  "main": "./dist/index.js",
4
4
  "types": "./dist/index.d.ts",
5
- "version": "1.31.0",
5
+ "version": "1.32.0",
6
6
  "scripts": {
7
7
  "test": "yarn build && jest",
8
8
  "build": "rm -rf ./dist && tsc -p . --declaration && mkdir -p ./dist/src/migrations && cp -a ./src/migrations/*.sql ./dist/src/migrations",
@@ -15,11 +15,11 @@
15
15
  "dependencies": {
16
16
  "@simonbackx/simple-logging": "^1.0.0",
17
17
  "colors": "^1.4.0",
18
- "mysql": "^2.18.1"
18
+ "mysql2": "3.14.1"
19
19
  },
20
20
  "peerDependencies": {
21
21
  "@simonbackx/simple-encoding": "^2.18.0",
22
- "mysql": "^2.18.1"
22
+ "mysql2": "^3.14.1"
23
23
  },
24
24
  "devDependencies": {
25
25
  "@simonbackx/simple-encoding": "^2.20.0",