mysql-async v3.0.1 support

server/classes/datastore.lua

@@ -1,103 +1,90 @@
 function stringsplit(inputstr, sep)
-  if sep == nil then
-    sep = "%s"
-  end
-  local t={} ; i=1
-  for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
-    t[i] = str
-    i = i + 1
-  end
-  return t
+	if sep == nil then
+		sep = "%s"
+	end
+
+	local t={} ; i=1
+	for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
+		t[i] = str
+		i = i + 1
+	end
+
+	return t
 end
 
 function CreateDataStore(name, owner, data)
+	local self = {}
 
-  local self = {}
+	self.name  = name
+	self.owner = owner
+	self.data  = data
 
-  self.name  = name
-  self.owner = owner
-  self.data  = data
+	local timeoutCallbacks = {}
 
-  local timeoutCallbacks = {}
+	self.set = function(key, val)
+		data[key] = val
+		self.save()
+	end
 
-  self.set = function(key, val)
-    data[key] = val
-    self.save()
-  end
+	self.get = function(key, i)
+		local path = stringsplit(key, '.')
+		local obj  = self.data
 
-  self.get = function(key, i)
+		for i=1, #path, 1 do
+			obj = obj[path[i]]
+		end
 
-    local path = stringsplit(key, '.')
-    local obj  = self.data
+		if i == nil then
+			return obj
+		else
+			return obj[i]
+		end
+	end
 
-    for i=1, #path, 1 do
-      obj = obj[path[i]]
-    end
+	self.count = function(key, i)
+		local path = stringsplit(key, '.')
+		local obj  = self.data
 
-    if i == nil then
-      return obj
-    else
-      return obj[i]
-    end
+		for i=1, #path, 1 do
+			obj = obj[path[i]]
+		end
 
-  end
+		if i ~= nil then
+			obj = obj[i]
+		end
 
-  self.count = function(key, i)
+		if obj == nil then
+			return 0
+		else
+			return #obj
+		end
+	end
 
-    local path = stringsplit(key, '.')
-    local obj  = self.data
+	self.save = function()
+		for i=1, #timeoutCallbacks, 1 do
+			ESX.ClearTimeout(timeoutCallbacks[i])
+			timeoutCallbacks[i] = nil
+		end
 
-    for i=1, #path, 1 do
-      obj = obj[path[i]]
-    end
+		local timeoutCallback = ESX.SetTimeout(10000, function()
+			if self.owner == nil then
+				MySQL.Async.execute('UPDATE datastore_data SET data = @data WHERE name = @name',
+				{
+					['@data'] = json.encode(self.data),
+					['@name'] = self.name,
+				})
+			else
+				MySQL.Async.execute('UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner',
+				{
+					['@data']  = json.encode(self.data),
+					['@name']  = self.name,
+					['@owner'] = self.owner,
+				})
+			end
+		end)
 
-    if i ~= nil then
-      obj = obj[i]
-    end
-
-    if obj == nil then
-      return 0
-    else
-      return #obj
-    end
-
-  end
-
-  self.save = function()
-
-    for i=1, #timeoutCallbacks, 1 do
-      ESX.ClearTimeout(timeoutCallbacks[i])
-      timeoutCallbacks[i] = nil
-    end
-
-    local timeoutCallback = ESX.SetTimeout(10000, function()
-
-      if self.owner == nil then
-        MySQL.Async.execute(
-          'UPDATE datastore_data SET data = @data WHERE name = @name',
-          {
-            ['@data'] = json.encode(self.data),
-            ['@name'] = self.name,
-          }
-        )
-      else
-        MySQL.Async.execute(
-          'UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner',
-          {
-            ['@data']  = json.encode(self.data),
-            ['@name']  = self.name,
-            ['@owner'] = self.owner,
-          }
-        )
-      end
-
-    end)
-
-    table.insert(timeoutCallbacks, timeoutCallback)
-
-  end
-
-  return self
+		table.insert(timeoutCallbacks, timeoutCallback)
+	end
 
+	return self
 end
-