emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* Bug fix attached: org-babel sql postgres, fix hardcode
@ 2020-12-08 16:39 Alan Light
  2020-12-12 17:59 ` Bastien
  0 siblings, 1 reply; 8+ messages in thread
From: Alan Light @ 2020-12-08 16:39 UTC (permalink / raw)
  To: emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 129 bytes --]

ob-sql.el does not respect the value of sql-postgres-program, thus causing
problem when running on Windows, etc.
Patch attached.

[-- Attachment #1.2: Type: text/html, Size: 192 bytes --]

[-- Attachment #2: 0001-Respect-the-value-of-sql-postgres-program-as-opposed.patch --]
[-- Type: application/octet-stream, Size: 1062 bytes --]

From 237c5a1d46675de78ccc32bc9a62cc1fd5300383 Mon Sep 17 00:00:00 2001
From: Alan Light <lightalan@gmail.com>
Date: Tue, 8 Dec 2020 11:27:34 -0500
Subject: [PATCH] Respect the value of sql-postgres-program as opposed to
 having psql hard-coded

---
 lisp/org/ob-sql.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 59cf19568e..8eca769d02 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -237,11 +237,12 @@ This function is called by `org-babel-execute-src-block'."
 				    (org-babel-process-file-name in-file)
 				    (org-babel-process-file-name out-file)))
 		    (`postgresql (format
-				  "%spsql --set=\"ON_ERROR_STOP=1\" %s -A -P \
+				  "%s%s --set=\"ON_ERROR_STOP=1\" %s -A -P \
 footer=off -F \"\t\"  %s -f %s -o %s %s"
 				  (if dbpassword
 				      (format "PGPASSWORD=%s " dbpassword)
 				    "")
+				  (or sql-postgres-program "psql")
 				  (if colnames-p "" "-t")
 				  (org-babel-sql-dbstring-postgresql
 				   dbhost dbport dbuser database)
-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Bug fix attached: org-babel sql postgres, fix hardcode
  2020-12-08 16:39 Bug fix attached: org-babel sql postgres, fix hardcode Alan Light
@ 2020-12-12 17:59 ` Bastien
  2020-12-12 19:53   ` Alan Light
  0 siblings, 1 reply; 8+ messages in thread
From: Bastien @ 2020-12-12 17:59 UTC (permalink / raw)
  To: Alan Light; +Cc: emacs-orgmode

Hi Alan,

Alan Light <lightalan@gmail.com> writes:

> ob-sql.el does not respect the value of sql-postgres-program, thus
> causing problem when running on Windows, etc.
> Patch attached.

Thanks.  Can someone confirm the patch is good?

Alan, can you check how to submit a patch with a changelog on this
page: https://orgmode.org/worg/org-contribute.html and resubmit it?

Best,

-- 
 Bastien


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Bug fix attached: org-babel sql postgres, fix hardcode
  2020-12-12 17:59 ` Bastien
@ 2020-12-12 19:53   ` Alan Light
  2020-12-13  0:18     ` Ihor Radchenko
  0 siblings, 1 reply; 8+ messages in thread
From: Alan Light @ 2020-12-12 19:53 UTC (permalink / raw)
  To: Bastien; +Cc: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 567 bytes --]

Sorry, I don't understand. That's what I did. The patch was attached to my
email.

On Sat, Dec 12, 2020 at 1:32 PM Bastien <bzg@gnu.org> wrote:

> Hi Alan,
>
> Alan Light <lightalan@gmail.com> writes:
>
> > ob-sql.el does not respect the value of sql-postgres-program, thus
> > causing problem when running on Windows, etc.
> > Patch attached.
>
> Thanks.  Can someone confirm the patch is good?
>
> Alan, can you check how to submit a patch with a changelog on this
> page: https://orgmode.org/worg/org-contribute.html and resubmit it?
>
> Best,
>
> --
>  Bastien
>

[-- Attachment #2: Type: text/html, Size: 1069 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Bug fix attached: org-babel sql postgres, fix hardcode
  2020-12-12 19:53   ` Alan Light
@ 2020-12-13  0:18     ` Ihor Radchenko
  2020-12-13  0:31       ` Alan Light
  0 siblings, 1 reply; 8+ messages in thread
From: Ihor Radchenko @ 2020-12-13  0:18 UTC (permalink / raw)
  To: Alan Light, Bastien; +Cc: emacs-orgmode

Alan Light <lightalan@gmail.com> writes:

> Sorry, I don't understand. That's what I did. The patch was attached to my
> email.

You need to add patch description, not just title. Something like:

* ob-sql.el (org-babel-execute:sql): Use `sql-postgres-program' as
  postgresql executable (instead of psql) when defined.

Best,
Ihor


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Bug fix attached: org-babel sql postgres, fix hardcode
  2020-12-13  0:18     ` Ihor Radchenko
@ 2020-12-13  0:31       ` Alan Light
  2020-12-13  0:52         ` Ihor Radchenko
  2021-02-04  4:19         ` Kyle Meyer
  0 siblings, 2 replies; 8+ messages in thread
From: Alan Light @ 2020-12-13  0:31 UTC (permalink / raw)
  To: Ihor Radchenko; +Cc: Bastien, emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 459 bytes --]

New patch file attached.


On Sat, Dec 12, 2020 at 7:14 PM Ihor Radchenko <yantar92@gmail.com> wrote:

