Preserve nil <-> NULL between Nimrod and database.

This commit is contained in:
Milos Negovanovic
2014-08-20 10:24:36 +01:00
parent e5fd84c559
commit 434dcd7166

View File

@@ -57,7 +57,7 @@ when false:
binding: seq[MYSQL_BIND]
discard mysql_stmt_close(stmt)
proc dbQuote(s: string): string =
proc dbQuote*(s: string): string =
result = "'"
for c in items(s):
if c == '\'': add(result, "''")
@@ -69,7 +69,10 @@ proc dbFormat(formatstr: TSqlQuery, args: varargs[string]): string =
var a = 0
for c in items(string(formatstr)):
if c == '?':
add(result, dbQuote(args[a]))
if args[a] == nil:
add(result, "NULL")
else:
add(result, dbQuote(args[a]))
inc(a)
else:
add(result, c)
@@ -115,7 +118,10 @@ iterator fastRows*(db: TDbConn, query: TSqlQuery,
if row == nil: break
for i in 0..L-1:
setLen(result[i], 0)
add(result[i], row[i])
if row[i] == nil:
result[i] = nil
else:
add(result[i], row[i])
yield result
properFreeResult(sqlres, row)
@@ -132,7 +138,10 @@ proc getRow*(db: TDbConn, query: TSqlQuery,
if row != nil:
for i in 0..L-1:
setLen(result[i], 0)
add(result[i], row[i])
if row[i] == nil:
result[i] = nil
else:
add(result[i], row[i])
properFreeResult(sqlres, row)
proc getAllRows*(db: TDbConn, query: TSqlQuery,
@@ -150,7 +159,11 @@ proc getAllRows*(db: TDbConn, query: TSqlQuery,
if row == nil: break
setLen(result, j+1)
newSeq(result[j], L)
for i in 0..L-1: result[j][i] = $row[i]
for i in 0..L-1:
if row[i] == nil:
result[j][i] = nil
else:
result[j][i] = $row[i]
inc(j)
mysql.FreeResult(sqlres)