Bladeren bron

ob-sql.el: Clean mysql parameters generation

* lisp/ob-sql.el (dbstring-mysql): Rename function and tweak a bit its
  implementation
  (org-babel-execute:sql): Use new function name

Prefix `dbstring-mysql' function with the namespace "org-babel-sql" to
avoid name collisions.

Also replace the call to `remq' by `delq' because it is a bit more
efficient, and also to be consistent with
`org-babel-sql-dbstring-postgresql'.
Steven Rémot 10 jaren geleden
bovenliggende
commit
e228cd1060
1 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 3 3
      lisp/ob-sql.el

+ 3 - 3
lisp/ob-sql.el

@@ -78,10 +78,10 @@
   (org-babel-sql-expand-vars
   (org-babel-sql-expand-vars
    body (mapcar #'cdr (org-babel-get-header params :var))))
    body (mapcar #'cdr (org-babel-get-header params :var))))
 
 
-(defun dbstring-mysql (host user password database)
+(defun org-babel-sql-dbstring-mysql (host user password database)
   "Make MySQL cmd line args for database connection.  Pass nil to omit that arg."
   "Make MySQL cmd line args for database connection.  Pass nil to omit that arg."
   (combine-and-quote-strings
   (combine-and-quote-strings
-   (remq nil
+   (delq nil
 	 (list (when host     (concat "-h" host))
 	 (list (when host     (concat "-h" host))
 	       (when user     (concat "-u" user))
 	       (when user     (concat "-u" user))
 	       (when password (concat "-p" password))
 	       (when password (concat "-p" password))
@@ -126,7 +126,7 @@ This function is called by `org-babel-execute-src-block'."
                                      (org-babel-process-file-name in-file)
                                      (org-babel-process-file-name in-file)
                                      (org-babel-process-file-name out-file)))
                                      (org-babel-process-file-name out-file)))
                     ('mysql (format "mysql %s %s %s < %s > %s"
                     ('mysql (format "mysql %s %s %s < %s > %s"
-				    (dbstring-mysql dbhost dbuser dbpassword database)
+				    (org-babel-sql-dbstring-mysql dbhost dbuser dbpassword database)
 				    (if colnames-p "" "-N")
 				    (if colnames-p "" "-N")
                                     (or cmdline "")
                                     (or cmdline "")
 				    (org-babel-process-file-name in-file)
 				    (org-babel-process-file-name in-file)