emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
51edd230984683d151f842e3703ce36c850d5b6e blob 13265 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
 
;;; test-ob-sql.el --- tests for ob-sql.el

;; Copyright (C) 2021 Robin Joy

;; Author: Robin Joy <rcj@robinjoy.net>
;; Keywords: lisp

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program.  If not, see <http://www.gnu.org/licenses/>.

;;; Code:

(require 'org-test)
(require 'ob-sql)
(unless (featurep 'ob-sql)
  (signal 'missing-test-dependency "Support for sql code blocks"))

(defmacro ob-sql/command (&rest body)
  "Execute body and return the command that would have been executed."
  `(cl-letf (((symbol-function 'org-babel-eval)
              (lambda (command &rest _) (throw 'sql-command command))))
     (catch 'sql-command
       ,@body)))

(defmacro ob-sql/command-should-contain (regexp sql-block)
  "Check that REGEXP is contained in the command executed when evaluating SQL-BLOCK."
  `(let ((regexps ,(if (listp regexp) regexp `(list ,regexp)))
         (command (ob-sql/command (org-test-with-temp-text
                                      ,sql-block
                                    (org-babel-next-src-block)
                                    (org-babel-execute-src-block)))))
     (dolist (regexp regexps)
       (should (string-match-p regexp command)))))

(defmacro ob-sql/command-should-not-contain (regexp sql-block)
  "Check that REGEXP is not contained in the command executed when evaluating SQL-BLOCK."
  `(let ((command (ob-sql/command
                   (org-test-with-temp-text
                       ,sql-block
                     (org-babel-next-src-block)
                     (org-babel-execute-src-block)))))
     (should-not (string-match-p ,regexp command))))

;;; dbish
(ert-deftest ob-sql/engine-dbi-uses-dbish ()
  (ob-sql/command-should-contain "^dbish " "
#+begin_src sql :engine dbi
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-dbish-uses-batch-mode ()
  (ob-sql/command-should-contain " --batch " "
#+begin_src sql :engine dbi :dbuser dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-dbish-can-pass-additional-cmdline-params ()
  (ob-sql/command-should-contain " cmdlineparams " "
#+begin_src sql :engine dbi :dbpassword dummy :cmdline cmdlineparams
  select * from dummy;
#+end_src"))

;;; monetdb
(ert-deftest ob-sql/engine-monetdb-uses-mclient ()
  (ob-sql/command-should-contain "^mclient " "
#+begin_src sql :engine monetdb
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-monetdb-outputs-values-tab-separated ()
  (ob-sql/command-should-contain " -f tab " "
#+begin_src sql :engine monetdb
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-monetdb-can-pass-additional-cmdline-params ()
  (ob-sql/command-should-contain " cmdlineparams " "
#+begin_src sql :engine monetdb :dbpassword dummy :cmdline cmdlineparams
  select * from dummy;
#+end_src"))

;;; mssql
(ert-deftest ob-sql/engine-mssql-uses-sqlcmd ()
  (ob-sql/command-should-contain "^sqlcmd " "
#+begin_src sql :engine mssql
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mssql-outputs-values-tab-separated ()
  (ob-sql/command-should-contain " -s \"\t\" " "
#+begin_src sql :engine mssql
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mssql-can-pass-additional-cmdline-params ()
  (ob-sql/command-should-contain " cmdlineparams " "
#+begin_src sql :engine mssql :dbpassword dummy :cmdline cmdlineparams
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mssql-passes-user-if-provided ()
  (ob-sql/command-should-contain " -U \"dummy\" " "
#+begin_src sql :engine mssql :dbuser dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mssql-passes-password-if-provided ()
  (ob-sql/command-should-contain " -P \"dummy\" " "
#+begin_src sql :engine mssql :dbpassword dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mssql-passes-dbhost-if-provided ()
  (ob-sql/command-should-contain " -S \"localhost\" " "
#+begin_src sql :engine mssql :dbhost localhost
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mssql-passes-database-if-provided ()
  (ob-sql/command-should-contain " -d \"R01\" " "
#+begin_src sql :engine mssql :database R01
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mssql-passes-all-parameter-provided ()
  (ob-sql/command-should-contain '(" -d \"R01\" " " -S \"localhost\" " " -P \"pwd\" " " -U \"usr\" ") "
#+begin_src sql :engine mssql :database R01 :dbhost localhost :dbport 30101 :dbinstance 1 :dbuser usr :dbpassword pwd
  select * from dummy;
#+end_src"))

;;; MySQL
(ert-deftest ob-sql/engine-mysql-uses-mysql ()
  (ob-sql/command-should-contain "^mysql " "
#+begin_src sql :engine mysql
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mysql-passes-user-if-provided ()
  (ob-sql/command-should-contain " -udummy " "
#+begin_src sql :engine mysql :dbuser dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mysql-passes-password-if-provided ()
  (ob-sql/command-should-contain " -pdummy " "
#+begin_src sql :engine mysql :dbpassword dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mysql-passes-dbhost-if-provided ()
  (ob-sql/command-should-contain " -hlocalhost " "
#+begin_src sql :engine mysql :dbhost localhost
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mysql-passes-host-if-provided ()
  (ob-sql/command-should-contain " -P30101 " "
#+begin_src sql :engine mysql :dbport 30101
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mysql-passes-database-if-provided ()
  (ob-sql/command-should-contain " -dR01 " "
#+begin_src sql :engine mysql :database R01
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-mysql-passes-all-parameter-provided ()
  (ob-sql/command-should-contain '(" -dR01 " " -hlocalhost " " -P30101 " " -ppwd " " -uusr ") "
#+begin_src sql :engine mysql :database R01 :dbhost localhost :dbport 30101 :dbinstance 1 :dbuser usr :dbpassword pwd
  select * from dummy;
#+end_src"))

;;; oracle
(ert-deftest ob-sql/engine-oracle-uses-sqlplus ()
  (ob-sql/command-should-contain "^sqlplus " "
#+begin_src sql :engine oracle :dbuser dummy :dbpassword dummy :database dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-oracle-passes-user-pwd-database-host-port-if-provided ()
  (ob-sql/command-should-contain " dummy/dummypwd@localhost:12345/R01 " "
#+begin_src sql :engine oracle :dbuser dummy :dbpassword dummypwd :dbhost localhost :database R01 :dbport 12345
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-oracle-passes-user-pwd-database-if-no-host-port-provided ()
  (ob-sql/command-should-contain " dummy/dummypwd@R01 " "
#+begin_src sql :engine oracle :dbuser dummy :dbpassword dummypwd :database R01
  select * from dummy;
#+end_src"))

;;; postgresql
(ert-deftest ob-sql/engine-postgresql-uses-psql ()
  (ob-sql/command-should-contain "^psql " "
#+begin_src sql :engine postgresql
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-postgresql-passes-password-if-provided ()
  (ob-sql/command-should-contain "^PGPASSWORD=dummy " "
#+begin_src sql :engine postgresql :dbpassword dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-postgresql-stop-on-error ()
  (ob-sql/command-should-contain " --set=\"ON_ERROR_STOP=1\" " "
#+begin_src sql :engine postgresql
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-postgresql-does-not-output-column-names-if-requested ()
  (ob-sql/command-should-contain " -t " "
#+begin_src sql :engine postgresql :colnames no
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-postgresql-outputs-column-names-by-default ()
  (ob-sql/command-should-not-contain " -t " "
#+begin_src sql :engine postgresql
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-postgresql-can-pass-additional-cmdline-params ()
  (ob-sql/command-should-contain " cmdlineparams$" "
#+begin_src sql :engine postgresql :dbpassword dummy :cmdline cmdlineparams
  select * from dummy;
#+end_src"))

;;; SAP HANA
(ert-deftest ob-sql/engine-saphana-uses-hdbsql ()
  (ob-sql/command-should-contain "^hdbsql " "
#+begin_src sql :engine saphana
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-saphana-passes-user-if-provided ()
  (ob-sql/command-should-contain " -u dummy " "
#+begin_src sql :engine saphana :dbuser dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-saphana-passes-password-if-provided ()
  (ob-sql/command-should-contain " -p dummy " "
#+begin_src sql :engine saphana :dbpassword dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-saphana-passes-dbinstance-if-provided ()
  (ob-sql/command-should-contain " -i 1 " "
#+begin_src sql :engine saphana :dbinstance 1
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-saphana-passes-dbhost-if-provided ()
  (ob-sql/command-should-contain " -n localhost " "
#+begin_src sql :engine saphana :dbhost localhost
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-saphana-passes-dbhost-and-dbport-if-provided ()
  (ob-sql/command-should-contain " -n localhost:30101 " "
#+begin_src sql :engine saphana :dbhost localhost :dbport 30101
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-saphana-does-not-pass-host-port-if-only-port-provided ()
  (ob-sql/command-should-not-contain " -n" "
#+begin_src sql :engine saphana :dbport 30101
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-saphana-passes-database-if-provided ()
  (ob-sql/command-should-contain " -d R01 " "
#+begin_src sql :engine saphana :database R01
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-saphana-passes-all-parameter-provided ()
  (ob-sql/command-should-contain '(" -d R01 " " -n localhost:30101 " " -i 1 " " -p pwd " " -u usr") "
#+begin_src sql :engine saphana :database R01 :dbhost localhost :dbport 30101 :dbinstance 1 :dbuser usr :dbpassword pwd
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-saphana-can-pass-additional-cmdline-params ()
  (ob-sql/command-should-contain " cmdlineparams$" "
#+begin_src sql :engine saphana :dbpassword dummy :cmdline cmdlineparams
  select * from dummy;
#+end_src"))

;;; sqsh
(ert-deftest ob-sql/engine-sqsh-uses-sqsh ()
  (ob-sql/command-should-contain "^sqsh " "
#+begin_src sql :engine sqsh
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-sqsh-can-pass-additional-cmdline-params ()
  (ob-sql/command-should-contain " cmdlineparams " "
#+begin_src sql :engine sqsh :dbpassword dummy :cmdline cmdlineparams
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-sqsh-passes-user-if-provided ()
  (ob-sql/command-should-contain " -U \"dummy\" " "
#+begin_src sql :engine sqsh :dbuser dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-sqsh-passes-password-if-provided ()
  (ob-sql/command-should-contain " -P \"dummy\" " "
#+begin_src sql :engine sqsh :dbpassword dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-sqsh-passes-host-if-provided ()
  (ob-sql/command-should-contain " -S \"localhost\" " "
#+begin_src sql :engine sqsh :dbhost localhost
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-sqsh-passes-database-if-provided ()
  (ob-sql/command-should-contain " -D \"R01\" " "
#+begin_src sql :engine sqsh :database R01
  select * from dummy;
#+end_src"))


;;; vertica
(ert-deftest ob-sql/engine-vertica-uses-vsql ()
  (ob-sql/command-should-contain "^vsql " "
#+begin_src sql :engine vertica
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-vertica-can-pass-additional-cmdline-params ()
  (ob-sql/command-should-contain " cmdlineparams$" "
#+begin_src sql :engine vertica :dbpassword dummy :cmdline cmdlineparams
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-vertica-passes-user-if-provided ()
  (ob-sql/command-should-contain " -U dummy " "
#+begin_src sql :engine vertica :dbuser dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-vertica-passes-password-if-provided ()
  (ob-sql/command-should-contain " -w dummy " "
#+begin_src sql :engine vertica :dbpassword dummy
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-vertica-passes-host-if-provided ()
  (ob-sql/command-should-contain " -h localhost " "
#+begin_src sql :engine vertica :dbhost localhost
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-vertica-passes-database-if-provided ()
  (ob-sql/command-should-contain " -d R01 " "
#+begin_src sql :engine vertica :database R01
  select * from dummy;
#+end_src"))

(ert-deftest ob-sql/engine-vertica-passes-port-if-provided ()
  (ob-sql/command-should-contain " -p 12345 " "
#+begin_src sql :engine vertica :dbport 12345
  select * from dummy;
#+end_src"))

;;; test-ob-sqlite.el ends here
debug log:

solving 51edd2309 ...
found 51edd2309 in https://list.orgmode.org/orgmode/CADzxVkGL5dirnHWGkgkvDghCC-nyao_LReMZ6y62rqnCLwxYBg@mail.gmail.com/ ||
	https://list.orgmode.org/orgmode/CADzxVkHnPub+wuUFyZqaeFEOMzAz07h3sbZg9RCRD2VzNOEALw@mail.gmail.com/ ||
	https://list.orgmode.org/orgmode/CADzxVkEO=X6r_YAi3qjKOoJiPVPHxpcFRc2jAW7fpUFs92w3Kg@mail.gmail.com/ ||
	https://list.orgmode.org/orgmode/CADzxVkEZ2Df4di_2PTsV==JmetA76_-wDHwK6sSN11R1hcVdBg@mail.gmail.com/

applying [1/4] https://list.orgmode.org/orgmode/CADzxVkGL5dirnHWGkgkvDghCC-nyao_LReMZ6y62rqnCLwxYBg@mail.gmail.com/
diff --git a/testing/lisp/test-ob-sql.el b/testing/lisp/test-ob-sql.el
new file mode 100644
index 000000000..51edd2309

error: corrupt patch at line 43

git apply error: exit status=128
trying https://list.orgmode.org/orgmode/CADzxVkHnPub+wuUFyZqaeFEOMzAz07h3sbZg9RCRD2VzNOEALw@mail.gmail.com/

applying [2/4] https://list.orgmode.org/orgmode/CADzxVkHnPub+wuUFyZqaeFEOMzAz07h3sbZg9RCRD2VzNOEALw@mail.gmail.com/
diff --git a/testing/lisp/test-ob-sql.el b/testing/lisp/test-ob-sql.el
new file mode 100644
index 000000000..51edd2309

error: corrupt patch at line 43

git apply error: exit status=128
trying https://list.orgmode.org/orgmode/CADzxVkEO=X6r_YAi3qjKOoJiPVPHxpcFRc2jAW7fpUFs92w3Kg@mail.gmail.com/

applying [3/4] https://list.orgmode.org/orgmode/CADzxVkEO=X6r_YAi3qjKOoJiPVPHxpcFRc2jAW7fpUFs92w3Kg@mail.gmail.com/
diff --git a/testing/lisp/test-ob-sql.el b/testing/lisp/test-ob-sql.el
new file mode 100644
index 000000000..51edd2309

error: corrupt patch at line 43

git apply error: exit status=128
trying https://list.orgmode.org/orgmode/CADzxVkEZ2Df4di_2PTsV==JmetA76_-wDHwK6sSN11R1hcVdBg@mail.gmail.com/

applying [4/4] https://list.orgmode.org/orgmode/CADzxVkEZ2Df4di_2PTsV==JmetA76_-wDHwK6sSN11R1hcVdBg@mail.gmail.com/
diff --git a/testing/lisp/test-ob-sql.el b/testing/lisp/test-ob-sql.el
new file mode 100644
index 000000000..51edd2309

Checking patch testing/lisp/test-ob-sql.el...
Applied patch testing/lisp/test-ob-sql.el cleanly.

index at:
100644 51edd230984683d151f842e3703ce36c850d5b6e	testing/lisp/test-ob-sql.el

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).