Skip to content

Commit 14c6c1c

Browse files
Araqringabout
authored andcommitted
Revert "fix db_sqlite.tryInsertID does raise exceptions in 1.6.0 #19743 (#19744)" (#19745)
This reverts commit b10f0e7.
1 parent 33f668c commit 14c6c1c

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

src/db_sqlite.nim

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ proc getValue*(db: DbConn, stmtName: SqlPrepared): string
635635

636636
proc tryInsertID*(db: DbConn, query: SqlQuery,
637637
args: varargs[string, `$`]): int64
638-
{.tags: [WriteDbEffect], raises: [].} =
638+
{.tags: [WriteDbEffect], raises: [DbError].} =
639639
## Executes the query (typically "INSERT") and returns the
640640
## generated ID for the row or -1 in case of an error.
641641
##
@@ -650,19 +650,16 @@ proc tryInsertID*(db: DbConn, query: SqlQuery,
650650
## 1, "item#1") == -1
651651
## db.close()
652652
assert(not db.isNil, "Database not connected.")
653+
var q = dbFormat(query, args)
654+
var stmt: sqlite3.PStmt
653655
result = -1
654-
try:
655-
var q = dbFormat(query, args)
656-
var stmt: sqlite3.PStmt
657-
if prepare_v2(db, q, q.len.cint, stmt, nil) == SQLITE_OK:
658-
if step(stmt) == SQLITE_DONE:
659-
result = last_insert_rowid(db)
660-
if finalize(stmt) != SQLITE_OK:
661-
result = -1
662-
else:
663-
discard finalize(stmt)
664-
except DbError:
665-
discard
656+
if prepare_v2(db, q, q.len.cint, stmt, nil) == SQLITE_OK:
657+
if step(stmt) == SQLITE_DONE:
658+
result = last_insert_rowid(db)
659+
if finalize(stmt) != SQLITE_OK:
660+
result = -1
661+
else:
662+
discard finalize(stmt)
666663

667664
proc insertID*(db: DbConn, query: SqlQuery,
668665
args: varargs[string, `$`]): int64 {.tags: [WriteDbEffect].} =
@@ -695,7 +692,7 @@ proc insertID*(db: DbConn, query: SqlQuery,
695692

696693
proc tryInsert*(db: DbConn, query: SqlQuery, pkName: string,
697694
args: varargs[string, `$`]): int64
698-
{.tags: [WriteDbEffect], raises: [], since: (1, 3).} =
695+
{.tags: [WriteDbEffect], raises: [DbError], since: (1, 3).} =
699696
## same as tryInsertID
700697
tryInsertID(db, query, args)
701698

0 commit comments

Comments
 (0)