From: Jonas Bernoulli <jonas@bernoul.li>
To: 58363@debbugs.gnu.org
Subject: bug#58363: [PATCH 3/3] Improve error data signaled by sqlite-execute et al.
Date: Fri, 21 Oct 2022 23:06:36 +0200 [thread overview]
Message-ID: <20221021210636.13329-4-jonas@bernoul.li> (raw)
In-Reply-To: <20221021210636.13329-1-jonas@bernoul.li>
* src/sqlite.c (load_dll_functions): Update.
(sqlite_prepare_errdata): New function.
(sqlite_prepare_errmsg): Remove function.
(sqlite-execute, sqlite-select): Use new function.
---
src/sqlite.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/sqlite.c b/src/sqlite.c
index 78b261fb08..d6cb38a29a 100644
--- a/src/sqlite.c
+++ b/src/sqlite.c
@@ -50,6 +50,7 @@ DEF_DLL_FN (SQLITE_API int, sqlite3_bind_int64,
DEF_DLL_FN (SQLITE_API int, sqlite3_bind_double, (sqlite3_stmt*, int, double));
DEF_DLL_FN (SQLITE_API int, sqlite3_bind_null, (sqlite3_stmt*, int));
DEF_DLL_FN (SQLITE_API int, sqlite3_bind_int, (sqlite3_stmt*, int, int));
+DEF_DLL_FN (SQLITE_API int, sqlite3_extended_errcode, (sqlite3*));
DEF_DLL_FN (SQLITE_API const char*, sqlite3_errmsg, (sqlite3*));
DEF_DLL_FN (SQLITE_API const char*, sqlite3_errstr, (int));
DEF_DLL_FN (SQLITE_API int, sqlite3_step, (sqlite3_stmt*));
@@ -88,6 +89,7 @@ DEF_DLL_FN (SQLITE_API int, sqlite3_load_extension,
# undef sqlite3_bind_double
# undef sqlite3_bind_null
# undef sqlite3_bind_int
+# undef sqlite3_extended_errcode
# undef sqlite3_errmsg
# undef sqlite3_errstr
# undef sqlite3_step
@@ -113,6 +115,7 @@ DEF_DLL_FN (SQLITE_API int, sqlite3_load_extension,
# define sqlite3_bind_double fn_sqlite3_bind_double
# define sqlite3_bind_null fn_sqlite3_bind_null
# define sqlite3_bind_int fn_sqlite3_bind_int
+# define sqlite3_extended_errcode fn_sqlite3_extended_errcode
# define sqlite3_errmsg fn_sqlite3_errmsg
# define sqlite3_errstr fn_sqlite3_errstr
# define sqlite3_step fn_sqlite3_step
@@ -141,6 +144,7 @@ load_dll_functions (HMODULE library)
LOAD_DLL_FN (library, sqlite3_bind_double);
LOAD_DLL_FN (library, sqlite3_bind_null);
LOAD_DLL_FN (library, sqlite3_bind_int);
+ LOAD_DLL_FN (library, sqlite3_extended_errcode);
LOAD_DLL_FN (library, sqlite3_errmsg);
LOAD_DLL_FN (library, sqlite3_errstr);
LOAD_DLL_FN (library, sqlite3_step);
@@ -422,16 +426,15 @@ row_to_value (sqlite3_stmt *stmt)
}
static Lisp_Object
-sqlite_prepare_errmsg (int code, sqlite3 *sdb)
+sqlite_prepare_errdata (int code, sqlite3 *sdb)
{
- Lisp_Object errmsg = build_string (sqlite3_errstr (code));
+ Lisp_Object errstr = build_string (sqlite3_errstr (code));
+ Lisp_Object errcode = make_fixnum (code);
/* More details about what went wrong. */
- const char *sql_error = sqlite3_errmsg (sdb);
- if (sql_error)
- return CALLN (Fformat, build_string ("%s (%s)"),
- errmsg, build_string (sql_error));
- else
- return errmsg;
+ Lisp_Object ext_errcode = make_fixnum (sqlite3_extended_errcode (sdb));
+ const char *errmsg = sqlite3_errmsg (sdb);
+ return list4 (errstr, errmsg ? build_string (errmsg) : Qnil,
+ errcode, ext_errcode);
}
DEFUN ("sqlite-execute", Fsqlite_execute, Ssqlite_execute, 2, 3, 0,
@@ -466,7 +469,7 @@ DEFUN ("sqlite-execute", Fsqlite_execute, Ssqlite_execute, 2, 3, 0,
sqlite3_reset (stmt);
}
- errmsg = sqlite_prepare_errmsg (ret, sdb);
+ errmsg = sqlite_prepare_errdata (ret, sdb);
goto exit;
}
@@ -553,7 +556,7 @@ DEFUN ("sqlite-select", Fsqlite_select, Ssqlite_select, 2, 4, 0,
{
if (stmt)
sqlite3_finalize (stmt);
- errmsg = sqlite_prepare_errmsg (ret, sdb);
+ errmsg = sqlite_prepare_errdata (ret, sdb);
goto exit;
}
--
2.38.0
next prev parent reply other threads:[~2022-10-21 21:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-07 18:52 bug#58363: 29.0.50; sqlite-select does not signal errors and errors should be improved Jonas Bernoulli
2022-10-08 13:41 ` Lars Ingebrigtsen
2022-10-08 14:35 ` Eli Zaretskii
2022-10-08 14:51 ` Lars Ingebrigtsen
2022-10-08 22:47 ` Jonas Bernoulli
2022-10-09 14:18 ` Lars Ingebrigtsen
2022-10-10 10:56 ` Jonas Bernoulli
2022-10-11 0:23 ` Lars Ingebrigtsen
2022-10-14 17:52 ` Jonas Bernoulli
2022-10-21 21:06 ` bug#58363: [PATCH 0/3] Improve error data signaled by sqlite-execute et al Jonas Bernoulli
2022-10-21 21:06 ` bug#58363: [PATCH 1/3] Use xsignal1 as required by argument type Jonas Bernoulli
2022-10-22 6:45 ` Eli Zaretskii
2022-10-22 10:45 ` Jonas Bernoulli
2022-10-22 11:45 ` Eli Zaretskii
2022-10-22 15:32 ` Jonas Bernoulli
2022-10-22 15:59 ` Eli Zaretskii
2022-10-21 21:06 ` bug#58363: [PATCH 2/3] Introduce a new sqlite-error Jonas Bernoulli
2022-10-22 9:14 ` Michael Albinus
2022-10-22 10:47 ` Jonas Bernoulli
2022-10-21 21:06 ` Jonas Bernoulli [this message]
2022-10-22 6:49 ` bug#58363: [PATCH 3/3] Improve error data signaled by sqlite-execute et al Eli Zaretskii
2022-10-22 11:07 ` Jonas Bernoulli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221021210636.13329-4-jonas@bernoul.li \
--to=jonas@bernoul.li \
--cc=58363@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).