jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

openarray/varargs split; breaks bootstrapping

Browse source
This commit is contained in:
Araq 2012-08-16 08:34:33 +02:00
commit 0171566c98
29 changed files with 228 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/impure/db_mongo.nim
View file

@ -165,13 +165,13 @@ iterator find*(db: var TDbConn, namespace: string,
yield bson(cursor[])[]
destroy(cursor[])
proc setupFieldnames(fields: openArray[string]): TBSon =
proc setupFieldnames(fields: varargs[string]): TBSon =
init(result)
for x in fields: add(result, x, 1'i32)
finish(result)
iterator find*(db: var TDbConn, namespace: string,
query: var TBSon, fields: openArray[string]): var TBSon =
query: var TBSon, fields: varargs[string]): var TBSon =
## yields the `fields` of any document that suffices `query`. If `fields`
## is ``[]`` the whole document is yielded.
var f = setupFieldnames(fields)
@ -188,7 +188,7 @@ proc setupQuery(query: string): TBSon =
finish(result)
iterator find*(db: var TDbConn, namespace: string,
query: string, fields: openArray[string]): var TBSon =
query: string, fields: varargs[string]): var TBSon =
## yields the `fields` of any document that suffices `query`. If `fields`
## is ``[]`` the whole document is yielded.
var f = setupFieldnames(fields)

24
lib/impure/db_mysql.nim
View file

@ -34,7 +34,7 @@ proc dbError*(msg: string) {.noreturn.} =
raise e
when false:
proc dbQueryOpt*(db: TDbConn, query: string, args: openarray[string]) =
proc dbQueryOpt*(db: TDbConn, query: string, args: varargs[string]) =
var stmt = mysql_stmt_init(db)
if stmt == nil: dbError(db)
if mysql_stmt_prepare(stmt, query, len(query)) != 0:
@ -50,7 +50,7 @@ proc dbQuote(s: string): string =
else: add(result, c)
add(result, '\'')
proc dbFormat(formatstr: TSqlQuery, args: openarray[string]): string =
proc dbFormat(formatstr: TSqlQuery, args: varargs[string]): string =
result = ""
var a = 0
for c in items(string(formatstr)):
@ -60,12 +60,12 @@ proc dbFormat(formatstr: TSqlQuery, args: openarray[string]): string =
else:
add(result, c)
proc TryExec*(db: TDbConn, query: TSqlQuery, args: openarray[string]): bool =
proc TryExec*(db: TDbConn, query: TSqlQuery, args: varargs[string]): bool =
## tries to execute the query and returns true if successful, false otherwise.
var q = dbFormat(query, args)
return mysql.RealQuery(db, q, q.len) == 0'i32
proc Exec*(db: TDbConn, query: TSqlQuery, args: openarray[string]) =
proc Exec*(db: TDbConn, query: TSqlQuery, args: varargs[string]) =
## executes the query and raises EDB if not successful.
var q = dbFormat(query, args)
if mysql.RealQuery(db, q, q.len) != 0'i32: dbError(db)
@ -80,7 +80,7 @@ proc properFreeResult(sqlres: mysql.PRES, row: cstringArray) =
mysql.FreeResult(sqlres)
iterator FastRows*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): TRow =
args: varargs[string]): TRow =
## executes the query and iterates over the result dataset. This is very
## fast, but potenially dangerous: If the for-loop-body executes another
## query, the results can be undefined. For MySQL this is the case!.
@ -100,7 +100,7 @@ iterator FastRows*(db: TDbConn, query: TSqlQuery,
properFreeResult(sqlres, row)
proc getRow*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): TRow =
args: varargs[string]): TRow =
## retrieves a single row.
Exec(db, query, args)
var sqlres = mysql.UseResult(db)
@ -115,7 +115,7 @@ proc getRow*(db: TDbConn, query: TSqlQuery,
properFreeResult(sqlres, row)
proc GetAllRows*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): seq[TRow] =
args: varargs[string]): seq[TRow] =
## executes the query and returns the whole result dataset.
result = @[]
Exec(db, query, args)
@ -134,12 +134,12 @@ proc GetAllRows*(db: TDbConn, query: TSqlQuery,
mysql.FreeResult(sqlres)
iterator Rows*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): TRow =
args: varargs[string]): TRow =
## same as `FastRows`, but slower and safe.
for r in items(GetAllRows(db, query, args)): yield r
proc GetValue*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): string =
args: varargs[string]): string =
## executes the query and returns the result dataset's the first column
## of the first row. Returns "" if the dataset contains no rows. This uses
## `FastRows`, so it inherits its fragile behaviour.
@ -149,7 +149,7 @@ proc GetValue*(db: TDbConn, query: TSqlQuery,
break
proc TryInsertID*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): int64 =
args: varargs[string]): int64 =
## executes the query (typically "INSERT") and returns the
## generated ID for the row or -1 in case of an error.
var q = dbFormat(query, args)
@ -158,14 +158,14 @@ proc TryInsertID*(db: TDbConn, query: TSqlQuery,
else:
result = mysql.InsertId(db)
proc InsertID*(db: TDbConn, query: TSqlQuery, args: openArray[string]): int64 =
proc InsertID*(db: TDbConn, query: TSqlQuery, args: varargs[string]): int64 =
## executes the query (typically "INSERT") and returns the
## generated ID for the row.
result = TryInsertID(db, query, args)
if result < 0: dbError(db)
proc ExecAffectedRows*(db: TDbConn, query: TSqlQuery,
args: openArray[string]): int64 =
args: varargs[string]): int64 =
## runs the query (typically "UPDATE") and returns the
## number of affected rows
Exec(db, query, args)

