Merge pull request #135 from brouznouf/dev

Dev

Author: GHMatti

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "src/vendor/ghmattimysql"]
+	path = src/vendor/ghmattimysql
+	url = https://github.com/GHMatti/ghmattimysql.git
+	branch = master

lib/MySQL.lua

@@ -9,7 +9,6 @@ local function safeParameters(params)
     end
 
     assert(type(params) == "table", "A table is expected")
-    assert(params[1] == nil, "Parameters should not be an array, but a map (key / value pair) instead")
 
     if next(params) == nil then
         return {[''] = ''}
@@ -27,7 +26,7 @@ end
 -- @return int Number of rows updated
 --
 function MySQL.Sync.execute(query, params)
-    assert(type(query) == "string", "The SQL Query must be a string")
+    assert(type(query) == "string" or type(query) == "number", "The SQL Query must be a string")
 
     local res = 0
     local finishedQuery = false
@@ -47,7 +46,7 @@ end
 -- @return table Query results
 --
 function MySQL.Sync.fetchAll(query, params)
-    assert(type(query) == "string", "The SQL Query must be a string")
+    assert(type(query) == "string" or type(query) == "number", "The SQL Query must be a string")
 
     local res = {}
     local finishedQuery = false
@@ -69,7 +68,7 @@ end
 -- @return mixed Value of the first column in the first row
 --
 function MySQL.Sync.fetchScalar(query, params)
-    assert(type(query) == "string", "The SQL Query must be a string")
+    assert(type(query) == "string" or type(query) == "number", "The SQL Query must be a string")
 
     local res = ''
     local finishedQuery = false
@@ -90,7 +89,7 @@ end
 -- @return mixed Value of the last insert id
 --
 function MySQL.Sync.insert(query, params)
-    assert(type(query) == "string", "The SQL Query must be a string")
+    assert(type(query) == "string" or type(query) == "number", "The SQL Query must be a string")
 
     local res = 0
     local finishedQuery = false
@@ -102,6 +101,24 @@ function MySQL.Sync.insert(query, params)
     return res
 end
 
+---
+-- Stores a query for later execution
+--
+-- @param query
+--
+function MySQL.Sync.store(query)
+    assert(type(query) == "string", "The SQL Query must be a string")
+
+    local res = -1
+    local finishedQuery = false
+    exports['mysql-async']:mysql_store(query, function (result)
+        res = result
+        finishedQuery = true
+    end)
+    repeat Citizen.Wait(0) until finishedQuery == true
+    return res
+end
+
 ---
 -- Execute a List of querys and returns bool true when all are executed successfully
 --
@@ -129,7 +146,7 @@ end
 -- @param func(int)
 --
 function MySQL.Async.execute(query, params, func)
-    assert(type(query) == "string", "The SQL Query must be a string")
+    assert(type(query) == "string" or type(query) == "number", "The SQL Query must be a string")
 
     exports['mysql-async']:mysql_execute(query, safeParameters(params), func)
 end
@@ -142,7 +159,7 @@ end
 -- @param func(table)
 --
 function MySQL.Async.fetchAll(query, params, func)
-    assert(type(query) == "string", "The SQL Query must be a string")
+    assert(type(query) == "string" or type(query) == "number", "The SQL Query must be a string")
 
     exports['mysql-async']:mysql_fetch_all(query, safeParameters(params), func)
 end
@@ -156,7 +173,7 @@ end
 -- @param func(mixed)
 --
 function MySQL.Async.fetchScalar(query, params, func)
-    assert(type(query) == "string", "The SQL Query must be a string")
+    assert(type(query) == "string" or type(query) == "number", "The SQL Query must be a string")
 
     exports['mysql-async']:mysql_fetch_scalar(query, safeParameters(params), func)
 end
@@ -169,11 +186,23 @@ end
 -- @param func(string)
 --
 function MySQL.Async.insert(query, params, func)
-    assert(type(query) == "string", "The SQL Query must be a string")
+    assert(type(query) == "string" or type(query) == "number", "The SQL Query must be a string")
 
     exports['mysql-async']:mysql_insert(query, safeParameters(params), func)
 end
 
+---
+-- Stores a query for later execution
+--
+-- @param query
+-- @param func(number)
+--
+function MySQL.Async.store(query, func)
+    assert(type(query) == "string", "The SQL Query must be a string")
+
+    exports['mysql-async']:mysql_store(query, func)
+end
+
 ---
 -- Execute a List of querys and returns bool true when all are executed successfully
 --

mysql-async-client.js

