From 2f5ed3aead97641f2c80d692a50226839016df0b Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Thu, 10 Apr 2025 10:24:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=87=E7=BA=A7mysql=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E6=94=AF=E6=8C=81mysql8=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui/certd-server/.env.dev-mysql.yaml | 2 +- packages/ui/certd-server/package.json | 2 +- .../sys/authority/service/role-service.ts | 3 +- pnpm-lock.yaml | 199 +++++++++++------- 4 files changed, 122 insertions(+), 84 deletions(-) diff --git a/packages/ui/certd-server/.env.dev-mysql.yaml b/packages/ui/certd-server/.env.dev-mysql.yaml index 69d1d9f7..f5442116 100644 --- a/packages/ui/certd-server/.env.dev-mysql.yaml +++ b/packages/ui/certd-server/.env.dev-mysql.yaml @@ -6,7 +6,7 @@ typeorm: default: type: mysql # mariadb host: localhost - port: 3306 + port: 3309 username: root password: root database: certd diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 99d908f0..8c484f6e 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -93,7 +93,7 @@ "mitt": "^3.0.1", "mwts": "^1.3.0", "mwtsc": "^1.15.1", - "mysql": "^2.18.1", + "mysql2": "^3.14.0", "nanoid": "^5.0.7", "node-forge": "^1.3.1", "nodemailer": "^6.9.16", diff --git a/packages/ui/certd-server/src/modules/sys/authority/service/role-service.ts b/packages/ui/certd-server/src/modules/sys/authority/service/role-service.ts index e7f78dbc..5e3cfb59 100644 --- a/packages/ui/certd-server/src/modules/sys/authority/service/role-service.ts +++ b/packages/ui/certd-server/src/modules/sys/authority/service/role-service.ts @@ -43,7 +43,7 @@ export class RoleService extends BaseService { async getByUserIds(ids: any) { return await this.userRoleService.find({ where: { - userId: In(ids), + userId: In(ids) as any, }, }); } @@ -131,6 +131,7 @@ export class RoleService extends BaseService { async delete(id: any) { const idArr = this.resolveIdArr(id); + //@ts-ignore const urs = await this.userRoleService.find({ where: { roleId: In(idArr) } }); if (urs.length > 0) { throw new Error('该角色已被用户使用,无法删除'); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 524a73b4..e81e2ac3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,7 +46,7 @@ importers: packages/core/acme-client: dependencies: '@certd/basic': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../basic '@peculiar/x509': specifier: ^1.11.0 @@ -204,10 +204,10 @@ importers: packages/core/pipeline: dependencies: '@certd/basic': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../basic '@certd/plus-core': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../pro/plus-core dayjs: specifier: ^1.11.7 @@ -412,7 +412,7 @@ importers: packages/libs/lib-k8s: dependencies: '@certd/basic': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/basic '@kubernetes/client-node': specifier: 0.21.0 @@ -452,16 +452,16 @@ importers: packages/libs/lib-server: dependencies: '@certd/acme-client': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/pipeline '@certd/plus-core': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../pro/plus-core '@midwayjs/cache': specifier: ~3.14.0 @@ -507,7 +507,7 @@ importers: version: 1.15.1 typeorm: specifier: ^0.3.20 - version: 0.3.21(better-sqlite3@11.8.1)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)) + version: 0.3.21(better-sqlite3@11.8.1)(mysql2@3.14.0)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)) devDependencies: '@types/chai': specifier: ^4.3.3 @@ -596,7 +596,7 @@ importers: version: 2.8.1 typeorm: specifier: ^0.3.11 - version: 0.3.21(better-sqlite3@11.8.1)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)) + version: 0.3.21(better-sqlite3@11.8.1)(mysql2@3.14.0)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)) typescript: specifier: ^5.4.2 version: 5.8.2 @@ -604,16 +604,16 @@ importers: packages/plugins/plugin-cert: dependencies: '@certd/acme-client': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/pipeline '@certd/plugin-lib': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../plugin-lib '@google-cloud/publicca': specifier: ^1.3.0 @@ -680,10 +680,10 @@ importers: specifier: ^1.7.10 version: 1.8.0 '@certd/basic': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/basic '@certd/pipeline': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/pipeline '@kubernetes/client-node': specifier: 0.21.0 @@ -771,19 +771,19 @@ importers: packages/pro/commercial-core: dependencies: '@certd/basic': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/basic '@certd/lib-server': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../libs/lib-server '@certd/pipeline': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/pipeline '@certd/plugin-plus': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../plugin-plus '@certd/plus-core': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../plus-core '@midwayjs/core': specifier: ~3.20.3 @@ -805,7 +805,7 @@ importers: version: 1.11.13 typeorm: specifier: ^0.3.20 - version: 0.3.21(better-sqlite3@11.8.1)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)) + version: 0.3.21(better-sqlite3@11.8.1)(mysql2@3.14.0)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)) wechatpay-node-v3: specifier: ^2.2.1 version: 2.2.1 @@ -868,22 +868,22 @@ importers: specifier: ^1.0.2 version: 1.0.2 '@certd/basic': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/basic '@certd/lib-k8s': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../libs/lib-k8s '@certd/pipeline': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/pipeline '@certd/plugin-cert': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../plugins/plugin-cert '@certd/plugin-lib': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../plugins/plugin-lib '@certd/plus-core': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../plus-core ali-oss: specifier: ^6.21.0 @@ -980,7 +980,7 @@ importers: packages/pro/plus-core: dependencies: '@certd/basic': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/basic dayjs: specifier: ^1.11.7 @@ -1255,10 +1255,10 @@ importers: version: 0.1.3(zod@3.24.2) devDependencies: '@certd/lib-iframe': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../libs/lib-iframe '@certd/pipeline': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/pipeline '@rollup/plugin-commonjs': specifier: ^25.0.7 @@ -1438,43 +1438,43 @@ importers: specifier: ^3.705.0 version: 3.758.0(aws-crt@1.25.3) '@certd/acme-client': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/acme-client '@certd/basic': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/basic '@certd/commercial-core': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../pro/commercial-core '@certd/jdcloud': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../libs/lib-jdcloud '@certd/lib-huawei': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../libs/lib-huawei '@certd/lib-k8s': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../libs/lib-k8s '@certd/lib-server': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../libs/lib-server '@certd/midway-flyway-js': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../libs/midway-flyway-js '@certd/pipeline': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../core/pipeline '@certd/plugin-cert': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../plugins/plugin-cert '@certd/plugin-lib': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../plugins/plugin-lib '@certd/plugin-plus': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../pro/plugin-plus '@certd/plus-core': - specifier: ^1.31.10 + specifier: ^1.32.0 version: link:../../pro/plus-core '@corsinvest/cv4pve-api-javascript': specifier: ^8.3.0 @@ -1602,9 +1602,9 @@ importers: mwtsc: specifier: ^1.15.1 version: 1.15.1 - mysql: - specifier: ^2.18.1 - version: 2.18.1 + mysql2: + specifier: ^3.14.0 + version: 3.14.0 nanoid: specifier: ^5.0.7 version: 5.1.3 @@ -1652,7 +1652,7 @@ importers: version: 4.0.1045(encoding@0.1.13) typeorm: specifier: ^0.3.20 - version: 0.3.21(better-sqlite3@11.8.1)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)) + version: 0.3.21(better-sqlite3@11.8.1)(mysql2@3.14.0)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)) uuid: specifier: ^10.0.0 version: 10.0.0 @@ -5467,6 +5467,10 @@ packages: aws-sign2@0.7.0: resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==} + aws-ssl-profiles@1.1.2: + resolution: {integrity: sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==} + engines: {node: '>= 6.0.0'} + aws4@1.13.2: resolution: {integrity: sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==} @@ -5705,9 +5709,6 @@ packages: better-sqlite3@11.8.1: resolution: {integrity: sha512-9BxNaBkblMjhJW8sMRZxnxVTRgbRmssZW0Oxc1MPBTfiR+WW21e2Mk4qu8CzrcZb1LwPCnFsfDEzq+SNcBU8eg==} - bignumber.js@9.0.0: - resolution: {integrity: sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==} - bignumber.js@9.1.2: resolution: {integrity: sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==} @@ -6736,6 +6737,10 @@ packages: delegates@1.0.0: resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} + denque@2.1.0: + resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==} + engines: {node: '>=0.10'} + depd@1.1.2: resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} engines: {node: '>= 0.6'} @@ -7630,6 +7635,9 @@ packages: resolution: {integrity: sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==} engines: {node: '>=14'} + generate-function@2.3.1: + resolution: {integrity: sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==} + gensync@1.0.0-beta.2: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} @@ -8385,6 +8393,9 @@ packages: resolution: {integrity: sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==} engines: {node: '>=0.10.0'} + is-property@1.0.2: + resolution: {integrity: sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==} + is-reference@1.2.1: resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==} @@ -9068,6 +9079,14 @@ packages: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} + lru-cache@7.18.3: + resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==} + engines: {node: '>=12'} + + lru.min@1.1.2: + resolution: {integrity: sha512-Nv9KddBcQSlQopmBHXSsZVY5xsdlZkdH/Iey0BlcBYggMd4two7cZnKOK9vmy3nY0O5RGH99z1PCeTpPqszUYg==} + engines: {bun: '>=1.0.0', deno: '>=1.30.0', node: '>=8.0.0'} + lucide-vue-next@0.477.0: resolution: {integrity: sha512-C7azIKO7aJKf5MD7OIzV7NRDtnjXH3KSXfyJgGqRIMemuMzW/9esuMxDXIXDhBZcJgRtXMUN0FcJwOJZQ8SywA==} peerDependencies: @@ -9483,13 +9502,17 @@ packages: resolution: {integrity: sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg==} engines: {node: '>=12.0.0'} - mysql@2.18.1: - resolution: {integrity: sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==} - engines: {node: '>= 0.6'} + mysql2@3.14.0: + resolution: {integrity: sha512-8eMhmG6gt/hRkU1G+8KlGOdQi2w+CgtNoD1ksXZq9gQfkfDsX4LHaBwTe1SY0Imx//t2iZA03DFnyYKPinxSRw==} + engines: {node: '>= 8.0'} mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} + named-placeholders@1.1.3: + resolution: {integrity: sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==} + engines: {node: '>=12.0.0'} + namespace-emitter@2.0.1: resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==} @@ -10886,9 +10909,6 @@ packages: readable-stream@1.0.34: resolution: {integrity: sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==} - readable-stream@2.3.7: - resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==} - readable-stream@2.3.8: resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==} @@ -11251,6 +11271,9 @@ packages: engines: {node: '>=10'} hasBin: true + seq-queue@0.0.5: + resolution: {integrity: sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==} + serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} @@ -11534,8 +11557,8 @@ packages: resolution: {integrity: sha512-+fLpbAbWkQ+d0JEchJT/NrRRXbYRNbG15gFpANx73EwxQB1PRjj+k/OI0GTU0J63g8ikGkJECQp9z8XEJZvPRw==} engines: {node: '>=14'} - sqlstring@2.3.1: - resolution: {integrity: sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ==} + sqlstring@2.3.3: + resolution: {integrity: sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==} engines: {node: '>= 0.6'} sse-decoder@1.0.0: @@ -18287,6 +18310,8 @@ snapshots: aws-sign2@0.7.0: {} + aws-ssl-profiles@1.1.2: {} + aws4@1.13.2: {} axios-mock-adapter@1.22.0(axios@1.8.2): @@ -18827,8 +18852,6 @@ snapshots: bindings: 1.5.0 prebuild-install: 7.1.3 - bignumber.js@9.0.0: {} - bignumber.js@9.1.2: {} bin-links@4.0.4: @@ -19968,6 +19991,8 @@ snapshots: delegates@1.0.0: {} + denque@2.1.0: {} + depd@1.1.2: {} depd@2.0.0: {} @@ -20542,13 +20567,13 @@ snapshots: resolve: 1.22.10 semver: 6.3.1 - eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8): + eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8): dependencies: eslint: 7.32.0 prettier: 2.8.8 prettier-linter-helpers: 1.0.0 optionalDependencies: - eslint-config-prettier: 8.10.0(eslint@8.57.0) + eslint-config-prettier: 8.10.0(eslint@7.32.0) eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8): dependencies: @@ -21160,6 +21185,10 @@ snapshots: - encoding - supports-color + generate-function@2.3.1: + dependencies: + is-property: 1.0.2 + gensync@1.0.0-beta.2: {} get-caller-file@2.0.5: {} @@ -21978,6 +22007,8 @@ snapshots: is-primitive@2.0.0: optional: true + is-property@1.0.2: {} + is-reference@1.2.1: dependencies: '@types/estree': 1.0.6 @@ -22734,6 +22765,10 @@ snapshots: dependencies: yallist: 4.0.0 + lru-cache@7.18.3: {} + + lru.min@1.1.2: {} + lucide-vue-next@0.477.0(vue@3.5.13(typescript@5.8.2)): dependencies: vue: 3.5.13(typescript@5.8.2) @@ -23219,7 +23254,7 @@ snapshots: eslint: 7.32.0 eslint-config-prettier: 8.10.0(eslint@7.32.0) eslint-plugin-node: 11.1.0(eslint@7.32.0) - eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8) + eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8) execa: 5.1.1 inquirer: 7.3.3 json5: 2.2.3 @@ -23245,12 +23280,17 @@ snapshots: mylas@2.1.13: {} - mysql@2.18.1: + mysql2@3.14.0: dependencies: - bignumber.js: 9.0.0 - readable-stream: 2.3.7 - safe-buffer: 5.1.2 - sqlstring: 2.3.1 + aws-ssl-profiles: 1.1.2 + denque: 2.1.0 + generate-function: 2.3.1 + iconv-lite: 0.6.3 + long: 5.3.1 + lru.min: 1.1.2 + named-placeholders: 1.1.3 + seq-queue: 0.0.5 + sqlstring: 2.3.3 mz@2.7.0: dependencies: @@ -23258,6 +23298,10 @@ snapshots: object-assign: 4.1.1 thenify-all: 1.6.0 + named-placeholders@1.1.3: + dependencies: + lru-cache: 7.18.3 + namespace-emitter@2.0.1: {} nan@2.22.2: @@ -24768,16 +24812,6 @@ snapshots: isarray: 0.0.1 string_decoder: 0.10.31 - readable-stream@2.3.7: - dependencies: - core-util-is: 1.0.3 - inherits: 2.0.4 - isarray: 1.0.0 - process-nextick-args: 2.0.1 - safe-buffer: 5.1.2 - string_decoder: 1.1.1 - util-deprecate: 1.0.2 - readable-stream@2.3.8: dependencies: core-util-is: 1.0.3 @@ -25192,6 +25226,8 @@ snapshots: semver@7.7.1: {} + seq-queue@0.0.5: {} + serialize-javascript@6.0.2: dependencies: randombytes: 2.1.0 @@ -25523,7 +25559,7 @@ snapshots: sql-highlight@6.0.0: {} - sqlstring@2.3.1: {} + sqlstring@2.3.3: {} sse-decoder@1.0.0: {} @@ -26336,7 +26372,7 @@ snapshots: typedarray@0.0.6: {} - typeorm@0.3.21(better-sqlite3@11.8.1)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)): + typeorm@0.3.21(better-sqlite3@11.8.1)(mysql2@3.14.0)(pg@8.13.3)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.80)(typescript@5.8.2)): dependencies: '@sqltools/formatter': 1.2.5 ansis: 3.17.0 @@ -26354,6 +26390,7 @@ snapshots: yargs: 17.7.2 optionalDependencies: better-sqlite3: 11.8.1 + mysql2: 3.14.0 pg: 8.13.3 ts-node: 10.9.2(@types/node@18.19.80)(typescript@5.8.2) transitivePeerDependencies: