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

Revert "fix db_sqlite.tryInsertID does raise exceptions in 1.6.0 #19743 (#19744)" (#19745)

Browse source 
This reverts commit b10f0e7bca.
This commit is contained in:
Andreas Rumpf 2022-04-25 11:59:37 +02:00 • committed by GitHub
commit ee0a470294
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/impure/db_sqlite.nim
View file

@ -635,7 +635,7 @@ proc getValue*(db: DbConn, stmtName: SqlPrepared): string
proc tryInsertID*(db: DbConn, query: SqlQuery, proc tryInsertID*(db: DbConn, query: SqlQuery,
args: varargs[string, `$`]): int64 args: varargs[string, `$`]): int64
{.tags: [WriteDbEffect], raises: [].} = {.tags: [WriteDbEffect], raises: [DbError].} =
## Executes the query (typically "INSERT") and returns the ## Executes the query (typically "INSERT") and returns the
## generated ID for the row or -1 in case of an error. ## generated ID for the row or -1 in case of an error.
## ##
@ -650,10 +650,9 @@ proc tryInsertID*(db: DbConn, query: SqlQuery,
## 1, "item#1") == -1 ## 1, "item#1") == -1
## db.close() ## db.close()
assert(not db.isNil, "Database not connected.") assert(not db.isNil, "Database not connected.")
result = -1
try:
var q = dbFormat(query, args) var q = dbFormat(query, args)
var stmt: sqlite3.PStmt var stmt: sqlite3.PStmt
result = -1
if prepare_v2(db, q, q.len.cint, stmt, nil) == SQLITE_OK: if prepare_v2(db, q, q.len.cint, stmt, nil) == SQLITE_OK:
if step(stmt) == SQLITE_DONE: if step(stmt) == SQLITE_DONE:
result = last_insert_rowid(db) result = last_insert_rowid(db)
@ -661,8 +660,6 @@ proc tryInsertID*(db: DbConn, query: SqlQuery,
result = -1 result = -1
else: else:
discard finalize(stmt) discard finalize(stmt)
except DbError:
discard
proc insertID*(db: DbConn, query: SqlQuery, proc insertID*(db: DbConn, query: SqlQuery,
args: varargs[string, `$`]): int64 {.tags: [WriteDbEffect].} = args: varargs[string, `$`]): int64 {.tags: [WriteDbEffect].} =
@ -695,7 +692,7 @@ proc insertID*(db: DbConn, query: SqlQuery,
proc tryInsert*(db: DbConn, query: SqlQuery, pkName: string, proc tryInsert*(db: DbConn, query: SqlQuery, pkName: string,
args: varargs[string, `$`]): int64 args: varargs[string, `$`]): int64
{.tags: [WriteDbEffect], raises: [], since: (1, 3).} = {.tags: [WriteDbEffect], raises: [DbError], since: (1, 3).} =
## same as tryInsertID ## same as tryInsertID
tryInsertID(db, query, args) tryInsertID(db, query, args)