fixed merge conflict

This commit is contained in:
Andreas Rumpf
2018-06-04 16:16:50 +02:00
committed by ringabout
parent e8b734dde1
commit 8c93fc2229

View File

@@ -128,7 +128,7 @@ proc dbFormat(formatstr: SqlQuery, args: varargs[string]): string =
var a = 0
for c in items(string(formatstr)):
if c == '?':
if args[a] == nil:
if args[a].isNil:
add(result, "NULL")
else:
add(result, dbQuote(args[a]))