@@ -91,12 +91,12 @@
 let isNuiActive = false;
 
 function NuiMessage(msg) {
-  window.SendNuiMessage(JSON.stringify(msg));
+  SendNuiMessage(JSON.stringify(msg));
 }
 
 function NuiCallback(name, callback) {
-  window.RegisterNuiCallbackType(name);
-  window.on(`__cfx_nui:${name}`, (data, cb) => {
+  RegisterNuiCallbackType(name);
+  on(`__cfx_nui:${name}`, (data, cb) => {
     callback(data);
     cb('ok');
   });
@@ -105,42 +105,44 @@ function NuiCallback(name, callback) {
 function setNuiActive(boolean = true) {
   if (boolean !== isNuiActive) {
     if (boolean) {
-      window.emitNet('mysql-async:request-data');
+      emitNet('mysql-async:request-data');
     }
+
     isNuiActive = boolean;
-    NuiMessage({ type: 'onToggleShow' });
-    window.SetNuiFocus(boolean, boolean);
+    NuiMessage({
+      type: 'onToggleShow'
+    });
+    SetNuiFocus(boolean, boolean);
   }
 }
 
-window.RegisterCommand('mysql', () => {
+RegisterCommand('mysql', () => {
   setNuiActive();
 }, true);
-
 NuiCallback('close-explorer', () => {
   setNuiActive(false);
 });
-
-window.setInterval(() => {
+setInterval(() => {
   if (isNuiActive) {
-    window.emitNet('mysql-async:request-data');
+    emitNet('mysql-async:request-data');
   }
 }, 300000);
-
-window.onNet('mysql-async:update-resource-data', (resourceData) => {
+onNet('mysql-async:update-resource-data', resourceData => {
   let arrayToSortAndMap = [];
   const resources = Object.keys(resourceData);
+
   for (let i = 0; i < resources.length; i += 1) {
     if (Object.prototype.hasOwnProperty.call(resourceData, resources[i])) {
       if (Object.prototype.hasOwnProperty.call(resourceData[resources[i]], 'totalExecutionTime')) {
         arrayToSortAndMap.push({
           resource: resources[i],
           queryTime: resourceData[resources[i]].totalExecutionTime,
-          count: resourceData[resources[i]].queryCount,
+          count: resourceData[resources[i]].queryCount
         });
       }
     }
   }
+
   if (arrayToSortAndMap.length > 0) {
     arrayToSortAndMap.sort((a, b) => a.queryTime - b.queryTime);
     const len = arrayToSortAndMap.length;
@@ -149,71 +151,63 @@ window.onNet('mysql-async:update-resource-data', (resourceData) => {
       const resourceA = a.resource.toLowerCase();
       const resourceB = b.resource.toLowerCase();
       let result = 0;
+
       if (resourceA < resourceB) {
         result = -1;
       } else if (resourceA > resourceB) {
         result = 1;
       }
+
       return result;
     });
     NuiMessage({
       type: 'onResourceLabels',
-      resourceLabels: arrayToSortAndMap.map((el) => el.resource),
+      resourceLabels: arrayToSortAndMap.map(el => el.resource)
     });
     NuiMessage({
       type: 'onResourceData',
-      resourceData: [
-        {
-          data: arrayToSortAndMap.map((el) => el.queryTime),
-        },
-        {
-          data: arrayToSortAndMap.map((el) => ((el.count > 0) ? el.queryTime / el.count : 0)),
-        },
-        {
-          data: arrayToSortAndMap.map((el) => el.count),
-        },
-      ],
+      resourceData: [{
+        data: arrayToSortAndMap.map(el => el.queryTime)
+      }, {
+        data: arrayToSortAndMap.map(el => el.count > 0 ? el.queryTime / el.count : 0)
+      }, {
+        data: arrayToSortAndMap.map(el => el.count)
+      }]
     });
   }
 });
-
-window.onNet('mysql-async:update-time-data', (timeData) => {
+onNet('mysql-async:update-time-data', timeData => {
   let timeArray = [];
+
   if (Array.isArray(timeData)) {
     const len = timeData.length;
     timeArray = timeData.filter((_, index) => index > len - 31);
   }
+
   if (timeArray.length > 0) {
     NuiMessage({
       type: 'onTimeData',
-      timeData: [
-        {
-          data: timeArray.map((el) => el.totalExecutionTime),
-        },
-        {
-          data: timeArray.map((el) => ((el.queryCount > 0) ? el.totalExecutionTime / el.queryCount
-            : 0)),
-        },
-        {
-          data: timeArray.map((el) => el.queryCount),
-        },
-      ],
+      timeData: [{
+        data: timeArray.map(el => el.totalExecutionTime)
+      }, {
+        data: timeArray.map(el => el.queryCount > 0 ? el.totalExecutionTime / el.queryCount : 0)
+      }, {
+        data: timeArray.map(el => el.queryCount)
+      }]
     });
   }
 });
-
-window.onNet('mysql-async:update-slow-queries', (slowQueryData) => {
-  const slowQueries = slowQueryData.map((el) => {
+onNet('mysql-async:update-slow-queries', slowQueryData => {
+  const slowQueries = slowQueryData.map(el => {
     const element = el;
     element.queryTime = Math.round(el.queryTime * 100) / 100;
     return element;
   });
   NuiMessage({
     type: 'onSlowQueryData',
-    slowQueries,
+    slowQueries
   });
 });
 
-
 /***/ })
 /******/ ]);