aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org/ob-sql.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org/ob-sql.el')
-rw-r--r--lisp/org/ob-sql.el34
1 files changed, 17 insertions, 17 deletions
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index cdedf7edfb8..959ede3decc 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -175,16 +175,16 @@ This function is called by `org-babel-execute-src-block'."
175 (org-babel-temp-file "sql-out-"))) 175 (org-babel-temp-file "sql-out-")))
176 (header-delim "") 176 (header-delim "")
177 (command (pcase (intern engine) 177 (command (pcase (intern engine)
178 ('dbi (format "dbish --batch %s < %s | sed '%s' > %s" 178 (`dbi (format "dbish --batch %s < %s | sed '%s' > %s"
179 (or cmdline "") 179 (or cmdline "")
180 (org-babel-process-file-name in-file) 180 (org-babel-process-file-name in-file)
181 "/^+/d;s/^|//;s/(NULL)/ /g;$d" 181 "/^+/d;s/^|//;s/(NULL)/ /g;$d"
182 (org-babel-process-file-name out-file))) 182 (org-babel-process-file-name out-file)))
183 ('monetdb (format "mclient -f tab %s < %s > %s" 183 (`monetdb (format "mclient -f tab %s < %s > %s"
184 (or cmdline "") 184 (or cmdline "")
185 (org-babel-process-file-name in-file) 185 (org-babel-process-file-name in-file)
186 (org-babel-process-file-name out-file))) 186 (org-babel-process-file-name out-file)))
187 ('mssql (format "sqlcmd %s -s \"\t\" %s -i %s -o %s" 187 (`mssql (format "sqlcmd %s -s \"\t\" %s -i %s -o %s"
188 (or cmdline "") 188 (or cmdline "")
189 (org-babel-sql-dbstring-mssql 189 (org-babel-sql-dbstring-mssql
190 dbhost dbuser dbpassword database) 190 dbhost dbuser dbpassword database)
@@ -192,14 +192,14 @@ This function is called by `org-babel-execute-src-block'."
192 (org-babel-process-file-name in-file)) 192 (org-babel-process-file-name in-file))
193 (org-babel-sql-convert-standard-filename 193 (org-babel-sql-convert-standard-filename
194 (org-babel-process-file-name out-file)))) 194 (org-babel-process-file-name out-file))))
195 ('mysql (format "mysql %s %s %s < %s > %s" 195 (`mysql (format "mysql %s %s %s < %s > %s"
196 (org-babel-sql-dbstring-mysql 196 (org-babel-sql-dbstring-mysql
197 dbhost dbport dbuser dbpassword database) 197 dbhost dbport dbuser dbpassword database)
198 (if colnames-p "" "-N") 198 (if colnames-p "" "-N")
199 (or cmdline "") 199 (or cmdline "")
200 (org-babel-process-file-name in-file) 200 (org-babel-process-file-name in-file)
201 (org-babel-process-file-name out-file))) 201 (org-babel-process-file-name out-file)))
202 ('postgresql (format 202 (`postgresql (format
203 "%spsql --set=\"ON_ERROR_STOP=1\" %s -A -P \ 203 "%spsql --set=\"ON_ERROR_STOP=1\" %s -A -P \
204footer=off -F \"\t\" %s -f %s -o %s %s" 204footer=off -F \"\t\" %s -f %s -o %s %s"
205 (if dbpassword 205 (if dbpassword
@@ -211,7 +211,7 @@ footer=off -F \"\t\" %s -f %s -o %s %s"
211 (org-babel-process-file-name in-file) 211 (org-babel-process-file-name in-file)
212 (org-babel-process-file-name out-file) 212 (org-babel-process-file-name out-file)
213 (or cmdline ""))) 213 (or cmdline "")))
214 ('sqsh (format "sqsh %s %s -i %s -o %s -m csv" 214 (`sqsh (format "sqsh %s %s -i %s -o %s -m csv"
215 (or cmdline "") 215 (or cmdline "")
216 (org-babel-sql-dbstring-sqsh 216 (org-babel-sql-dbstring-sqsh
217 dbhost dbuser dbpassword database) 217 dbhost dbuser dbpassword database)
@@ -219,13 +219,13 @@ footer=off -F \"\t\" %s -f %s -o %s %s"
219 (org-babel-process-file-name in-file)) 219 (org-babel-process-file-name in-file))
220 (org-babel-sql-convert-standard-filename 220 (org-babel-sql-convert-standard-filename
221 (org-babel-process-file-name out-file)))) 221 (org-babel-process-file-name out-file))))
222 ('vertica (format "vsql %s -f %s -o %s %s" 222 (`vertica (format "vsql %s -f %s -o %s %s"
223 (org-babel-sql-dbstring-vertica 223 (org-babel-sql-dbstring-vertica
224 dbhost dbport dbuser dbpassword database) 224 dbhost dbport dbuser dbpassword database)
225 (org-babel-process-file-name in-file) 225 (org-babel-process-file-name in-file)
226 (org-babel-process-file-name out-file) 226 (org-babel-process-file-name out-file)
227 (or cmdline ""))) 227 (or cmdline "")))
228 ('oracle (format 228 (`oracle (format
229 "sqlplus -s %s < %s > %s" 229 "sqlplus -s %s < %s > %s"
230 (org-babel-sql-dbstring-oracle 230 (org-babel-sql-dbstring-oracle
231 dbhost dbport dbuser dbpassword database) 231 dbhost dbport dbuser dbpassword database)
@@ -235,8 +235,8 @@ footer=off -F \"\t\" %s -f %s -o %s %s"
235 (with-temp-file in-file 235 (with-temp-file in-file
236 (insert 236 (insert
237 (pcase (intern engine) 237 (pcase (intern engine)
238 ('dbi "/format partbox\n") 238 (`dbi "/format partbox\n")
239 ('oracle "SET PAGESIZE 50000 239 (`oracle "SET PAGESIZE 50000
240SET NEWPAGE 0 240SET NEWPAGE 0
241SET TAB OFF 241SET TAB OFF
242SET SPACE 0 242SET SPACE 0
@@ -249,10 +249,10 @@ SET MARKUP HTML OFF SPOOL OFF
249SET COLSEP '|' 249SET COLSEP '|'
250 250
251") 251")
252 ((or 'mssql 'sqsh) "SET NOCOUNT ON 252 ((or `mssql `sqsh) "SET NOCOUNT ON
253 253
254") 254")
255 ('vertica "\\a\n") 255 (`vertica "\\a\n")
256 (_ "")) 256 (_ ""))
257 (org-babel-expand-body:sql body params) 257 (org-babel-expand-body:sql body params)
258 ;; "sqsh" requires "go" inserted at EOF. 258 ;; "sqsh" requires "go" inserted at EOF.