[nongnu] elpa/emacsql ccfafd7703 012/427: Always quote non-number values.

[ELPA Syncer]

branch: elpa/emacsql
commit ccfafd7703e8aa4857d5b37cfbe4e967bc0c385a
Author: Christopher Wellons <wellons@nullprogram.com>
Commit: Christopher Wellons <wellons@nullprogram.com>

    Always quote non-number values.
---
 emacsql.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/emacsql.el b/emacsql.el
index 54ff313d41..35834fb399 100644
--- a/emacsql.el
+++ b/emacsql.el
@@ -171,15 +171,16 @@ If FLATTEN is non-nil, don't include column names."
                collect row into rows and do (setf row ())
                finally (return rows)))))
 
-(defun emacsql-escape (identifier)
-  "Escape an identifier."
+(defun emacsql-escape (identifier &optional force)
+  "Escape an identifier, always with quotes when FORCE is non-nil."
   (let ((string (if (stringp identifier)
                     identifier
-                  (format "%S" identifier))))
+                  (format "%S" identifier)))
+        (forbidden "[]-\000-\040!\"#%&'()*+,./:;<=>?@[\\^`{|}~\177]"))
     (when (string-match-p "\n" string)
       (error "Newlines not permitted in identifiers by emacsql."))
-    (if (or (string-match-p "[]-\000-\040!\"#%&'()*+,./:;<=>?@[\\^`{|}~\177]"
-                            string)
+    (if (or force
+            (string-match-p forbidden string)
             (string-match-p "^[0-9$]" string))
         (format "'%s'" (replace-regexp-in-string "'" "''" string))
       string)))
@@ -232,7 +233,7 @@ If FLATTEN is non-nil, don't include column names."
   (let ((print-escape-newlines t))
     (if (numberp value)
         (prin1-to-string value)
-      (emacsql-escape (prin1-to-string value)))))
+      (emacsql-escape (prin1-to-string value) t))))
 
 (defun emacsql-insert (emacsql table &rest rows)
   "Insert ROWS into TABLE.