Skip to content

Commit b840d3d

Browse files
committed
use mysql2 instead of mysql to support Mysql8
sidorares/node-mysql2#1021
1 parent 6c15b2c commit b840d3d

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

packages/server/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
"@types/pg": "^7.4.10",
2525
"jest": "^26.0.1",
2626
"log4js": "^6.2.1",
27-
"mysql": "^2.15.0",
27+
"mysql2": "^2.1.0",
2828
"node-ssh-forward": "^0.6.3",
2929
"pg": "^7.4.3",
30+
"sqlint": "^0.9.2",
3031
"sqlite3": "^4.2.0",
3132
"vscode-languageclient": "^6.1.3",
3233
"vscode-languageserver": "^6.1.1",
3334
"vscode-languageserver-textdocument": "^1.0.1",
34-
"yargs": "^12.0.1",
35-
"sqlint": "^0.9.2"
35+
"yargs": "^12.0.1"
3636
},
3737
"devDependencies": {
3838
"@rollup/plugin-commonjs": "^11.1.0",

packages/server/src/ambient.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
declare module 'yargs'
2+
declare module 'mysql2'

packages/server/src/database_libs/MysqlClient.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import * as mysql from 'mysql'
1+
import * as mysql from 'mysql2'
2+
import * as mysqlType from 'mysql'
23
import { Settings } from '../SettingStore'
34
import AbstractClient, { RawField } from './AbstractClient'
45

56
export default class MysqlClient extends AbstractClient {
6-
connection: mysql.Connection | null = null
7+
connection: mysqlType.Connection | null = null
78

89
constructor(settings: Settings) {
910
super(settings)
@@ -47,7 +48,7 @@ export default class MysqlClient extends AbstractClient {
4748
reject(new Error(err.message))
4849
return
4950
}
50-
const tables = results.map((v: any) => v[`table_name`])
51+
const tables = results.map((v: any) => v['table_name'] || v['TABLE_NAME'])
5152
resolve(tables)
5253
})
5354
})

0 commit comments

Comments
 (0)