From 9b38bd95091fd5da6950b330919d93c31d8d5582 Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Thu, 12 Jan 2023 10:46:09 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20ECONNRESET=20error=20whe?= =?UTF-8?q?n=20connecting=20to=20Azure=20MySQL=20DB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes https://github.com/TryGhost/Ghost/issues/14990 - there was a bug in `mysql2` [1] when connecting to Azure DBs, but this was subsequently fixed, so this commit bumps the package in Ghost and `knex-migrator`, where this was also bumped - of note, this release includes https://github.com/sidorares/node-mysql2/pull/1666 and https://github.com/sidorares/node-mysql2/pull/1751, which are very interesting [1]: https://github.com/sidorares/node-mysql2/pull/1438 --- ghost/core/package.json | 4 +- yarn.lock | 83 ++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 48 deletions(-) diff --git a/ghost/core/package.json b/ghost/core/package.json index f7d9362ea0..e4e04fde7a 100644 --- a/ghost/core/package.json +++ b/ghost/core/package.json @@ -175,13 +175,13 @@ "juice": "8.1.0", "keypair": "1.0.4", "knex": "2.4.0", - "knex-migrator": "5.1.0", + "knex-migrator": "5.1.1", "lodash": "4.17.21", "luxon": "3.2.1", "moment": "2.24.0", "moment-timezone": "0.5.23", "multer": "1.4.4", - "mysql2": "2.3.3", + "mysql2": "3.0.0", "nconf": "0.12.0", "node-jose": "2.1.1", "oembed-parser": "1.4.9", diff --git a/yarn.lock b/yarn.lock index 4b649be6ab..80e2a38bae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10435,7 +10435,7 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== -denque@^2.0.1: +denque@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1" integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw== @@ -12650,6 +12650,11 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" +eslint-config-prettier@^8.5.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz#dec1d29ab728f4fa63061774e1672ac4e363d207" + integrity sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA== + eslint-config-react-app@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz#73ba3929978001c5c86274c017ea57eb5fa644b4" @@ -17521,10 +17526,10 @@ klona@^2.0.4, klona@^2.0.5: resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== -knex-migrator@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/knex-migrator/-/knex-migrator-5.1.0.tgz#5bbb3c171379a8845eab4744b4d248200dccf6c4" - integrity sha512-+/2Ny/MwobwpD/2jnZlNwDswn2+0i+Wx/RKTlrA3YZr30KDz+9XyM0r5SPXcMfbeD7zXw7RVUIsGUcUrT05Mzg== +knex-migrator@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/knex-migrator/-/knex-migrator-5.1.1.tgz#562c9809d148ca31c79f6fe84af1d2054c714e75" + integrity sha512-6zQ2Drp2ZjwSo8YnPs8tg2Yi6sZa+WK7a2dVnS2Xu/Li8J7m3Zn5GGEe/QmtfqZBXDa6cFqKMeffEu+WKPdEvA== dependencies: "@tryghost/database-info" "0.3.14" "@tryghost/errors" "1.2.20" @@ -17533,35 +17538,15 @@ knex-migrator@5.1.0: commander "5.1.0" compare-ver "2.0.2" debug "4.3.4" - knex "2.3.0" + knex "2.4.0" lodash "4.17.21" moment "2.24.0" - mysql2 "2.3.3" + mysql2 "3.0.0" nconf "0.12.0" resolve "1.22.1" optionalDependencies: sqlite3 "5.1.4" -knex@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/knex/-/knex-2.3.0.tgz#87fa2a9553d7cafb125d7a0645256fbe29ef5967" - integrity sha512-WMizPaq9wRMkfnwKXKXgBZeZFOSHGdtoSz5SaLAVNs3WRDfawt9O89T4XyH52PETxjV8/kRk0Yf+8WBEP/zbYw== - dependencies: - colorette "2.0.19" - commander "^9.1.0" - debug "4.3.4" - escalade "^3.1.1" - esm "^3.2.25" - get-package-type "^0.1.0" - getopts "2.3.0" - interpret "^2.2.0" - lodash "^4.17.21" - pg-connection-string "2.5.0" - rechoir "^0.8.0" - resolve-from "^5.0.0" - tarn "^3.0.2" - tildify "2.0.0" - knex@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/knex/-/knex-2.4.0.tgz#7d33cc36f320cdac98741010544b4c6a98b8b19e" @@ -18327,16 +18312,16 @@ long-timeout@^0.1.1, long-timeout@~0.1.1: resolved "https://registry.yarnpkg.com/long-timeout/-/long-timeout-0.1.1.tgz#9721d788b47e0bcb5a24c2e2bee1a0da55dab514" integrity sha512-BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w== -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - long@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/long/-/long-5.2.0.tgz#2696dadf4b4da2ce3f6f6b89186085d94d52fd61" integrity sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w== +long@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/long/-/long-5.2.1.tgz#e27595d0083d103d2fa2c20c7699f8e0c92b897f" + integrity sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A== + longest-streak@^2.0.1: version "2.0.4" resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4" @@ -18378,7 +18363,7 @@ lru-cache@2: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" integrity sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ== -lru-cache@^4.1.3, lru-cache@^4.1.5: +lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -18400,6 +18385,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.14.1: + version "7.14.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea" + integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA== + lru-cache@^7.7.1: version "7.14.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f" @@ -19431,17 +19421,18 @@ mv@~2: ncp "~2.0.0" rimraf "~2.4.0" -mysql2@2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.3.tgz#944f3deca4b16629052ff8614fbf89d5552545a0" - integrity sha512-wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA== +mysql2@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.0.0.tgz#aa454d15404c721499e9eee89b62c8b3f5e51b45" + integrity sha512-/bWuj8j7bZOPyMPy5qra/44bIlYqE+o/qc80SIvKuvxYl/gSJpgqHVkvQziZvfy9o6i9l7mMQaVUNYXfnUtCOQ== dependencies: - denque "^2.0.1" + denque "^2.1.0" + eslint-config-prettier "^8.5.0" generate-function "^2.3.1" iconv-lite "^0.6.3" - long "^4.0.0" - lru-cache "^6.0.0" - named-placeholders "^1.1.2" + long "^5.2.1" + lru-cache "^7.14.1" + named-placeholders "^1.1.3" seq-queue "^0.0.5" sqlstring "^2.3.2" @@ -19454,12 +19445,12 @@ najax@^1.0.7: lodash "^4.17.21" qs "^6.2.0" -named-placeholders@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz#ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8" - integrity sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA== +named-placeholders@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.3.tgz#df595799a36654da55dda6152ba7a137ad1d9351" + integrity sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w== dependencies: - lru-cache "^4.1.3" + lru-cache "^7.14.1" nan@^2.12.1, nan@^2.14.0, nan@^2.17.0: version "2.17.0"