Commit 0a0756a4 authored by nanahira's avatar nanahira

no more escape

parent 9ef71506
Pipeline #4689 passed with stages
in 8 minutes and 21 seconds
...@@ -266,8 +266,8 @@ class DataManager { ...@@ -266,8 +266,8 @@ class DataManager {
const queryBuilder = repo.createQueryBuilder("duelLog") const queryBuilder = repo.createQueryBuilder("duelLog")
.where("1"); .where("1");
if (roomName != null && roomName.length) { if (roomName != null && roomName.length) {
const escapedRoomName = this.getEscapedString(roomName); //const escapedRoomName = this.getEscapedString(roomName);
queryBuilder.andWhere("duelLog.name = :escapedRoomName", { escapedRoomName }); queryBuilder.andWhere("duelLog.name = :roomName", { roomName });
} }
if (duelCount != null && !isNaN(duelCount)) { if (duelCount != null && !isNaN(duelCount)) {
queryBuilder.andWhere("duelLog.duelCount = :duelCount", { duelCount }); queryBuilder.andWhere("duelLog.duelCount = :duelCount", { duelCount });
...@@ -276,9 +276,9 @@ class DataManager { ...@@ -276,9 +276,9 @@ class DataManager {
let innerQuery = "select id from duel_log_player where duel_log_player.duelLogId = duelLog.id"; let innerQuery = "select id from duel_log_player where duel_log_player.duelLogId = duelLog.id";
const innerQueryParams = {}; const innerQueryParams = {};
if (playerName != null && playerName.length) { if (playerName != null && playerName.length) {
const escapedPlayerName = this.getEscapedString(playerName); //const escapedPlayerName = this.getEscapedString(playerName);
innerQuery += " and duel_log_player.realName = :escapedPlayerName"; innerQuery += " and duel_log_player.realName = :playerName";
innerQueryParams.escapedPlayerName = escapedPlayerName; innerQueryParams.playerName = playerName;
} }
if (playerScore != null && !isNaN(playerScore)) { if (playerScore != null && !isNaN(playerScore)) {
innerQuery += " and duel_log_player.score = :playerScore"; innerQuery += " and duel_log_player.score = :playerScore";
......
...@@ -274,8 +274,8 @@ export class DataManager { ...@@ -274,8 +274,8 @@ export class DataManager {
const queryBuilder = repo.createQueryBuilder("duelLog") const queryBuilder = repo.createQueryBuilder("duelLog")
.where("1"); .where("1");
if(roomName != null && roomName.length) { if(roomName != null && roomName.length) {
const escapedRoomName = this.getEscapedString(roomName); //const escapedRoomName = this.getEscapedString(roomName);
queryBuilder.andWhere("duelLog.name = :escapedRoomName", { escapedRoomName }); queryBuilder.andWhere("duelLog.name = :roomName", { roomName });
} }
if(duelCount != null && !isNaN(duelCount)) { if(duelCount != null && !isNaN(duelCount)) {
queryBuilder.andWhere("duelLog.duelCount = :duelCount", { duelCount }); queryBuilder.andWhere("duelLog.duelCount = :duelCount", { duelCount });
...@@ -284,9 +284,9 @@ export class DataManager { ...@@ -284,9 +284,9 @@ export class DataManager {
let innerQuery = "select id from duel_log_player where duel_log_player.duelLogId = duelLog.id"; let innerQuery = "select id from duel_log_player where duel_log_player.duelLogId = duelLog.id";
const innerQueryParams: any = {}; const innerQueryParams: any = {};
if(playerName != null && playerName.length) { if(playerName != null && playerName.length) {
const escapedPlayerName = this.getEscapedString(playerName); //const escapedPlayerName = this.getEscapedString(playerName);
innerQuery += " and duel_log_player.realName = :escapedPlayerName"; innerQuery += " and duel_log_player.realName = :playerName";
innerQueryParams.escapedPlayerName = escapedPlayerName; innerQueryParams.playerName = playerName;
} }
if(playerScore != null && !isNaN(playerScore)) { if(playerScore != null && !isNaN(playerScore)) {
innerQuery += " and duel_log_player.score = :playerScore"; innerQuery += " and duel_log_player.score = :playerScore";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment