suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the code to pass through the prep-status to the outer HANDLE so

Browse Source 
error reporting is uniformly handled and any SQL_BUSY errors are properly identified.
This commit is contained in:
Alexander McLin 2017-06-22 13:26:12 -04:00 committed by Ryan Culpepper
parent ed481865cf
commit 113049607a
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
racket/collects/db/private/sqlite3/connection.rkt
View File

@ -208,22 +208,20 @@
(let*-values ([(db) (get-db fsym)]
[(prep-status stmt)
(HANDLE fsym
;; Do not allow break/kill between prepare and
;; entry of stmt in table.
(A (let-values ([(prep-status stmt tail?)
(sqlite3_prepare_v2 db sql)])
(cond
[(not (= 0 prep-status))
(when stmt (sqlite3_finalize stmt))
(error* fsym (get-error-message)
'("given" value) sql)]
[else
(when tail?
(when stmt (sqlite3_finalize stmt))
(error* fsym "multiple statements given"
'("given" value) sql))])
(when stmt (hash-set! stmt-table stmt #t))
(values prep-status stmt))))])
;; Do not allow break/kill between prepare and
;; entry of stmt in table.
(A (let-values ([(prep-status stmt tail?)
(sqlite3_prepare_v2 db sql)])
(cond [(not (zero? prep-status))
(when stmt (sqlite3_finalize stmt))
(values prep-status #f)]
[tail?
(when stmt (sqlite3_finalize stmt))
(error* fsym "multiple statements given"
'("given" value) sql)]
[else
(when stmt (hash-set! stmt-table stmt #t))
(values prep-status stmt)]))))])
(when DEBUG?
(dprintf " << prepared statement #x~x\n" (cast stmt _pointer _uintptr)))
(unless stmt (error* fsym "SQL syntax error" '("given" value) sql))