nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix. LuaSQL db backend breaks loop only on positive numbers.

Browse Source
This commit is contained in:
Alexey Melnichuk
2016-02-26 13:57:05 +03:00
parent c96a5bee48
commit ebfcdc38be
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/install/scripts/resources/functions/database.lua
View File

@@ -85,6 +85,14 @@ local function new_database(backend)
assert(x == 1, ("Got %d expected %d"):format(x, 1)) assert(x == 1, ("Got %d expected %d"):format(x, 1))
end end
do local x = 0
db:query("select 1 as v union all select 2 as v", function(row)
x = x + 1
return -1
end)
assert(x == 1, ("Got %d expected %d"):format(x, 1))
end
do local x = 0 do local x = 0
db:query("select 1 as v union all select 2 as v", function(row) db:query("select 1 as v union all select 2 as v", function(row)
x = x + 1 x = x + 1

2
resources/install/scripts/resources/functions/database/luasql.lua
View File

@@ -54,7 +54,7 @@ function LuaSQLDatabase:query(sql, fn)
local row, err = cur:fetch({}, "a") local row, err = cur:fetch({}, "a")
if not row then break end if not row then break end
local ok, ret = pcall(fn, apply_names(row, colnames, "")) local ok, ret = pcall(fn, apply_names(row, colnames, ""))
if (not ok) or (type(ret) == 'number' and ret > 0) then if (not ok) or (type(ret) == 'number' and ret ~= 0) then
break break
end end
end end