diff --git a/src/db_sqlite.nim b/src/db_sqlite.nim index d3ff3c0d25..4abc2ca979 100755 --- a/src/db_sqlite.nim +++ b/src/db_sqlite.nim @@ -60,7 +60,7 @@ proc dbFormat(formatstr: TSqlQuery, args: varargs[string]): string = add(result, c) proc TryExec*(db: TDbConn, query: TSqlQuery, - args: varargs[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: varargs[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) @@ -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: varargs[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: varargs[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: varargs[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: varargs[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: varargs[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) @@ -140,7 +140,7 @@ proc GetValue*(db: TDbConn, query: TSqlQuery, result = "" proc TryInsertID*(db: TDbConn, query: TSqlQuery, - args: varargs[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): @@ -149,7 +149,7 @@ proc TryInsertID*(db: TDbConn, query: TSqlQuery, result = -1 proc InsertID*(db: TDbConn, query: TSqlQuery, - args: varargs[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 @@ -158,7 +158,7 @@ proc InsertID*(db: TDbConn, query: TSqlQuery, if result < 0: dbError(db) proc ExecAffectedRows*(db: TDbConn, query: TSqlQuery, - args: varargs[string]): int64 = + args: varargs[string, `$`]): int64 = ## executes the query (typically "UPDATE") and returns the ## number of affected rows. Exec(db, query, args)