mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Quote identifiers in SQL queries in 'sqlite-mode'

Browse source 
* lisp/sqlite-mode.el: (sqlite-mode-list-tables)
(sqlite-mode-list-columns, sqlite--mode--list-data)
(sqlite-mode-delete): Quote identifiers (table and column
names) in the SQL queries.  Fixes, e.g., opening databases
which have a table called "values".  (Bug#75598)
This commit is contained in:
Vladimir Panteleev 2025-01-15 18:33:23 +00:00 • committed by Eli Zaretskii
parent 13fdcd730f
commit 5e0fc49f3b
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/sqlite-mode.el
View file

@ -76,7 +76,7 @@
(erase-buffer) (erase-buffer)
(dolist (table (sqlite-select db "select name from sqlite_master where type = 'table' and name not like 'sqlite_%' order by name")) (dolist (table (sqlite-select db "select name from sqlite_master where type = 'table' and name not like 'sqlite_%' order by name"))
(push (list (car table) (push (list (car table)
(caar (sqlite-select db (format "select count(*) from %s" (caar (sqlite-select db (format "select count(*) from \"%s\""
(car table))))) (car table)))))
entries)) entries))
(sqlite-mode--tablify '("Table Name" "Number of Rows") (sqlite-mode--tablify '("Table Name" "Number of Rows")
@ -137,7 +137,7 @@
(defun sqlite-mode--column-names (table) (defun sqlite-mode--column-names (table)
"Return a list of the column names for TABLE." "Return a list of the column names for TABLE."
(mapcar (lambda (row) (nth 1 row)) (sqlite-select sqlite--db (format "pragma table_info(%s)" table)))) (mapcar (lambda (row) (nth 1 row)) (sqlite-select sqlite--db (format "pragma table_info(\"%s\")" table))))
(defun sqlite-mode-list-data () (defun sqlite-mode-list-data ()
"List the data from the table under point." "List the data from the table under point."
@ -171,7 +171,7 @@
(setq stmt (setq stmt
(sqlite-select (sqlite-select
sqlite--db sqlite--db
(format "select rowid, * from %s where rowid >= ?" table) (format "select rowid, * from \"%s\" where rowid >= ?" table)
(list rowid) (list rowid)
'set)) 'set))
(sqlite-mode--tablify (sqlite-columns stmt) (sqlite-mode--tablify (sqlite-columns stmt)
@ -201,11 +201,11 @@
(user-error "Not deleting")) (user-error "Not deleting"))
(sqlite-execute (sqlite-execute
sqlite--db sqlite--db
(format "delete from %s where %s" (format "delete from \"%s\" where %s"
(cdr table) (cdr table)
(string-join (string-join
(mapcar (lambda (column) (mapcar (lambda (column)
(format "%s = ?" (car (split-string column " ")))) (format "\"%s\" = ?" (car (split-string column " "))))
(cons "rowid" (sqlite-mode--column-names (cdr table)))) (cons "rowid" (sqlite-mode--column-names (cdr table))))
" and ")) " and "))
row) row)