summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-04-16 09:25:30 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-04-16 09:25:30 +0200
commitc3cdbbff9b654823ffd669177126eb438841dd49 (patch)
treed2eab924c21ca0df271d256f34363fe26a916956
parentbe90287802f10ebed731b0fb440e9c876853b867 (diff)
parent93972c9845b049806ccd8e9e21196cfb4f6f6d0f (diff)
downloadorg-mode-c3cdbbff9b654823ffd669177126eb438841dd49.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ob-sql.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index ec0427f..2c97384 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -149,14 +149,14 @@ SQL Server on Windows and Linux platform."
" "))
(defun org-babel-sql-convert-standard-filename (file)
- "Convert the file name to OS standard.
+ "Convert FILE to OS standard file name.
If in Cygwin environment, uses Cygwin specific function to
-convert the file name. Otherwise, uses Emacs' standard conversion
-function."
- (format "\"%s\""
- (if (fboundp 'cygwin-convert-file-name-to-windows)
- (cygwin-convert-file-name-to-windows file)
- (convert-standard-filename file))))
+convert the file name. In a Windows-NT environment, do nothing.
+Otherwise, use Emacs' standard conversion function."
+ (cond ((fboundp 'cygwin-convert-file-name-to-windows)
+ (format "%S" (cygwin-convert-file-name-to-windows file)))
+ ((string= "windows-nt" system-type) file)
+ (t (format "%S" (convert-standard-filename file)))))
(defun org-babel-execute:sql (body params)
"Execute a block of Sql code with Babel.