24
lib/impure/db_postgres.nim
View file

@ -49,7 +49,7 @@ proc dbQuote(s: string): string =
else: add(result, c)
add(result, '\'')
proc dbFormat(formatstr: TSqlQuery, args: openarray[string]): string =
proc dbFormat(formatstr: TSqlQuery, args: varargs[string]): string =
result = ""
var a = 0
for c in items(string(formatstr)):
@ -60,14 +60,14 @@ proc dbFormat(formatstr: TSqlQuery, args: openarray[string]): string =
add(result, c)
proc TryExec*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): bool =
args: varargs[string]): bool =
## tries to execute the query and returns true if successful, false otherwise.
var q = dbFormat(query, args)
var res = PQExec(db, q)
result = PQresultStatus(res) == PGRES_COMMAND_OK
PQclear(res)
proc Exec*(db: TDbConn, query: TSqlQuery, args: openarray[string]) =
proc Exec*(db: TDbConn, query: TSqlQuery, args: varargs[string]) =
## executes the query and raises EDB if not successful.
var q = dbFormat(query, args)
var res = PQExec(db, q)
@ -79,7 +79,7 @@ proc newRow(L: int): TRow =
for i in 0..L-1: result[i] = ""
proc setupQuery(db: TDbConn, query: TSqlQuery,
args: openarray[string]): PPGresult =
args: varargs[string]): PPGresult =
var q = dbFormat(query, args)
result = PQExec(db, q)
if PQresultStatus(result) != PGRES_TUPLES_OK: dbError(db)
@ -91,7 +91,7 @@ proc setRow(res: PPGresult, r: var TRow, line, cols: int32) =
add(r[col], x)
iterator FastRows*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): TRow =
args: varargs[string]): TRow =
## executes the query and iterates over the result dataset. This is very
## fast, but potenially dangerous: If the for-loop-body executes another
## query, the results can be undefined. For Postgres it is safe though.
@ -104,7 +104,7 @@ iterator FastRows*(db: TDbConn, query: TSqlQuery,
PQclear(res)
proc getRow*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): TRow =
args: varargs[string]): TRow =
## retrieves a single row.
var res = setupQuery(db, query, args)
var L = PQnfields(res)
@ -113,26 +113,26 @@ proc getRow*(db: TDbConn, query: TSqlQuery,
PQclear(res)
proc GetAllRows*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): seq[TRow] =
args: varargs[string]): seq[TRow] =
## executes the query and returns the whole result dataset.
result = @[]
for r in FastRows(db, query, args):
result.add(r)
iterator Rows*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): TRow =
args: varargs[string]): TRow =
## same as `FastRows`, but slower and safe.
for r in items(GetAllRows(db, query, args)): yield r
proc GetValue*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): string =
args: varargs[string]): string =
## executes the query and returns the result dataset's the first column
## of the first row. Returns "" if the dataset contains no rows.
var x = PQgetvalue(setupQuery(db, query, args), 0, 0)
result = if isNil(x): "" else: $x
proc TryInsertID*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): int64 =
args: varargs[string]): int64 =
## executes the query (typically "INSERT") and returns the
## generated ID for the row or -1 in case of an error. For Postgre this adds
## ``RETURNING id`` to the query, so it only works if your primary key is
@ -144,7 +144,7 @@ proc TryInsertID*(db: TDbConn, query: TSqlQuery,
result = -1
proc InsertID*(db: TDbConn, query: TSqlQuery,
args: openArray[string]): int64 =
args: varargs[string]): int64 =
## executes the query (typically "INSERT") and returns the
## generated ID for the row. For Postgre this adds
## ``RETURNING id`` to the query, so it only works if your primary key is
@ -153,7 +153,7 @@ proc InsertID*(db: TDbConn, query: TSqlQuery,
if result < 0: dbError(db)
proc ExecAffectedRows*(db: TDbConn, query: TSqlQuery,
args: openArray[string]): int64 =
args: varargs[string]): int64 =
## executes the query (typically "UPDATE") and returns the
## number of affected rows.
var q = dbFormat(query, args)

