Skip to content

Commit cb1b783

Browse files
mcollinamcollina
authored
chore: upgrade mysql2 to v3 (#335)
1 parent 5e389d5 commit cb1b783

File tree

5 files changed

+39
-33
lines changed

5 files changed

+39
-33
lines changed

‎packages/mysql-test/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@databases/with-container": "^0.0.0",
1313
"modern-spawn": "^1.0.0",
1414
"ms": "^2.1.2",
15-
"mysql2": "^2.2.5",
15+
"mysql2": "^3.11.4",
1616
"parameter-reducers": "^2.0.0",
1717
"type-assertions": "^1.1.0"
1818
},

‎packages/mysql/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
"@databases/push-to-async-iterable": "^0.0.0",
1212
"@databases/shared": "^0.0.0",
1313
"@databases/sql": "^0.0.0",
14-
"@types/mysql": "^2.15.5",
15-
"mysql2": "^2.2.5"
14+
"mysql2": "^3.11.4"
1615
},
1716
"scripts": {},
1817
"repository": "https://github.com/ForbesLindesay/atdatabases/tree/master/packages/mysql",

‎packages/mysql/src/ConnectionPool.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ interface MySqlConnectionOptions {
2828
db: string;
2929
table: string;
3030
name: string;
31-
string(): string;
32-
buffer(): Buffer;
31+
string(): string | null;
32+
buffer(): Buffer | null;
3333
geometry(): unknown;
3434
},
3535
next: () => any,

‎packages/mysql/src/index.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,10 @@ function validateMySqlUrl(urlString: string) {
239239
}
240240
}
241241

