From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Leech-Pepin Subject: [PATCH] ob-sql.el: Add support for MS sqlcmd Date: Thu, 4 Sep 2014 08:49:39 -0400 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a113a53d252a75d05023cca4b Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPWUF-0007aa-8U for emacs-orgmode@gnu.org; Thu, 04 Sep 2014 08:50:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPWUB-00029N-Sw for emacs-orgmode@gnu.org; Thu, 04 Sep 2014 08:50:03 -0400 Received: from mail-qa0-x22c.google.com ([2607:f8b0:400d:c00::22c]:40301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPWUB-00029I-OR for emacs-orgmode@gnu.org; Thu, 04 Sep 2014 08:49:59 -0400 Received: by mail-qa0-f44.google.com with SMTP id j7so9392976qaq.31 for ; Thu, 04 Sep 2014 05:49:59 -0700 (PDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org Mode Mailing List --001a113a53d252a75d05023cca4b Content-Type: multipart/alternative; boundary=001a113a53d252a75605023cca49 --001a113a53d252a75605023cca49 Content-Type: text/plain; charset=UTF-8 Patch provided inline and as attachment to ensure gmail does not mangle it. Regards, Jonathan ob-sql.el: Add support for sqlcmd * lisp/ob-sql.el (org-babel-execute:sql): Add support for sqlcmd on Windows. This is a replacement for osql. --- lisp/ob-sql.el | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index 7b85df8..e96d55d 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -116,6 +116,12 @@ This function is called by `org-babel-execute-src-block'." (or cmdline "") (org-babel-process-file-name in-file) (org-babel-process-file-name out-file))) + ('mssqlcmd (format "sqlcmd %s -S %s -s \"\t\" -i %s -o %s" + (or cmdline "") + dbhost + (org-babel-process-file-name in-file) + (org-babel-process-file-name + out-file))) ('mysql (format "mysql %s %s %s < %s > %s" (dbstring-mysql dbhost dbuser dbpassword database) (if colnames-p "" "-N") -- 1.7.9 --001a113a53d252a75605023cca49 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: base64 PGRpdiBkaXI9Imx0ciI+PGRpdj5QYXRjaCBwcm92aWRlZCBpbmxpbmUgYW5kIGFzIGF0dGFjaG1l bnQgdG8gZW5zdXJlIGdtYWlsIGRvZXMgbm90IG1hbmdsZSBpdC48YnI+PGJyPlJlZ2FyZHMsPGJy PjwvZGl2PkpvbmF0aGFuPGJyPjxicj48YnI+PGRpdj48ZGl2Pjxicj5vYi1zcWwuZWw6IEFkZCBz dXBwb3J0IGZvciBzcWxjbWQ8YnI+PGJyPiogbGlzcC9vYi1zcWwuZWwgKG9yZy1iYWJlbC1leGVj dXRlOnNxbCk6IEFkZCBzdXBwb3J0IGZvciBzcWxjbWQgb248YnI+DQoNCsKgIFdpbmRvd3MuwqAg VGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciBvc3FsLjxicj4tLS08YnI+wqBsaXNwL29iLXNxbC5l bCB8wqDCoMKgIDYgKysrKysrPGJyPsKgMSBmaWxlcyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyks IDAgZGVsZXRpb25zKC0pPGJyPjxicj5kaWZmIC0tZ2l0IGEvbGlzcC9vYi1zcWwuZWwgYi9saXNw L29iLXNxbC5lbDxicj5pbmRleCA3Yjg1ZGY4Li5lOTZkNTVkIDEwMDY0NDxicj4NCg0KLS0tIGEv bGlzcC9vYi1zcWwuZWw8YnI+KysrIGIvbGlzcC9vYi1zcWwuZWw8YnI+QEAgLTExNiw2ICsxMTYs MTIgQEAgVGhpcyBmdW5jdGlvbiBpcyBjYWxsZWQgYnkgYG9yZy1iYWJlbC1leGVjdXRlLXNyYy1i bG9jayYjMzk7LiZxdW90Ozxicj7CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAob3IgY21kbGluZSAmcXVvdDsm cXVvdDspPGJyPsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChvcmctYmFiZWwtcHJvY2Vzcy1maWxlLW5hbWUg aW4tZmlsZSk8YnI+DQoNCsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChvcmctYmFiZWwtcHJvY2Vzcy1maWxl LW5hbWUgb3V0LWZpbGUpKSk8YnI+K8KgwqDCoCDCoMKgwqAgwqDCoMKgICgmIzM5O21zc3FsY21k IChmb3JtYXQgJnF1b3Q7c3FsY21kICVzIC1TICVzIC1zIFwmcXVvdDtcdFwmcXVvdDsgLWkgJXMg LW8gJXMmcXVvdDs8YnI+K8KgwqDCoCDCoMKgwqAgwqDCoMKgIMKgwqDCoCDCoMKgwqAgKG9yIGNt ZGxpbmUgJnF1b3Q7JnF1b3Q7KTxicj4NCg0KK8KgwqDCoCDCoMKgwqAgwqDCoMKgIMKgwqDCoCDC oMKgwqAgZGJob3N0PGJyPivCoMKgwqAgwqDCoMKgIMKgwqDCoCDCoMKgwqAgwqDCoMKgIChvcmct YmFiZWwtcHJvY2Vzcy1maWxlLW5hbWUgaW4tZmlsZSk8YnI+K8KgwqDCoCDCoMKgwqAgwqDCoMKg IMKgwqDCoCDCoMKgwqAgKG9yZy1iYWJlbC1wcm9jZXNzLWZpbGUtbmFtZTxicj4rwqDCoMKgIMKg wqDCoCDCoMKgwqAgwqDCoMKgIMKgwqDCoMKgIG91dC1maWxlKSkpPGJyPsKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCYjMzk7bXlzcWwgKGZvcm1hdCAmcXVvdDtteXNx bCAlcyAlcyAlcyAmbHQ7ICVzICZndDsgJXMmcXVvdDs8YnI+DQoNCsKgwqDCoMKgIMKgwqDCoCDC oMKgwqAgwqDCoMKgIMKgwqDCoCAoZGJzdHJpbmctbXlzcWwgZGJob3N0IGRidXNlciBkYnBhc3N3 b3JkIGRhdGFiYXNlKTxicj7CoMKgwqDCoCDCoMKgwqAgwqDCoMKgIMKgwqDCoCDCoMKgwqAgKGlm IGNvbG5hbWVzLXAgJnF1b3Q7JnF1b3Q7ICZxdW90Oy1OJnF1b3Q7KTxicj4tLSA8YnI+MS43Ljk8 YnI+PGJyPjxicj48L2Rpdj48L2Rpdj48L2Rpdj4NCg== --001a113a53d252a75605023cca49-- --001a113a53d252a75d05023cca4b Content-Type: application/octet-stream; name="0001-ob-sql.el-Add-support-for-sqlcmd.patch" Content-Disposition: attachment; filename="0001-ob-sql.el-Add-support-for-sqlcmd.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hzo3cd9j0 RnJvbSBmMjYxODhjMGY0MjAwMjg2N2QwMzM4ZTJiZTk0OTE0NmEyZTk3NGI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBMZWVjaC1QZXBpbiA8am9uYXRoYW4ubGVlY2hw ZXBpbkBnbWFpbC5jb20+CkRhdGU6IFRodSwgNCBTZXAgMjAxNCAwODo0NDo0NyAtMDQwMApTdWJq ZWN0OiBbUEFUQ0hdIG9iLXNxbC5lbDogQWRkIHN1cHBvcnQgZm9yIHNxbGNtZAoKKiBsaXNwL29i LXNxbC5lbCAob3JnLWJhYmVsLWV4ZWN1dGU6c3FsKTogQWRkIHN1cHBvcnQgZm9yIHNxbGNtZCBv bgogIFdpbmRvd3MuICBUaGlzIGlzIGEgcmVwbGFjZW1lbnQgZm9yIG9zcWwuCi0tLQogbGlzcC9v Yi1zcWwuZWwgfCAgICA2ICsrKysrKwogMSBmaWxlcyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyks IDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9vYi1zcWwuZWwgYi9saXNwL29iLXNx bC5lbAppbmRleCA3Yjg1ZGY4Li5lOTZkNTVkIDEwMDY0NAotLS0gYS9saXNwL29iLXNxbC5lbAor KysgYi9saXNwL29iLXNxbC5lbApAQCAtMTE2LDYgKzExNiwxMiBAQCBUaGlzIGZ1bmN0aW9uIGlz IGNhbGxlZCBieSBgb3JnLWJhYmVsLWV4ZWN1dGUtc3JjLWJsb2NrJy4iCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKG9yIGNtZGxpbmUgIiIpCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKG9yZy1iYWJlbC1wcm9jZXNzLWZpbGUtbmFtZSBpbi1maWxl KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChvcmctYmFiZWwtcHJvY2Vz cy1maWxlLW5hbWUgb3V0LWZpbGUpKSkKKwkJICAgICgnbXNzcWxjbWQgKGZvcm1hdCAic3FsY21k ICVzIC1TICVzIC1zIFwiXHRcIiAtaSAlcyAtbyAlcyIKKwkJCQkgICAgKG9yIGNtZGxpbmUgIiIp CisJCQkJICAgIGRiaG9zdAorCQkJCSAgICAob3JnLWJhYmVsLXByb2Nlc3MtZmlsZS1uYW1lIGlu LWZpbGUpCisJCQkJICAgIChvcmctYmFiZWwtcHJvY2Vzcy1maWxlLW5hbWUKKwkJCQkgICAgIG91 dC1maWxlKSkpCiAgICAgICAgICAgICAgICAgICAgICgnbXlzcWwgKGZvcm1hdCAibXlzcWwgJXMg JXMgJXMgPCAlcyA+ICVzIgogCQkJCSAgICAoZGJzdHJpbmctbXlzcWwgZGJob3N0IGRidXNlciBk YnBhc3N3b3JkIGRhdGFiYXNlKQogCQkJCSAgICAoaWYgY29sbmFtZXMtcCAiIiAiLU4iKQotLSAK MS43LjkKCg== --001a113a53d252a75d05023cca4b--