> Alan Light <lightalan@gmail.com> writes:
>
> > Sorry, I don't understand. That's what I did. The patch was attached to
> my
> > email.
>
> You need to add patch description, not just title. Something like:
>
> * ob-sql.el (org-babel-execute:sql): Use `sql-postgres-program' as
>   postgresql executable (instead of psql) when defined.
>
> Best,
> Ihor
>

[-- Attachment #1.2: Type: text/html, Size: 869 bytes --]

[-- Attachment #2: 0002-ob-sql.el-ob-sql.el-org-babel-execute-sql-Use-sql-po.patch --]
[-- Type: application/octet-stream, Size: 1036 bytes --]

From 62329424577d9baa40cca3c98951c4b65a095002 Mon Sep 17 00:00:00 2001
From: Alan Light <lightalan@gmail.com>
Date: Sat, 12 Dec 2020 19:26:40 -0500
Subject: [PATCH 2/2] ob-sql.el: ob-sql.el (org-babel-execute:sql): Use
 `sql-postgres-program' as   postgresql executable (instead of psql) when
 defined

* ob-sql.el (org-babel-execute:sql): Use `sql-postgres-program' as
  postgresql executable (instead of psql) when defined. psql will be the default
---
 lisp/org/ob-sql.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 8eca769d02..f46c6c1c6a 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -242,7 +242,7 @@ footer=off -F \"\t\"  %s -f %s -o %s %s"
 				  (if dbpassword
 				      (format "PGPASSWORD=%s " dbpassword)
 				    "")
-				  (or sql-postgres-program "psql")
+				  (or sql-postgres-program "psql") ;; default is psql
 				  (if colnames-p "" "-t")
 				  (org-babel-sql-dbstring-postgresql
 				   dbhost dbport dbuser database)
-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Bug fix attached: org-babel sql postgres, fix hardcode
  2020-12-13  0:31       ` Alan Light
@ 2020-12-13  0:52         ` Ihor Radchenko
  2020-12-13  2:11           ` Tom Gillespie
  2021-02-04  4:19         ` Kyle Meyer
  1 sibling, 1 reply; 8+ messages in thread
From: Ihor Radchenko @ 2020-12-13  0:52 UTC (permalink / raw)
  To: Alan Light; +Cc: Bastien, emacs-orgmode

> when defined. psql will

For future: You need to use 2 spaces after sentence end ^_^. As I
understand, these NEWS entries must have specific formatting to be
harvested automatically into NEWS file. So, patches should comply with
all the requirements listed in https://orgmode.org/worg/org-contribute.html

Best,
Ihor

Alan Light <lightalan@gmail.com> writes:

> New patch file attached.


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Bug fix attached: org-babel sql postgres, fix hardcode
  2020-12-13  0:52         ` Ihor Radchenko
@ 2020-12-13  2:11           ` Tom Gillespie
  0 siblings, 0 replies; 8+ messages in thread
From: Tom Gillespie @ 2020-12-13  2:11 UTC (permalink / raw)
  To: Ihor Radchenko; +Cc: Bastien, emacs-orgmode, Alan Light

It looks like the two patches are sequential, there should probably be
a rebase into a single patch. I would remove the comment in the second
patch because it is a single command to jump to the default value and
it might change in the future, so no reason to put it in a comment.
One way to communicate about the source of that variable is to include
(require 'sql) in ob-sql which is likely needed anyway due to the fact
that sql-postgres-program is defined by sql.el and there will be a
byte compiler error because the variable is undefined. Having the
value of "psql" present as a backup in case sql-postgres-program is
somehow nil seems reasonable. Best,
Tom


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Bug fix attached: org-babel sql postgres, fix hardcode
  2020-12-13  0:31       ` Alan Light
  2020-12-13  0:52         ` Ihor Radchenko
@ 2021-02-04  4:19         ` Kyle Meyer
  1 sibling, 0 replies; 8+ messages in thread
From: Kyle Meyer @ 2021-02-04  4:19 UTC (permalink / raw)
  To: Alan Light; +Cc: Bastien, emacs-orgmode, Ihor Radchenko

Thanks for the patch, and others for the review/feedback.

Alan Light writes:

> Subject: [PATCH 2/2] ob-sql.el: ob-sql.el (org-babel-execute:sql): Use
>  `sql-postgres-program' as   postgresql executable (instead of psql) when
>  defined
>
> * ob-sql.el (org-babel-execute:sql): Use `sql-postgres-program' as
>   postgresql executable (instead of psql) when defined. psql will be the default

I've squash this patch, which as Tom notes is a fixup on top of the
initial one, into the first.  I've also tweaked the commit message a
bit, including adding TINYCHANGE.

https://orgmode.org/worg/org-contribute.html#commit-messages

> ---
>  lisp/org/ob-sql.el | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
> index 8eca769d02..f46c6c1c6a 100644
> --- a/lisp/org/ob-sql.el
> +++ b/lisp/org/ob-sql.el
> @@ -242,7 +242,7 @@ footer=off -F \"\t\"  %s -f %s -o %s %s"
>  				  (if dbpassword
>  				      (format "PGPASSWORD=%s " dbpassword)
>  				    "")
> -				  (or sql-postgres-program "psql")
> +				  (or sql-postgres-program "psql") ;; default is psql

As Tom noted, the use of sql-postgres-program here leads to a
byte-compiler warning.  It probably makes sense to just require sql.el
in the file, but for now I've guarded this with a bound-and-true-p.

Pushed (862048d4c).  Thanks again.


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-02-04  4:20 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-08 16:39 Bug fix attached: org-babel sql postgres, fix hardcode Alan Light
2020-12-12 17:59 ` Bastien
2020-12-12 19:53   ` Alan Light
2020-12-13  0:18     ` Ihor Radchenko
2020-12-13  0:31       ` Alan Light
2020-12-13  0:52         ` Ihor Radchenko
2020-12-13  2:11           ` Tom Gillespie
2021-02-04  4:19         ` Kyle Meyer

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 NNTP newsgroup(s).