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

Use new divider style

Browse Source
This commit is contained in:
Vortrex
2021-04-18 19:12:26 -05:00
parent 35a84975f8
commit 42840fed70
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
scripts/server/database.js
View File

@@ -8,11 +8,11 @@
// TYPE: Server (JavaScript) // TYPE: Server (JavaScript)
// =========================================================================== // ===========================================================================
// ------------------------------------------------------------------------- // ===========================================================================
let persistentDatabaseConnection = null; let persistentDatabaseConnection = null;
// ------------------------------------------------------------------------- // ===========================================================================
function initDatabaseScript() { function initDatabaseScript() {
logToConsole(LOG_INFO, "[Asshat.Database]: Initializing database script ..."); logToConsole(LOG_INFO, "[Asshat.Database]: Initializing database script ...");
@@ -20,7 +20,7 @@ function initDatabaseScript() {
logToConsole(LOG_INFO, "[Asshat.Database]: Database script initialized successfully!"); logToConsole(LOG_INFO, "[Asshat.Database]: Database script initialized successfully!");
} }
// ------------------------------------------------------------------------- // ===========================================================================
function connectToDatabase() { function connectToDatabase() {
if(persistentDatabaseConnection == null) { if(persistentDatabaseConnection == null) {
@@ -40,27 +40,28 @@ function connectToDatabase() {
} }
} }
// ------------------------------------------------------------------------- // ===========================================================================
function disconnectFromDatabase(dbConnection) { function disconnectFromDatabase(dbConnection) {
if(!databaseConfig.usePersistentConnection) { if(!databaseConfig.usePersistentConnection) {
try { try {
dbConnection.close(); dbConnection.close();
logToConsole(LOG_DEBUG, `Database connection closed successfully`); logToConsole(LOG_DEBUG, `[Asshat.Database] Database connection closed successfully`);
} catch(error) { } catch(error) {
logToConsole(LOG_ERROR, `Database connection could not be closed! (Error: ${error})`); logToConsole(LOG_ERROR, `[Asshat.Database] Database connection could not be closed! (Error: ${error})`);
} }
} }
return true; return true;
} }
// ------------------------------------------------------------------------- // ===========================================================================
function queryDatabase(dbConnection, queryString) { function queryDatabase(dbConnection, queryString) {
logToConsole(LOG_DEBUG, `[Asshat.Database] Query string: ${queryString}`);
return dbConnection.query(queryString); return dbConnection.query(queryString);
} }
// ------------------------------------------------------------------------- // ===========================================================================
function escapeDatabaseString(dbConnection, unsafeString = "") { function escapeDatabaseString(dbConnection, unsafeString = "") {
if(!dbConnection) { if(!dbConnection) {
@@ -73,25 +74,25 @@ function escapeDatabaseString(dbConnection, unsafeString = "") {
return unsafeString; return unsafeString;
} }
// ------------------------------------------------------------------------- // ===========================================================================
function getDatabaseInsertId(dbConnection) { function getDatabaseInsertId(dbConnection) {
return dbConnection.insertId; return dbConnection.insertId;
} }
// ------------------------------------------------------------------------- // ===========================================================================
function getQueryNumRows(dbQuery) { function getQueryNumRows(dbQuery) {
return dbQuery.numRows; return dbQuery.numRows;
} }
// ------------------------------------------------------------------------- // ===========================================================================
function getDatabaseError(dbConnection) { function getDatabaseError(dbConnection) {
return dbConnection.error; return dbConnection.error;
} }
// ------------------------------------------------------------------------- // ===========================================================================
function freeDatabaseQuery(dbQuery) { function freeDatabaseQuery(dbQuery) {
if(dbQuery != null) { if(dbQuery != null) {
@@ -100,31 +101,31 @@ function freeDatabaseQuery(dbQuery) {
return; return;
} }
// ------------------------------------------------------------------------- // ===========================================================================
function fetchQueryAssoc(dbQuery) { function fetchQueryAssoc(dbQuery) {
return dbQuery.fetchAssoc(); return dbQuery.fetchAssoc();
} }
// ------------------------------------------------------------------------- // ===========================================================================
function quickDatabaseQuery(queryString) { function quickDatabaseQuery(queryString) {
let dbConnection = connectToDatabase(); let dbConnection = connectToDatabase();
let insertId = 0; let insertId = 0;
if(dbConnection) { if(dbConnection) {
logToConsole(LOG_DEBUG, queryString); logToConsole(LOG_DEBUG, `[Asshat.Database] Query string: ${queryString}`);
let dbQuery = queryDatabase(dbConnection, queryString); let dbQuery = queryDatabase(dbConnection, queryString);
if(getDatabaseInsertId(dbConnection)) { if(getDatabaseInsertId(dbConnection)) {
insertId = getDatabaseInsertId(dbConnection); insertId = getDatabaseInsertId(dbConnection);
logToConsole(LOG_DEBUG, `Query returned insert id ${insertId}`); logToConsole(LOG_DEBUG, `[Asshat.Database] Query returned insert id ${insertId}`);
} }
if(dbQuery) { if(dbQuery) {
try { try {
freeDatabaseQuery(dbQuery); freeDatabaseQuery(dbQuery);
logToConsole(LOG_DEBUG, `Query result free'd successfully`); logToConsole(LOG_DEBUG, `[Asshat.Database] Query result free'd successfully`);
} catch(error) { } catch(error) {
logToConsole(LOG_ERROR, `Query result could not be free'd! (Error: ${error})`); logToConsole(LOG_ERROR, `[Asshat.Database] Query result could not be free'd! (Error: ${error})`);
} }
} }
@@ -139,7 +140,7 @@ function quickDatabaseQuery(queryString) {
return false; return false;
} }
// ------------------------------------------------------------------------- // ===========================================================================
function executeDatabaseQueryCommand(command, params, client) { function executeDatabaseQueryCommand(command, params, client) {
if(areParamsEmpty(params)) { if(areParamsEmpty(params)) {
@@ -170,20 +171,20 @@ function executeDatabaseQueryCommand(command, params, client) {
return true; return true;
} }
// ------------------------------------------------------------------------- // ===========================================================================
function setConstantsAsGlobalVariablesInDatabase() { function setConstantsAsGlobalVariablesInDatabase() {
let dbConnection = connectToDatabase(); let dbConnection = connectToDatabase();
let entries = Object.entries(global); let entries = Object.entries(global);
for(let i in entries) { for(let i in entries) {
logToConsole(LOG_DEBUG, `Checking entry ${i} (${entries[i]})`); logToConsole(LOG_DEBUG, `[Asshat.Database] Checking entry ${i} (${entries[i]})`);
if(toString(i).slice(0, 3).indexOf("AG_") != -1) { if(toString(i).slice(0, 3).indexOf("AG_") != -1) {
logToConsole(LOG_DEBUG, `Adding ${i} (${entries[i]}) to database global variables`); logToConsole(LOG_DEBUG, `[Asshat.Database] Adding ${i} (${entries[i]}) to database global variables`);
} }
} }
} }
// ------------------------------------------------------------------------- // ===========================================================================
function loadDatabaseConfiguration() { function loadDatabaseConfiguration() {
let databaseConfigFile = loadTextFile("config/database.json"); let databaseConfigFile = loadTextFile("config/database.json");