Skip to content

Commit 83bd561

Browse files
committed
fix(mysql): 修复 mysql 连接器异常的问题
1 parent edaad40 commit 83bd561

8 files changed

Lines changed: 69 additions & 149 deletions

File tree

index.js

100644100755
File mode changed.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,10 @@
6565
"figlet": "^1.7.0",
6666
"mysql2": "^3.14.1",
6767
"nanospinner": "^1.2.2",
68-
"ora": "^8.0.1",
6968
"pg": "^8.16.2"
7069
},
7170
"simple-git-hooks": {
72-
"commit-msg": "npx --no -- commitlint --edit \\$1",
71+
"commit-msg": "npx --no -- commitlint --edit $1",
7372
"pre-commit": "npx pretty-quick --staged"
7473
}
7574
}

pnpm-lock.yaml

Lines changed: 0 additions & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/commands/up.cmd.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,9 @@ export default (program: Command) => {
5353
// 当数据库中不存在 migrations 表时,创建 migrations 表
5454
await dbConnector.db.checkMigrationsTable();
5555

56-
// 检查任务是否已执行
57-
async function checkTaskExecuted(taskName: string) {
58-
return await dbConnector.db.checkTaskExecuted(taskName);
59-
}
60-
6156
async function executeTask(taskName: string) {
62-
if (await checkTaskExecuted(taskName)) {
57+
// 检查任务是否已执行
58+
if (await dbConnector.db.checkTaskExecuted(taskName)) {
6359
return;
6460
}
6561
const sqlContent = readFileSync(join(dir, taskName, 'main.sql'), 'utf-8').trim();
@@ -76,9 +72,11 @@ export default (program: Command) => {
7672
color: 'cyan',
7773
});
7874
}
75+
const promises = [];
7976
for (const taskName of dirs) {
80-
await executeTask(taskName);
77+
promises.push(executeTask(taskName));
8178
}
79+
await Promise.all(promises);
8280
spinner.update({
8381
text: '任务执行完成,断开数据库连接...',
8482
color: 'cyan',

src/commands/update.cmd.ts

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { execSync } from 'child_process';
1+
import { execSync } from 'node:child_process';
22
import { Command } from 'commander';
33
import chalk from 'chalk';
44
import { confirm, select } from '@inquirer/prompts';
55
import { Logger, checkUpdate } from '@/utils';
6-
import { version, name } from '../../package.json';
76

87
/**
98
* @description 检查Compass CLI是否存在新版本内容
@@ -13,15 +12,23 @@ export default (program: Command) => {
1312
.command('update')
1413
.description('检查是否存在新版本CLI')
1514
.action(async () => {
16-
const loading = Logger.createSpinner();
17-
loading.start(chalk.cyan('正在检查版本信息'));
15+
const loading = Logger.createLoading();
16+
loading.start({
17+
text: chalk.cyan('正在检查版本信息'),
18+
});
1819
try {
19-
const latestVersion = await checkUpdate(name, version);
20+
const packageName = '@compass-aiden/migrate-cli';
21+
const currentVersion = execSync('migrate -v', { encoding: 'utf-8' }).trim().replace('v', '');
22+
const latestVersion = await checkUpdate(packageName, currentVersion);
2023
if (!latestVersion) {
21-
Logger.success('当前已是最新版本');
24+
loading.success({
25+
text: chalk.green('当前已是最新版本'),
26+
});
2227
return;
2328
}
24-
loading.warn(chalk.yellow(`发现新版本: ${latestVersion}`));
29+
loading.update({
30+
text: chalk.yellow(`发现新版本: ${latestVersion}`),
31+
});
2532
const isUpdate = await confirm({
2633
message: '是否立即更新',
2734
default: true,
@@ -37,13 +44,18 @@ export default (program: Command) => {
3744
{ name: 'pnpm', value: 'pnpm' },
3845
],
3946
});
40-
const updateLoading = Logger.createSpinner();
41-
updateLoading.start(chalk.cyan('开始更新cli'));
42-
execSync(`${pkgManager} add ${name} -g`, { stdio: 'inherit' });
43-
updateLoading.succeed(chalk.green('更新成功,当前已是最新版本.'));
47+
loading.update({
48+
text: chalk.cyan('开始更新cli'),
49+
});
50+
execSync(`${pkgManager} add ${packageName} -g`, { stdio: 'inherit' });
51+
loading.success({
52+
text: chalk.green('更新成功,当前已是最新版本.'),
53+
});
4454
} catch (err) {
4555
Logger.log(err);
46-
loading.fail(chalk.red('更新失败'));
56+
loading.error({
57+
text: chalk.red('更新失败'),
58+
});
4759
}
4860
});
4961
};

0 commit comments

Comments
 (0)