dany/silk
1
0
Fork 0
mirror of https://github.com/lxsang/silk.git synced 2025-07-25 02:10:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow to declare multiple ORs of the same field in the SQL filter object
All checks were successful
gitea-sync/silk/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
DanyLE
2023-02-20 15:21:02 +01:00
parent efe5281f2f
commit 71434c48ff
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
silkmvc/core/sqlite.lua
View File

@ -60,6 +60,10 @@ function SQLQueryGenerator:sql_select()
table.insert(segments, o)
end
if self.limit then
table.insert(segments, "LIMIT "..self.limit)
end
return true, table.concat(segments, " ")
end
@ -161,7 +165,13 @@ function SQLQueryGenerator:sql_where(cond, obj)
if k == "$and" or k == "$or" then
table.insert(conds, self:sql_where(k, v))
else
table.insert(conds, self:binary(k, v))
if type(v) == "table" and not (k:match("%$.*in") or k:match("%$.*between") ) then
for i,el in ipairs(v) do
table.insert(conds, self:binary(k, el))
end
else
table.insert(conds, self:binary(k, v))
end
end
end
@ -170,7 +180,7 @@ end
function SQLQueryGenerator:parse_value(v, types)
if not types[type(v)] then
self:error("Type error: unexpected type %d", type(v))
self:error("Type error: unexpected type %s", type(v))
end
if type(v) == "number" then
return tostring(v)