Skip to content

Commit 48a9f5f

Browse files
committed
swop mysql library and knex client for mysql2
1 parent 63d06da commit 48a9f5f

File tree

5 files changed

+73
-24
lines changed

5 files changed

+73
-24
lines changed

backend/config/default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"database": {
3-
"engine": "mysql",
3+
"engine": "mysql2",
44
"host": "db",
55
"name": "npm",
66
"user": "npm",

backend/knexfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
development: {
3-
client: 'mysql',
3+
client: 'mysql2',
44
migrations: {
55
tableName: 'migrations',
66
stub: 'lib/migrate_template.js',
@@ -9,7 +9,7 @@ module.exports = {
99
},
1010

1111
production: {
12-
client: 'mysql',
12+
client: 'mysql2',
1313
migrations: {
1414
tableName: 'migrations',
1515
stub: 'lib/migrate_template.js',

backend/lib/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const configure = () => {
3434
logger.info('Using MySQL configuration');
3535
instance = {
3636
database: {
37-
engine: 'mysql',
37+
engine: 'mysql2',
3838
host: envMysqlHost,
3939
port: process.env.DB_MYSQL_PORT || 3306,
4040
user: envMysqlUser,

backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"liquidjs": "10.6.1",
2020
"lodash": "^4.17.21",
2121
"moment": "^2.29.4",
22-
"mysql": "^2.18.1",
22+
"mysql2": "^3.11.1",
2323
"node-rsa": "^1.0.8",
2424
"objection": "3.0.1",
2525
"path": "^0.12.7",

backend/yarn.lock

Lines changed: 68 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,11 @@ async@^3.2.0:
360360
resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
361361
integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
362362

363+
aws-ssl-profiles@^1.1.1:
364+
version "1.1.2"
365+
resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
366+
integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==
367+
363368
balanced-match@^1.0.0:
364369
version "1.0.0"
365370
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -383,11 +388,6 @@ bcrypt@^5.0.0:
383388
node-addon-api "^3.0.0"
384389
node-pre-gyp "0.15.0"
385390

386-
bignumber.js@9.0.0:
387-
version "9.0.0"
388-
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075"
389-
integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==
390-
391391
binary-extensions@^2.0.0:
392392
version "2.1.0"
393393
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
@@ -858,6 +858,11 @@ delegates@^1.0.0:
858858
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
859859
integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
860860

861+
denque@^2.1.0:
862+
version "2.1.0"
863+
resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
864+
integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
865+
861866
depd@2.0.0, depd@^2.0.0:
862867
version "2.0.0"
863868
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -1354,6 +1359,13 @@ gauge@~2.7.3:
13541359
strip-ansi "^3.0.1"
13551360
wide-align "^1.1.0"
13561361

1362+
generate-function@^2.3.1:
1363+
version "2.3.1"
1364+
resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
1365+
integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
1366+
dependencies:
1367+
is-property "^1.0.2"
1368+
13571369
get-caller-file@^2.0.1:
13581370
version "2.0.5"
13591371
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -1598,7 +1610,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.4:
15981610
dependencies:
15991611
safer-buffer ">= 2.1.2 < 3"
16001612

1601-
iconv-lite@^0.6.2:
1613+
iconv-lite@^0.6.2, iconv-lite@^0.6.3:
16021614
version "0.6.3"
16031615
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
16041616
integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -1801,6 +1813,11 @@ is-path-inside@^3.0.3:
18011813
resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
18021814
integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
18031815

1816+
is-property@^1.0.2:
1817+
version "1.0.2"
1818+
resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
1819+
integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==
1820+
18041821
is-stream@^2.0.0:
18051822
version "2.0.0"
18061823
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
@@ -2028,6 +2045,11 @@ lodash@^4.17.21:
20282045
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
20292046
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
20302047

2048+
long@^5.2.1:
2049+
version "5.2.3"
2050+
resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
2051+
integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
2052+
20312053
lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
20322054
version "1.0.1"
20332055
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
@@ -2045,6 +2067,16 @@ lru-cache@^6.0.0:
20452067
dependencies:
20462068
yallist "^4.0.0"
20472069

2070+
lru-cache@^7.14.1:
2071+
version "7.18.3"
2072+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
2073+
integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
2074+
2075+
lru-cache@^8.0.0:
2076+
version "8.0.5"
2077+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-8.0.5.tgz#983fe337f3e176667f8e567cfcce7cb064ea214e"
2078+
integrity sha512-MhWWlVnuab1RG5/zMRRcVGXZLCXrZTgfwMikgzCegsPnG62yDQo5JnqKkrK4jO5iKqDAZGItAqN5CtKBCBWRUA==
2079+
20482080
make-dir@^3.0.0, make-dir@^3.1.0:
20492081
version "3.1.0"
20502082
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -2248,15 +2280,27 @@ ms@2.1.3, ms@^2.0.0:
22482280
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
22492281
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
22502282

2251-
mysql@^2.18.1:
2252-
version "2.18.1"
2253-
resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.18.1.tgz#2254143855c5a8c73825e4522baf2ea021766717"
2254-
integrity sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==
2283+
mysql2@^3.11.1:
2284+
version "3.11.1"
2285+
resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.11.1.tgz#edfb856e2176fcf43d2cc066dd4959e9fc76ea85"
2286+
integrity sha512-Oc8Zffd0gpIJnJ/NOMp6IiiJJDdWc7nmWpS+UE3K9feTpYia8XkbgL6EaOJYz52f6+2pAoC0eAQqUzal4lnNGQ==
2287+
dependencies:
2288+
aws-ssl-profiles "^1.1.1"
2289+
denque "^2.1.0"
2290+
generate-function "^2.3.1"
2291+
iconv-lite "^0.6.3"
2292+
long "^5.2.1"
2293+
lru-cache "^8.0.0"
2294+
named-placeholders "^1.1.3"
2295+
seq-queue "^0.0.5"
2296+
sqlstring "^2.3.2"
2297+
2298+
named-placeholders@^1.1.3:
2299+
version "1.1.3"
2300+
resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.3.tgz#df595799a36654da55dda6152ba7a137ad1d9351"
2301+
integrity sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==
22552302
dependencies:
2256-
bignumber.js "9.0.0"
2257-
readable-stream "2.3.7"
2258-
safe-buffer "5.1.2"
2259-
sqlstring "2.3.1"
2303+
lru-cache "^7.14.1"
22602304

22612305
natural-compare@^1.4.0:
22622306
version "1.4.0"
@@ -2777,7 +2821,7 @@ rc@^1.2.7, rc@^1.2.8:
27772821
minimist "^1.2.0"
27782822
strip-json-comments "~2.0.1"
27792823

2780-
readable-stream@2.3.7, readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.0.6:
2824+
readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.0.6:
27812825
version "2.3.7"
27822826
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
27832827
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -2969,6 +3013,11 @@ send@0.18.0:
29693013
range-parser "~1.2.1"
29703014
statuses "2.0.1"
29713015

3016+
seq-queue@^0.0.5:
3017+
version "0.0.5"
3018+
resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
3019+
integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==
3020+
29723021
serve-static@1.15.0:
29733022
version "1.15.0"
29743023
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
@@ -3080,10 +3129,10 @@ sqlite3@5.1.6:
30803129
optionalDependencies:
30813130
node-gyp "8.x"
30823131

3083-
sqlstring@2.3.1:
3084-
version "2.3.1"
3085-
resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40"
3086-
integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=
3132+
sqlstring@^2.3.2:
3133+
version "2.3.3"
3134+
resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c"
3135+
integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==
30873136

30883137
ssri@^8.0.0, ssri@^8.0.1:
30893138
version "8.0.1"

0 commit comments

Comments
 (0)