From d8676f7a5d8503ea95d0f97e640b344d829ff60e Mon Sep 17 00:00:00 2001
From: fengmk2 <suqian.yf@antgroup.com>
Date: Sun, 14 Apr 2024 10:59:28 +0800
Subject: [PATCH] feat: use mysql2

https://github.com/cyjake/leoric/pull/419
---
 config/config.default.ts | 2 +-
 package.json             | 4 ++--
 test/TestUtil.ts         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/config.default.ts b/config/config.default.ts
index 7b806f04..cc6729a0 100644
--- a/config/config.default.ts
+++ b/config/config.default.ts
@@ -69,7 +69,7 @@ export default (appInfo: EggAppConfig) => {
   config.dataDir = process.env.CNPMCORE_DATA_DIR || join(appInfo.root, '.cnpmcore');
 
   config.orm = {
-    client: 'mysql',
+    client: 'mysql2',
     database: process.env.CNPMCORE_MYSQL_DATABASE || process.env.MYSQL_DATABASE || 'cnpmcore',
     host: process.env.CNPMCORE_MYSQL_HOST || process.env.MYSQL_HOST || '127.0.0.1',
     port: process.env.CNPMCORE_MYSQL_PORT || process.env.MYSQL_PORT || 3306,
diff --git a/package.json b/package.json
index 1ec96e95..fecfe699 100644
--- a/package.json
+++ b/package.json
@@ -101,10 +101,10 @@
     "eggjs-elasticsearch": "^0.0.6",
     "fs-cnpm": "^2.4.0",
     "ioredis": "^5.3.1",
-    "leoric": "^2.11.5",
+    "leoric": "^2.12.3",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",
-    "mysql": "^2.18.1",
+    "mysql2": "^3.9.4",
     "npm-package-arg": "^10.1.0",
     "oss-cnpm": "^5.0.1",
     "p-map": "^4.0.0",
diff --git a/test/TestUtil.ts b/test/TestUtil.ts
index 1c29c5ec..32ae1870 100644
--- a/test/TestUtil.ts
+++ b/test/TestUtil.ts
@@ -4,7 +4,7 @@ import coffee from 'coffee';
 import { tmpdir } from 'os';
 import { mkdtempSync } from 'fs';
 import { Readable } from 'stream';
-import mysql from 'mysql';
+import mysql from 'mysql2';
 import path from 'path';
 import crypto from 'crypto';
 import { cleanUserPrefix, getScopeAndName } from '../app/common/PackageUtil';