From 7a180446f8009abee181d0ba7cd34dfcb49fcfbc Mon Sep 17 00:00:00 2001 From: sighphyre Date: Mon, 9 May 2022 12:15:41 +0200 Subject: [PATCH] fix: Upgrade knex to 2.0.0 and patch some stores to correctly order their count queries so they compile --- package.json | 2 +- src/lib/db/feature-toggle-store.ts | 2 +- src/lib/db/project-store.ts | 2 +- src/lib/db/user-store.ts | 2 +- yarn.lock | 55 +++++++++++++++--------------- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 2d44e2ac91..81595b5f82 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "helmet": "^5.0.0", "joi": "^17.3.0", "js-yaml": "^4.1.0", - "knex": "1.0.4", + "knex": "^2.0.0", "json-schema-to-ts": "^2.0.0", "log4js": "^6.0.0", "make-fetch-happen": "^10.1.2", diff --git a/src/lib/db/feature-toggle-store.ts b/src/lib/db/feature-toggle-store.ts index 6fc3fd0485..a24d9ef14d 100644 --- a/src/lib/db/feature-toggle-store.ts +++ b/src/lib/db/feature-toggle-store.ts @@ -58,8 +58,8 @@ export default class FeatureToggleStore implements IFeatureToggleStore { } = { archived: false }, ): Promise { return this.db - .count('*') .from(TABLE) + .count('*') .where(query) .then((res) => Number(res[0].count)); } diff --git a/src/lib/db/project-store.ts b/src/lib/db/project-store.ts index 8b10a12ad1..b2d962ed99 100644 --- a/src/lib/db/project-store.ts +++ b/src/lib/db/project-store.ts @@ -260,8 +260,8 @@ class ProjectStore implements IProjectStore { async count(): Promise { return this.db - .count('*') .from(TABLE) + .count('*') .then((res) => Number(res[0].count)); } diff --git a/src/lib/db/user-store.ts b/src/lib/db/user-store.ts index ea36ad0ebf..65ff92087e 100644 --- a/src/lib/db/user-store.ts +++ b/src/lib/db/user-store.ts @@ -178,8 +178,8 @@ class UserStore implements IUserStore { async count(): Promise { return this.db - .count('*') .from(TABLE) + .count('*') .then((res) => Number(res[0].count)); } diff --git a/yarn.lock b/yarn.lock index 8472ae7b69..e3fa52ca4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1897,6 +1897,11 @@ commander@^8.3.0: resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.1.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.2.0.tgz#6e21014b2ed90d8b7c9647230d8b7a94a4a419a9" + integrity sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w== + component-emitter@^1.2.1, component-emitter@^1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz" @@ -2197,9 +2202,9 @@ debug@3.2.6: dependencies: ms "^2.1.1" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" @@ -2211,13 +2216,6 @@ debug@4.3.1: dependencies: ms "2.1.2" -debug@4.3.3: - version "4.3.3" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== - dependencies: - ms "2.1.2" - debug@^3.2.7: version "3.2.7" resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" @@ -4739,25 +4737,6 @@ kleur@^3.0.3: resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -knex@1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/knex/-/knex-1.0.4.tgz" - integrity sha512-cMQ81fpkVmr4ia20BtyrD3oPere/ir/Q6IGLAgcREKOzRVhMsasQ4nx1VQuDRJjqq6oK5kfcxmvWoYkHKrnuMA== - dependencies: - colorette "2.0.16" - commander "^8.3.0" - debug "4.3.3" - escalade "^3.1.1" - esm "^3.2.25" - 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@^0.21.5: version "0.21.21" resolved "https://registry.npmjs.org/knex/-/knex-0.21.21.tgz" @@ -4776,6 +4755,26 @@ knex@^0.21.5: tildify "2.0.0" v8flags "^3.2.0" +knex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/knex/-/knex-2.0.0.tgz#84296ced7ef27e0f3b954302ac7d9da67c28b5d3" + integrity sha512-LchC8/GLfreMz8d4kCwh/ymXttsoJG8zO1O0AJBjnxdyr2oT/k2ik77hP1PpZkZH9mDQrq6WsQcIu18Pnqppzg== + dependencies: + colorette "2.0.16" + 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" + lazy-cache@^0.2.3: version "0.2.7" resolved "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"