Make long db query strings easier to read
This commit is contained in:
Vortrex
@@ -433,7 +433,30 @@ function saveHouseToDatabase(houseId) {
|
||||
queryDatabase(dbConnection, dbQueryString);
|
||||
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_has_interior=${boolToInt(tempHouseData.hasInterior)} WHERE house_id=${tempHouseData.databaseId}`;
|
||||
|
||||
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}`;
|
||||
|
||||
queryDatabase(dbConnection, dbQueryString);
|
||||
}
|
||||
disconnectFromDatabase(dbConnection);
|
||||
|
||||
@@ -1313,7 +1313,22 @@ function saveJobToDatabase(jobData) {
|
||||
queryDatabase(dbConnection, dbQueryString);
|
||||
jobData.databaseId = getDatabaseInsertId(dbConnection);
|
||||
} else {
|
||||
let dbQueryString = `UPDATE job_main SET job_name='${safeName}', job_enabled=${boolToInt(jobData.enabled)}, job_pickup=${jobData.pickupModel}, job_blip=${jobData.blipModel}, job_type=${jobData.type}, job_colour_r=${jobData.colourArray[0]}, job_colour_g=${jobData.colourArray[1]}, job_colour_b=${jobData.colourArray[2]} WHERE job_id=${jobData.databaseId}`;
|
||||
|
||||
let dbQueryString =
|
||||
`UPDATE job_main SET
|
||||
job_name='${safeName}',
|
||||
job_enabled=${boolToInt(jobData.enabled)},
|
||||
job_pickup=${jobData.pickupModel},
|
||||
job_blip=${jobData.blipModel},
|
||||
job_type=${jobData.type},
|
||||
job_colour_r=${jobData.colourArray[0]},
|
||||
job_colour_g=${jobData.colourArray[1]},
|
||||
job_colour_b=${jobData.colourArray[2]},
|
||||
job_walkietalkiefreq=${jobData.walkieTalkieFrequency},
|
||||
job_wl=${jobData.whiteListEnabled},
|
||||
job_bl=${jobData.blackListEnabled}
|
||||
WHERE job_id=${jobData.databaseId}`;
|
||||
|
||||
queryDatabase(dbConnection, dbQueryString);
|
||||
}
|
||||
disconnectFromDatabase(dbConnection);
|
||||
|
||||
@@ -85,8 +85,65 @@ function saveSubAccountToDatabase(subAccountData) {
|
||||
let safeClanTitle = escapeDatabaseString(dbConnection, subAccountData.clanTitle);
|
||||
let safeFirstName = escapeDatabaseString(dbConnection, subAccountData.firstName);
|
||||
let safeLastName = escapeDatabaseString(dbConnection, subAccountData.lastName);
|
||||
//let safeMiddleName = escapeDatabaseString(dbConnection, subAccountData.middleName);
|
||||
let dbQueryString = `UPDATE sacct_main SET sacct_name_first='${safeFirstName}', sacct_name_last='${safeLastName}', sacct_pos_x=${subAccountData.spawnPosition.x}, sacct_pos_y=${subAccountData.spawnPosition.y}, sacct_pos_z=${subAccountData.spawnPosition.z}, sacct_angle=${subAccountData.spawnHeading}, sacct_skin=${subAccountData.skin}, sacct_cash=${subAccountData.cash}, sacct_job=${subAccountData.job}, sacct_int=${subAccountData.interior}, sacct_vw=${subAccountData.dimension}, sacct_clan=${subAccountData.clan}, sacct_clan_rank=${subAccountData.clanRank}, sacct_clan_tag='${safeClanTag}', sacct_clan_title='${safeClanTitle}', sacct_clan_flags=${subAccountData.clanFlags}, sacct_fightstyle=${subAccountData.fightStyle}, sacct_walkstyle=${subAccountData.walkStyle} WHERE sacct_id=${subAccountData.databaseId}`;
|
||||
let safeMiddleName = escapeDatabaseString(dbConnection, subAccountData.middleName);
|
||||
|
||||
let dbQueryString = `
|
||||
UPDATE sacct_main SET
|
||||
sacct_name_first='${safeFirstName}',
|
||||
sacct_name_last='${safeLastName}',
|
||||
sacct_name_middle='${safeMiddleName}',
|
||||
sacct_pos_x=${subAccountData.spawnPosition.x},
|
||||
sacct_pos_y=${subAccountData.spawnPosition.y},
|
||||
sacct_pos_z=${subAccountData.spawnPosition.z},
|
||||
sacct_scale_x=${subAccountData.pedScale.x},
|
||||
sacct_scale_y=${subAccountData.pedScale.y},
|
||||
sacct_scale_z=${subAccountData.pedScale.z},
|
||||
sacct_angle=${subAccountData.spawnHeading},
|
||||
sacct_skin=${subAccountData.skin},
|
||||
sacct_cash=${subAccountData.cash},
|
||||
sacct_job=${subAccountData.job},
|
||||
sacct_int=${subAccountData.interior},
|
||||
sacct_vw=${subAccountData.dimension},
|
||||
sacct_clan=${subAccountData.clan},
|
||||
sacct_clan_rank=${subAccountData.clanRank},
|
||||
sacct_clan_tag='${safeClanTag}',
|
||||
sacct_clan_title='${safeClanTitle}',
|
||||
sacct_clan_flags=${subAccountData.clanFlags},
|
||||
sacct_fightstyle=${subAccountData.fightStyle},
|
||||
sacct_walkstyle=${subAccountData.walkStyle},
|
||||
sacct_when_lastlogin=${subAccountData.lastLogin},
|
||||
sacct_origin=${subAccountData.placeOfOrigin},
|
||||
sacct_when_born=${subAccountData.dateOfBirth},
|
||||
sacct_iv_part_hair_model=${subAccountData.bodyParts.hair[0]},
|
||||
sacct_iv_part_hair_texture=${subAccountData.bodyParts.hair[1]},
|
||||
sacct_iv_part_head_model=${subAccountData.bodyParts.head[0]},
|
||||
sacct_iv_part_head_texture=${subAccountData.bodyParts.head[1]},
|
||||
sacct_iv_part_upper_model=${subAccountData.bodyParts.upper[0]},
|
||||
sacct_iv_part_upper_texture=${subAccountData.bodyParts.upper[1]},
|
||||
sacct_iv_part_lower_model=${subAccountData.bodyParts.lower[0]},
|
||||
sacct_iv_part_lower_texture=${subAccountData.bodyParts.lower[1]},
|
||||
sacct_iv_prop_hair_model=${subAccountData.bodyProps.hair[0]},
|
||||
sacct_iv_prop_hair_texture=${subAccountData.bodyProps.hair[1]},
|
||||
sacct_iv_prop_eyes_model=${subAccountData.bodyProps.eyes[0]},
|
||||
sacct_iv_prop_eyes_texture=${subAccountData.bodyProps.eyes[1]},
|
||||
sacct_iv_prop_head_model=${subAccountData.bodyProps.head[0]},
|
||||
sacct_iv_prop_head_texture=${subAccountData.bodyProps.head[1]},
|
||||
sacct_iv_prop_lefthand_model=${subAccountData.bodyProps.leftHand[0]},
|
||||
sacct_iv_prop_lefthand_texture=${subAccountData.bodyProps.leftHand[1]},
|
||||
sacct_iv_prop_righthand_model=${subAccountData.bodyProps.rightHand[0]},
|
||||
sacct_iv_prop_righthand_texture=${subAccountData.bodyProps.rightHand[1]},
|
||||
sacct_iv_prop_leftwrist_model=${subAccountData.bodyProps.leftWrist[0]},
|
||||
sacct_iv_prop_leftwrist_texture=${subAccountData.bodyProps.leftWrist[1]},
|
||||
sacct_iv_prop_rightwrist_model=${subAccountData.bodyProps.rightWrist[0]},
|
||||
sacct_iv_prop_rightwrist_texture=${subAccountData.bodyProps.rightWrist[1]},
|
||||
sacct_iv_prop_hip_model=${subAccountData.bodyProps.hip[0]},
|
||||
sacct_iv_prop_hip_texture=${subAccountData.bodyProps.hip[1]},
|
||||
sacct_iv_prop_leftfoot_model=${subAccountData.bodyProps.leftFoot[0]},
|
||||
sacct_iv_prop_leftfoot_texture=${subAccountData.bodyProps.leftFoot[1]},
|
||||
sacct_iv_prop_rightfoot_model=${subAccountData.bodyProps.rightFoot[0]},
|
||||
sacct_iv_prop_rightfoot_texture=${subAccountData.bodyProps.rightFoot[1]}
|
||||
WHERE sacct_id=${subAccountData.databaseId}`;
|
||||
|
||||
logToConsole(LOG_DEBUG, dbQueryString);
|
||||
let dbQuery = queryDatabase(dbConnection, dbQueryString);
|
||||
freeDatabaseQuery(dbQuery);
|
||||
|
||||
@@ -1067,4 +1067,18 @@ function checkVehicleBurning() {
|
||||
}
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
function cacheAllVehicleItems() {
|
||||
for(let i in getServerData().vehicles) {
|
||||
for(let j in getServerData().items) {
|
||||
if(getItemData(j).ownerType == AG_ITEM_OWNER_VEHTRUNK && getItemData(j).ownerId == getServerData().vehicles[i].databaseId) {
|
||||
getServerData().vehicles[i].trunkItemCache.push(j);
|
||||
} else if(getItemData(j).ownerType == AG_ITEM_OWNER_VEHDASH && getItemData(j).ownerId == getServerData().vehicles[i].databaseId) {
|
||||
getServerData().vehicles[i].dashItemCache.push(j);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
Reference in New Issue
Block a user