yrtria/azerothcore-armory
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Activity Actions

fix(Armory): fix charset sql request

Browse source
This commit is contained in:
Axel Cocat 2022-03-16 23:46:32 +01:00
parent b8de1cbc8b
commit 4af6e7e8d0
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "azerothcore-armory", "name": "azerothcore-armory",
"version": "0.13.0", "version": "0.13.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "azerothcore-armory", "name": "azerothcore-armory",
"version": "0.13.0", "version": "0.13.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@supercharge/promise-pool": "^2.1.0", "@supercharge/promise-pool": "^2.1.0",

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "azerothcore-armory", "name": "azerothcore-armory",
"version": "0.13.0", "version": "0.13.1",
"description": "", "description": "",
"scripts": { "scripts": {
"build": "tsc -p tsconfig.json", "build": "tsc -p tsconfig.json",

4
src/armory/Armory.ts
View file

@ -207,7 +207,7 @@ export class Armory {
if (!(realm in this.charsetCache)) { if (!(realm in this.charsetCache)) {
const [rows, fields] = await db.query({ const [rows, fields] = await db.query({
sql: ` sql: `
SELECT CCSA.character_set_name FROM information_schema.\`TABLES\` T, SELECT CCSA.character_set_name AS charset FROM information_schema.\`TABLES\` T,
information_schema.\`COLLATION_CHARACTER_SET_APPLICABILITY\` CCSA information_schema.\`COLLATION_CHARACTER_SET_APPLICABILITY\` CCSA
WHERE CCSA.collation_name = T.table_collation WHERE CCSA.collation_name = T.table_collation
AND T.table_schema = "${(await db.getConnection()).config.database}" AND T.table_schema = "${(await db.getConnection()).config.database}"
@ -215,7 +215,7 @@ export class Armory {
`, `,
timeout: this.config.dbQueryTimeout, timeout: this.config.dbQueryTimeout,
}); });
this.charsetCache[realm] = rows[0].character_set_name; this.charsetCache[realm] = rows[0].charset;
} }
return this.charsetCache[realm]; return this.charsetCache[realm];
} }