From 396313cd1caaae71ef215aa9f509c2a4f0e975db Mon Sep 17 00:00:00 2001 From: Javier Olaechea Date: Sun, 31 Mar 2024 23:07:10 -0500 Subject: [PATCH] Add sqlite-execute-batch command This command is similar to sqlite-execute except that it executes multiple statements in exchange for not accepting any arguments. * doc/lispref/text.texi (Database): Document it. * src/sqlite.c (Fsqlite_execute_batch): Add sqlite_execute_batch command. It is similar to sqlite-execute but it executes all the statements in the query. Unlike sqlite-execute the command doesn't take any arguments to pass down to the statements. * test/src/sqlite-tests.el (sqlite-multiple-statements): Add smoke test for sqlite-execute-batch. * etc/NEWS: Mention new command 'sqlite-execute-batch'. --- doc/lispref/text.texi | 8 ++++++++ etc/NEWS | 6 ++++++ src/sqlite.c | 12 ++++++++++++ test/src/sqlite-tests.el | 26 ++++++++++++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 0cd4e2c614e..a1580789d58 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -5414,6 +5414,14 @@ Database @end defun +@defun sqlite-execute-batch db statements +Execute the @acronym{SQL} @var{statements}. @var{statements} is a +string containing 0 or more @acronym{SQL} statements. This command +might be useful when we want to execute multiple @acronym{DDL} +statements. + +@end defun + @defun sqlite-select db query &optional values return-type Select some data from @var{db} and return them. For instance: diff --git a/etc/NEWS b/etc/NEWS index 7a73815179c..c2a43408da2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -424,6 +424,12 @@ Use 'TAB' in the minibuffer to show or hide the password. Likewise, there is an icon on the mode-line, which toggles the visibility of the password when clicking with 'mouse-1'. +** New command 'sqlite-execute-batch'. +This command lets the user execute multiple SQL commands in one +command. It is useful when the user wants to evaluate an entire SQL +file. + ++++ * Editing Changes in Emacs 30.1 diff --git a/src/sqlite.c b/src/sqlite.c index 261080da673..c606fa5f831 100644 --- a/src/sqlite.c +++ b/src/sqlite.c @@ -646,6 +646,17 @@ sqlite_exec (sqlite3 *sdb, const char *query) return Qt; } +DEFUN ("sqlite-execute-batch", Fsqlite_execute_batch, Ssqlite_execute_batch, 2, 2, 0, + doc: /* Execute multiple SQL statements in DB. +Query is a string containing 0 or more SQL statements. */) + (Lisp_Object db, Lisp_Object query) +{ + check_sqlite (db, false); + CHECK_STRING (query); + Lisp_Object encoded = encode_string(query); + return sqlite_exec (XSQLITE (db)->db, SSDATA (encoded)); +} + DEFUN ("sqlite-transaction", Fsqlite_transaction, Ssqlite_transaction, 1, 1, 0, doc: /* Start a transaction in DB. */) (Lisp_Object db) @@ -866,6 +877,7 @@ syms_of_sqlite (void) defsubr (&Ssqlite_close); defsubr (&Ssqlite_execute); defsubr (&Ssqlite_select); + defsubr (&Ssqlite_execute_batch); defsubr (&Ssqlite_transaction); defsubr (&Ssqlite_commit); defsubr (&Ssqlite_rollback); diff --git a/test/src/sqlite-tests.el b/test/src/sqlite-tests.el index a10dca9a0c9..e87a5fc77b1 100644 --- a/test/src/sqlite-tests.el +++ b/test/src/sqlite-tests.el @@ -261,4 +261,30 @@ sqlite-returning '("Joe" "Doe")) '((1 "Joe"))))))) +(ert-deftest sqlite-multiple-statements () + (skip-unless (sqlite-available-p)) + (let ((db (sqlite-open nil)) + (query (with-temp-buffer + (insert "-- -*- sql-product: sqlite -*- + +-- I 💘 emojis + +CREATE TABLE settings ( + name TEXT NOT NULL, + value TEXT, + section TEXT NOT NULL, + PRIMARY KEY (section, name) +); + +CREATE TABLE tags📎 ( + name TEXT PRIMARY KEY NOT NULL +); + +-- CREATE TABLE todo_states (id INTEGER PRIMARY KEY, name TEXT NOT NULL); +") + (buffer-string)))) + (sqlite-execute-batch db query) + (should (equal '(("settings") ("tags📎")) + (sqlite-select db "select name from sqlite_master where type = 'table' and name not like 'sqlite_%' order by name"))))) + ;;; sqlite-tests.el ends here -- 2.29.2.154.g7f7ebe054a