hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new db query string utils

Browse Source
This commit is contained in:
Vortrex
2021-08-11 09:39:41 -05:00
parent 066c60bcae
commit 9a2ff52d45
4 changed files with 270 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
scripts/server/house.js
View File

@@ -435,43 +435,46 @@ function saveHouseToDatabase(houseId) {
let dbConnection = connectToDatabase();
if(dbConnection) {
let safeHouseDescription = escapeDatabaseString(dbConnection, tempHouseData.description);
if(tempHouseData.databaseId == 0) {
let dbQueryString = `INSERT INTO house_main (house_server, house_description, house_owner_type, house_owner_id, house_locked, house_entrance_pos_x, house_entrance_pos_y, house_entrance_pos_z, house_entrance_rot_z, house_entrance_int, house_entrance_vw, house_exit_pos_x, house_exit_pos_y, house_exit_pos_z, house_exit_rot_z, house_exit_int, house_exit_vw, house_has_interior) VALUES (${getServerId()}, '${safeHouseDescription}', ${tempHouseData.ownerType}, ${tempHouseData.ownerId}, ${boolToInt(tempHouseData.locked)}, ${tempHouseData.entrancePosition.x}, ${tempHouseData.entrancePosition.y}, ${tempHouseData.entrancePosition.z}, ${tempHouseData.entranceRotation}, ${tempHouseData.entranceInterior}, ${tempHouseData.entranceDimension}, ${tempHouseData.exitPosition.x}, ${tempHouseData.exitPosition.y}, ${tempHouseData.exitPosition.z}, ${tempHouseData.exitRotation}, ${tempHouseData.exitInterior}, ${tempHouseData.exitDimension}, ${boolToInt(tempHouseData.hasInterior)})`;
queryDatabase(dbConnection, dbQueryString);
let data = [
["house_server", getServerId()],
["house_description", safeHouseDescription],
["house_owner_type", tempHouseData.ownerType],
["house_owner_id", tempHouseData.ownerId],
["house_locked", boolToInt(tempHouseData.locked)],
["house_entrance_fee", tempHouseData.entranceFee],
["house_entrance_pos_x", tempHouseData.entrancePosition.x],
["house_entrance_pos_y", tempHouseData.entrancePosition.x],
["house_entrance_pos_z", tempHouseData.entrancePosition.z],
["house_entrance_rot_z", tempHouseData.entranceRotation],
["house_entrance_int", tempHouseData.entranceInterior],
["house_entrance_vw", tempHouseData.entranceDimension],
["house_entrance_pickup", tempHouseData.entrancePickupModel],
["house_entrance_blip", tempHouseData.entranceBlipModel],
["house_exit_pos_x", tempHouseData.exitPosition.x],
["house_exit_pos_y", tempHouseData.exitPosition.y],
["house_exit_pos_z", tempHouseData.exitPosition.z],
["house_exit_rot_z", tempHouseData.exitRotation],
["house_exit_int", tempHouseData.exitInterior],
["house_exit_vw", tempHouseData.databaseId+getGlobalConfig().houseDimensionStart],
["house_exit_pickup", tempHouseData.exitPickupModel],
["house_exit_blip", tempHouseData.exitBlipModel],
["house_has_interior", boolToInt(tempHouseData.hasInterior)],
["house_buy_price", tempHouseData.buyPrice],
["house_rent_price", tempHouseData.rentPrice],
];
let dbQuery = null;
if(tempHouseData.databaseId == 0) {
let queryString = createDatabaseInsertQuery("house_main", data);
dbQuery = queryDatabase(dbConnection, queryString);
getServerData().houses[houseId].databaseId = getDatabaseInsertId(dbConnection);
} else {
let dbQueryString =
`UPDATE house_main SET
house_description='${safeHouseDescription}',
house_owner_type=${tempHouseData.ownerType},
house_owner_id=${tempHouseData.ownerId},
house_locked=${boolToInt(tempHouseData.locked)},
house_entrance_pos_x=${tempHouseData.entrancePosition.x},
house_entrance_pos_y=${tempHouseData.entrancePosition.y},
house_entrance_pos_z=${tempHouseData.entrancePosition.z},
house_entrance_rot_z=${tempHouseData.entranceRotation},
house_entrance_int=${tempHouseData.entranceInterior},
house_entrance_vw=${tempHouseData.entranceDimension},
house_exit_pos_x=${tempHouseData.exitPosition.x},
house_exit_pos_y=${tempHouseData.exitPosition.y},
house_exit_pos_z=${tempHouseData.exitPosition.z},
house_exit_rot_z=${tempHouseData.exitRotation},
house_exit_int=${tempHouseData.exitInterior},
house_exit_vw=${tempHouseData.exitDimension},
house_buy_price=${tempHouseData.buyPrice},
house_rent_price=${tempHouseData.rentPrice},
house_has_interior=${boolToInt(tempHouseData.hasInterior)}
WHERE house_id=${tempHouseData.databaseId}`;
//dbQueryString = dbQueryString.trim();
dbQueryString = dbQueryString.replace(/(?:\r\n|\r|\n|\t)/g, "");
let dbQuery = queryDatabase(dbConnection, dbQueryString);
freeDatabaseQuery(dbQuery);
disconnectFromDatabase(dbConnection);
let queryString = createDatabaseUpdateQuery("house_main", data, `WHERE house_id=${tempHouseData.databaseId}`);
dbQuery = queryDatabase(dbConnection, queryString);
}
freeDatabaseQuery(dbQuery);
disconnectFromDatabase(dbConnection);
return true;
}