diff options
| -rwxr-xr-x | lib/impure/db_mysql.nim | 23 | ||||
| -rwxr-xr-x | lib/impure/db_postgres.nim | 20 | ||||
| -rwxr-xr-x | lib/impure/db_sqlite.nim | 20 |
3 files changed, 32 insertions, 31 deletions
diff --git a/lib/impure/db_mysql.nim b/lib/impure/db_mysql.nim index 2b63137c8..6284b7995 100755 --- a/lib/impure/db_mysql.nim +++ b/lib/impure/db_mysql.nim @@ -34,7 +34,7 @@ proc dbError*(msg: string) {.noreturn.} = raise e when false: - proc dbQueryOpt*(db: TDbConn, query: string, args: varargs[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: @@ -60,12 +60,12 @@ proc dbFormat(formatstr: TSqlQuery, args: varargs[string]): string = else: add(result, c) -proc TryExec*(db: TDbConn, query: TSqlQuery, args: varargs[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: varargs[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: 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 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: varargs[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: varargs[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: varargs[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: 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. 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: 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. var q = dbFormat(query, args) @@ -158,14 +158,15 @@ proc TryInsertID*(db: TDbConn, query: TSqlQuery, else: result = mysql.InsertId(db) -proc InsertID*(db: TDbConn, query: TSqlQuery, args: varargs[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: varargs[string]): int64 = + args: varargs[string, `$`]): int64 = ## runs the query (typically "UPDATE") and returns the ## number of affected rows Exec(db, query, args) diff --git a/lib/impure/db_postgres.nim b/lib/impure/db_postgres.nim index 46909b9b2..cb8da75b8 100755 --- a/lib/impure/db_postgres.nim +++ b/lib/impure/db_postgres.nim @@ -60,14 +60,14 @@ 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 res = PQExec(db, q) result = PQresultStatus(res) == PGRES_COMMAND_OK PQclear(res) -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. var q = dbFormat(query, args) var res = PQExec(db, q) @@ -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: 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 Postgres it is safe though. @@ -104,7 +104,7 @@ iterator FastRows*(db: TDbConn, query: TSqlQuery, PQclear(res) proc getRow*(db: TDbConn, query: TSqlQuery, - args: varargs[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: 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 items(GetAllRows(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 x = PQgetvalue(setupQuery(db, query, args), 0, 0) result = if isNil(x): "" else: $x 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. 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: 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 @@ -153,7 +153,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. var q = dbFormat(query, args) diff --git a/lib/impure/db_sqlite.nim b/lib/impure/db_sqlite.nim index d3ff3c0d2..4abc2ca97 100755 --- a/lib/impure/db_sqlite.nim +++ b/lib/impure/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) |