Skip to content

Commit

Permalink
feat: Enable JS sync exports if wrapper.lua is not loaded
Browse files Browse the repository at this point in the history
  • Loading branch information
thelindat committed Sep 18, 2021
1 parent f7dea33 commit be221b7
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 31 deletions.
2 changes: 1 addition & 1 deletion fxmanifest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ game 'gta5'

name 'oxmysql'
description 'Database wrapper for FiveM utilising node-mysql2 offering improved performance and security.'
version '1.2.0'
version '1.3.1'
url 'https://github.com/overextended/oxmysql'
author 'overextended'
use_fxv2_oal 'yes'
Expand Down
50 changes: 26 additions & 24 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,32 +44,34 @@ global.exports('scalar', (query, parameters, cb, resource = GetInvokingResource(
safeCallback(cb, result && result[0] && Object.values(result[0])[0], !cb && [resource, query]));
});

/*global.exports('executeSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result;
});
if (!GetResourceMetadata(GetCurrentResourceName(), 'server_script', 1)) {
global.exports('executeSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result;
});

global.exports('insertSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result && result.insertId;
});
global.exports('insertSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result && result.insertId;
});

global.exports('updateSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result && result.affectedRows;
});
global.exports('updateSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result && result.affectedRows;
});

global.exports('fetchSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result;
});
global.exports('fetchSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result;
});

global.exports('singleSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result && result[0];
});
global.exports('singleSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result && result[0];
});

global.exports('scalarSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result && result[0] && Object.values(result[0])[0];
});*/
global.exports('scalarSync', async (query, parameters) => {
const result = await execute(query, parameters, GetInvokingResource());
return result && result[0] && Object.values(result[0])[0];
});
}
12 changes: 6 additions & 6 deletions wrapper.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
-- Execute unprepared query and fetch result
--
-- @param query tring
-- @param query string
-- @param parameters table
--
-- @return table with result | false
Expand All @@ -17,7 +17,7 @@ end)
---
-- Execute query and fetch all result
--
-- @param query tring
-- @param query string
-- @param parameters table
--
-- @return table with result
Expand All @@ -33,7 +33,7 @@ end)
---
-- Execute query and fetch first row
--
-- @param query tring
-- @param query string
-- @param parameters table
--
-- @return table with result row
Expand All @@ -49,7 +49,7 @@ end)
---
-- Execute query and fetch first column of first row
--
-- @param query tring
-- @param query string
-- @param parameters table
--
-- @return result
Expand All @@ -65,7 +65,7 @@ end)
---
-- Insert data and return inserted id
--
-- @param query tring
-- @param query string
-- @param parameters table
--
-- @return insert data result
Expand All @@ -81,7 +81,7 @@ end)
---
-- Update data and return affected rows
--
-- @param query tring
-- @param query string
-- @param parameters table
--
-- @return number affected rows
Expand Down

0 comments on commit be221b7

Please sign in to comment.