242-
function parseNullable<T, R>(value: T, parser: (value: T) => R): R | null {
242+
function parseNullable<T, R>(
243+
value: T,
244+
parser: (value: NonNullable<T>) => R,
245+
): R | null {
243246
if (value == null) {
244247
return null;
245248
}
@@ -249,7 +252,7 @@ function parseNullable<T, R>(value: T, parser: (value: T) => R): R | null {
249252

250253
function getTinyIntParser(
251254
mode: 'boolean' | 'number',
252-
): (f: {string(): string}) => any {
255+
): (f: {string(): string | null}) => any {
253256
switch (mode) {
254257
case 'number':
255258
return (f) => parseNullable(f.string(), (s) => parseInt(s, 10));
@@ -259,7 +262,7 @@ function getTinyIntParser(
259262
}
260263
function getBigIntParser(
261264
mode: 'string' | 'number' | 'bigint',
262-
): (f: {string(): string}) => any {
265+
): (f: {string(): string | null}) => any {
263266
switch (mode) {
264267
case 'number':
265268
return (f) => parseNullable(f.string(), (s) => parseInt(s, 10));
@@ -272,7 +275,7 @@ function getBigIntParser(
272275
function getDateParser(
273276
mode: 'string' | 'date-object',
274277
timeZone: 'local' | 'utc',
275-
): (f: {string(): string}) => any {
278+
): (f: {string(): string | null}) => any {
276279
switch (mode) {
277280
case 'string':
278281
return (f) => f.string();
@@ -313,7 +316,7 @@ function getDateParser(
313316
function getDateTimeParser(
314317
mode: 'string' | 'date-object',
315318
timeZone: 'local' | 'utc',
316-
): (f: {string(): string; buffer(): Buffer}) => any {
319+
): (f: {string(): string | null; buffer(): Buffer | null}) => any {
317320
switch (mode) {
318321
case 'string':
319322
return (f) => f.string();

‎yarn.lock‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,13 +1702,6 @@
17021702
resolved "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz"
17031703
integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
17041704

1705-
"@types/mysql@^2.15.5":
1706-
version "2.15.21"
1707-
resolved "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.21.tgz"
1708-
integrity sha512-NPotx5CVful7yB+qZbWtXL2fA4e7aEHkihHLjklc6ID8aq7bhguHgeIoC1EmSNTAuCgI6ZXrjt2ZSaXnYX0EUg==
1709-
dependencies:
1710-
"@types/node" "*"
1711-
17121705
"@types/node@*", "@types/node@^14.14.25", "@types/node@^7.0.31":
17131706
version "14.18.36"
17141707
resolved "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz"
@@ -2148,6 +2141,11 @@ aws-sign2@~0.7.0:
21482141
resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
21492142
integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
21502143

2144+
aws-ssl-profiles@^1.1.1:
2145+
version "1.1.2"
2146+
resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
2147+
integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==
2148+
21512149
aws4@^1.8.0:
21522150
version "1.12.0"
21532151
resolved "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"
@@ -3359,9 +3357,9 @@ delegates@^1.0.0:
33593357
resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
33603358
integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
33613359

3362-
denque@^2.0.1:
3360+
denque@^2.1.0:
33633361
version "2.1.0"
3364-
resolved "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"
3362+
resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
33653363
integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
33663364

33673365
depd@^1.1.2, depd@~1.1.2:
@@ -5716,10 +5714,10 @@ log-symbols@^5.1.0:
57165714
chalk "^5.0.0"
57175715
is-unicode-supported "^1.1.0"
57185716

5719-
long@^4.0.0:
5720-
version "4.0.0"
5721-
resolved "https://registry.npmjs.org/long/-/long-4.0.0.tgz"
5722-
integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
5717+
long@^5.2.1:
5718+
version "5.2.3"
5719+
resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
5720+
integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
57235721

57245722
longest-streak@^2.0.0:
57255723
version "2.0.4"
@@ -5752,6 +5750,11 @@ lru-cache@^7.14.1:
57525750
resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz"
57535751
integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==
57545752

5753+
lru.min@^1.0.0:
5754+
version "1.1.1"
5755+
resolved "https://registry.yarnpkg.com/lru.min/-/lru.min-1.1.1.tgz#146e01e3a183fa7ba51049175de04667d5701f0e"
5756+
integrity sha512-FbAj6lXil6t8z4z3j0E5mfRlPzxkySotzUHwRXjlpRh10vc6AI6WN62ehZj82VG7M20rqogJ0GLwar2Xa05a8Q==
5757+
57555758
lsr@^2.0.0:
57565759
version "2.0.0"
57575760
resolved "https://registry.npmjs.org/lsr/-/lsr-2.0.0.tgz"
@@ -6101,17 +6104,18 @@ [email protected]:
61016104
resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
61026105
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
61036106

6104-
mysql2@^2.2.5:
6105-
version "2.3.3"
6106-
resolved "https://registry.npmjs.org/mysql2/-/mysql2-2.3.3.tgz"
6107-
integrity sha512-wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA==
6107+
mysql2@^3.11.4:
6108+
version "3.11.4"
6109+
resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.11.4.tgz#08658b6285adbace7d43b2eaa18efddb85f99501"
6110+
integrity sha512-Z2o3tY4Z8EvSRDwknaC40MdZ3+m0sKbpnXrShQLdxPrAvcNli7jLrD2Zd2IzsRMw4eK9Yle500FDmlkIqp+krg==
61086111
dependencies:
6109-
denque "^2.0.1"
6112+
aws-ssl-profiles "^1.1.1"
6113+
denque "^2.1.0"
61106114
generate-function "^2.3.1"
61116115
iconv-lite "^0.6.3"
6112-
long "^4.0.0"
6113-
lru-cache "^6.0.0"
6114-
named-placeholders "^1.1.2"
6116+
long "^5.2.1"
6117+
lru.min "^1.0.0"
6118+
named-placeholders "^1.1.3"
61156119
seq-queue "^0.0.5"
61166120
sqlstring "^2.3.2"
61176121

@@ -6124,9 +6128,9 @@ mz@^2.7.0:
61246128
object-assign "^4.0.1"
61256129
thenify-all "^1.0.0"
61266130

6127-
named-placeholders@^1.1.2:
6131+
named-placeholders@^1.1.3:
61286132
version "1.1.3"
6129-
resolved "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz"
6133+
resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.3.tgz#df595799a36654da55dda6152ba7a137ad1d9351"
61306134
integrity sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==
61316135
dependencies:
61326136
lru-cache "^7.14.1"

0 commit comments

Comments
 (0)