24
lib/impure/db_sqlite.nim
View file

@ -49,7 +49,7 @@ proc dbQuote(s: string): string =
else: add(result, c)
add(result, '\'')
proc dbFormat(formatstr: TSqlQuery, args: openarray[string]): string =
proc dbFormat(formatstr: TSqlQuery, args: varargs[string]): string =
result = ""
var a = 0
for c in items(string(formatstr)):
@ -60,7 +60,7 @@ proc dbFormat(formatstr: TSqlQuery, args: openarray[string]): string =
add(result, c)
proc TryExec*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): bool =
args: varargs[string]): bool =
## tries to execute the query and returns true if successful, false otherwise.
var q = dbFormat(query, args)
var stmt: sqlite3.PStmt
@ -68,7 +68,7 @@ proc TryExec*(db: TDbConn, query: TSqlQuery,
if step(stmt) == SQLITE_DONE:
result = finalize(stmt) == SQLITE_OK
proc Exec*(db: TDbConn, query: TSqlQuery, args: openarray[string]) =
proc Exec*(db: TDbConn, query: TSqlQuery, args: varargs[string]) =
## executes the query and raises EDB if not successful.
if not TryExec(db, query, args): dbError(db)
@ -77,7 +77,7 @@ proc newRow(L: int): TRow =
for i in 0..L-1: result[i] = ""
proc setupQuery(db: TDbConn, query: TSqlQuery,
args: openarray[string]): PStmt =
args: varargs[string]): PStmt =
var q = dbFormat(query, args)
if prepare_v2(db, q, q.len.cint, result, nil) != SQLITE_OK: dbError(db)
@ -89,7 +89,7 @@ proc setRow(stmt: PStmt, r: var TRow, cols: cint) =
if not isNil(x): add(r[col], x)
iterator FastRows*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): TRow =
args: varargs[string]): TRow =
## executes the query and iterates over the result dataset. This is very
## fast, but potenially dangerous: If the for-loop-body executes another
## query, the results can be undefined. For Sqlite it is safe though.
@ -102,7 +102,7 @@ iterator FastRows*(db: TDbConn, query: TSqlQuery,
if finalize(stmt) != SQLITE_OK: dbError(db)
proc getRow*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): TRow =
args: varargs[string]): TRow =
## retrieves a single row.
var stmt = setupQuery(db, query, args)
var L = (columnCount(stmt))
@ -112,19 +112,19 @@ proc getRow*(db: TDbConn, query: TSqlQuery,
if finalize(stmt) != SQLITE_OK: dbError(db)
proc GetAllRows*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): seq[TRow] =
args: varargs[string]): seq[TRow] =
## executes the query and returns the whole result dataset.
result = @[]
for r in FastRows(db, query, args):
result.add(r)
iterator Rows*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): TRow =
args: varargs[string]): TRow =
## same as `FastRows`, but slower and safe.
for r in FastRows(db, query, args): yield r
proc GetValue*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): string =
args: varargs[string]): string =
## executes the query and returns the result dataset's the first column
## of the first row. Returns "" if the dataset contains no rows.
var stmt = setupQuery(db, query, args)
@ -136,7 +136,7 @@ proc GetValue*(db: TDbConn, query: TSqlQuery,
result = ""
proc TryInsertID*(db: TDbConn, query: TSqlQuery,
args: openarray[string]): int64 =
args: varargs[string]): int64 =
## executes the query (typically "INSERT") and returns the
## generated ID for the row or -1 in case of an error.
if tryExec(db, query, args):
@ -145,7 +145,7 @@ proc TryInsertID*(db: TDbConn, query: TSqlQuery,
result = -1
proc InsertID*(db: TDbConn, query: TSqlQuery,
args: openArray[string]): int64 =
args: varargs[string]): int64 =
## executes the query (typically "INSERT") and returns the
## generated ID for the row. For Postgre this adds
## ``RETURNING id`` to the query, so it only works if your primary key is
@ -154,7 +154,7 @@ proc InsertID*(db: TDbConn, query: TSqlQuery,
if result < 0: dbError(db)
proc ExecAffectedRows*(db: TDbConn, query: TSqlQuery,
args: openArray[string]): int64 =
args: varargs[string]): int64 =
## executes the query (typically "UPDATE") and returns the
## number of affected rows.
Exec(db, query, args)