Skip to content

Commit 53c93c7

Browse files
authored
Update mariadb (sqlpad#1253)
* update mariadb * set TZ * remove timezone from mariadb connection string * Update DEPENDENCIES.md
1 parent 43f7939 commit 53c93c7

4 files changed

Lines changed: 26 additions & 18 deletions

File tree

.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: test
22

33
on: [push, pull_request]
44

5+
env:
6+
TZ: utc
7+
58
jobs:
69
build:
710
runs-on: ubuntu-latest

DEPENDENCIES.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ yarn outdated
1515
- `@clickhouse/client` - 1.x is major breaking and needs thorough update/testing.
1616
- `eslint` / `eslint-config-prettier` - airbnb preset doesn't have 9 listed as supported yet.
1717
- `ldapjs` - 3.x brings a [lot of changes and risk of breakage](https://github.com/ldapjs/node-ldapjs/releases/tag/v3.0.0).
18-
- `mariadb` - 3.0.2 works with sequelize. 3.1.0+ doesn't due to [timezone settings changes](https://github.com/mariadb-corporation/mariadb-connector-nodejs/blob/master/CHANGELOG.md#310-feb-2023) and needs a change in config & validation times are working as expected.
1918
- `prettier` - 3.x brings some formatting changes. Avoiding unnecessary noise for the forks out there.
2019
- `sql-formatter` - 3.x onward has performance regressions, changes in functionality.
2120
- `umzug` - 3.x has many (unnecessary) breaking changes and additional dependencies.

server/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"test": "mocha test --timeout 20000 --recursive --exit --bail",
3636
"testmssql": "env SQLPAD_BACKEND_DB_URI='mssql://sa:SuperP4ssw0rd!@localhost:1433/dbname' npm run test",
3737
"testmysql": "env SQLPAD_BACKEND_DB_URI='mysql://root:root@localhost:23306/db2' npm run test",
38-
"testmariadb": "env SQLPAD_BACKEND_DB_URI='mariadb://root:password@localhost:13306/db?timezone=Etc%2FGMT0&autoJsonMap=false' npm run test",
38+
"testmariadb": "env SQLPAD_BACKEND_DB_URI='mariadb://root:password@localhost:13306/db?autoJsonMap=false' npm run test",
3939
"testpostgres": "env SQLPAD_BACKEND_DB_URI='postgres://sqlpad:sqlpad@localhost:5432/sqlpad' npm run test",
4040
"fixlint": "eslint --fix \"**/*.js\" && prettier --write .",
4141
"lint": "eslint \"**/*.js\" && prettier --check ."
@@ -65,7 +65,7 @@
6565
"ldapjs": "^2.3.2",
6666
"lodash": "^4.17.20",
6767
"lru-cache": "^11.0.0",
68-
"mariadb": "3.0.2",
68+
"mariadb": "^3.3.1",
6969
"memorystore": "^1.6.7",
7070
"minimist": "^1.2.6",
7171
"mkdirp": "^3.0.1",

server/yarn.lock

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@
477477
"@types/qs" "*"
478478
"@types/serve-static" "*"
479479

480-
"@types/geojson@^7946.0.10":
480+
"@types/geojson@^7946.0.14":
481481
version "7946.0.14"
482482
resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
483483
integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
@@ -523,10 +523,12 @@
523523
dependencies:
524524
undici-types "~6.19.2"
525525

526-
"@types/node@^17.0.45":
527-
version "17.0.45"
528-
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
529-
integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
526+
"@types/node@^20.11.17":
527+
version "20.16.1"
528+
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.1.tgz#0b44b15271d0e2191ca68faf1fbe506e06aed732"
529+
integrity sha512-zJDo7wEadFtSyNz5QITDfRcrhqDvQI1xQNQ0VoizPjM/dVAODqqIUWbJPkvsxmTI0MYRGRikcdjMPhOssnPejQ==
530+
dependencies:
531+
undici-types "~6.19.2"
530532

531533
"@types/passport-strategy@^0.2.38":
532534
version "0.2.38"
@@ -3124,6 +3126,11 @@ long@*, long@^5.2.1, long@~5.2.3:
31243126
resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
31253127
integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
31263128

3129+
lru-cache@^10.2.0:
3130+
version "10.4.3"
3131+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
3132+
integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
3133+
31273134
lru-cache@^11.0.0:
31283135
version "11.0.0"
31293136
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.0.0.tgz#15d93a196f189034d7166caf9fe55e7384c98a21"
@@ -3144,7 +3151,7 @@ lru-cache@^6.0.0:
31443151
dependencies:
31453152
yallist "^4.0.0"
31463153

3147-
lru-cache@^7.10.1, lru-cache@^7.14.0, lru-cache@^7.14.1:
3154+
lru-cache@^7.10.1, lru-cache@^7.14.1:
31483155
version "7.18.3"
31493156
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
31503157
integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
@@ -3183,17 +3190,16 @@ make-fetch-happen@^9.1.0:
31833190
socks-proxy-agent "^6.0.0"
31843191
ssri "^8.0.0"
31853192

3186-
mariadb@3.0.2:
3187-
version "3.0.2"
3188-
resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.0.2.tgz#427ae286b8fb35f4046b3457f4df729a5019d6c3"
3189-
integrity sha512-dVjiQZ6RW0IXFnX+T/ZEmnqs724DgkQsXqfCyInXn0XxVfO2Px6KbS4M3Ny6UiBg0zJ93SHHvfVBgYO4ZnFvvw==
3193+
mariadb@^3.3.1:
3194+
version "3.3.1"
3195+
resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.3.1.tgz#3ee361242411ba4cf4a80b06e304d1c68c97ad90"
3196+
integrity sha512-L8bh4iuZU3J8H7Co7rQ6OY9FDLItAN1rGy8kPA7Dyxo8AiHADuuONoypKKp1pE09drs6e5LR7UW9luLZ/A4znA==
31903197
dependencies:
3191-
"@types/geojson" "^7946.0.10"
3192-
"@types/node" "^17.0.45"
3198+
"@types/geojson" "^7946.0.14"
3199+
"@types/node" "^20.11.17"
31933200
denque "^2.1.0"
31943201
iconv-lite "^0.6.3"
3195-
lru-cache "^7.14.0"
3196-
moment-timezone "^0.5.38"
3202+
lru-cache "^10.2.0"
31973203

31983204
31993205
version "0.3.0"
@@ -3386,7 +3392,7 @@ mocha@^10.0.0:
33863392
yargs-parser "^20.2.9"
33873393
yargs-unparser "^2.0.0"
33883394

3389-
moment-timezone@^0.5.38, moment-timezone@^0.5.43:
3395+
moment-timezone@^0.5.43:
33903396
version "0.5.45"
33913397
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
33923398
integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==

0 commit comments

Comments
 (0)