NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitea88824

committed

the following patch makes the filename used to store the readline

history customizable through a variable named HISTFILE, analogous topsql's already implemented HISTCONTROL and HISTSIZE variables, andbash's HISTFILE-Variable.The motivation was to be able to get psql to maintain separatehistories for separate databases. This is now easily achievablethrough a line like the following in ~/.psqlrc:\set HISTFILE ~/.psql_history-:DBNAMEAndreas Seltenreich

1 parent92eadf6 commitea88824Copy full SHA for ea88824

File tree

2 files changed

+50

-26

lines changed

doc/src/sgml/ref
- psql-ref.sgml
src/bin/psql
- input.c

2 files changed

+50

-26

lines changed

`‎doc/src/sgml/ref/psql-ref.sgml`

Lines changed: 23 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.139 2005/06/09 15:27:26 momjian Exp $`
	`2`	`+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.140 2005/06/10 15:34:25 momjian Exp $`
`3`	`3`	`PostgreSQL documentation`
`4`	`4`	`-->`
`5`	`5`
`@@ -1987,6 +1987,28 @@ bar`
`1987`	`1987`	`</listitem>`
`1988`	`1988`	`</varlistentry>`
`1989`	`1989`
	`1990`	`+ <varlistentry>`
	`1991`	`+ <term><varname>HISTFILE</varname></term>`
	`1992`	`+ <listitem>`
	`1993`	`+ <para>`
	`1994`	`+ This variable contains the filename used to save the history.`
	`1995`	`+ Its default value is <filename>~/.psql_history</filename>.`
	`1996`	`+ For example, use:`
	`1997`	`+<programlisting>`
	`1998`	`+\set HISTFILE ~/.psql_history-:DBNAME`
	`1999`	`+</programlisting>`
	`2000`	`+ in your <filename>~/.psqlrc</filename> will get psql to`
	`2001`	`+ maintain a separate history for each database.`
	`2002`	`+ </para>`
	`2003`	`+ <note>`
	`2004`	`+ <para>`
	`2005`	`+ This feature was shamelessly plagiarized from`
	`2006`	`+ <application>Bash</application>.`
	`2007`	`+ </para>`
	`2008`	`+ </note>`
	`2009`	`+ </listitem>`
	`2010`	`+ </varlistentry>`
	`2011`	`+`
`1990`	`2012`	`<varlistentry>`
`1991`	`2013`	`<term><varname>HISTSIZE</varname></term>`
`1992`	`2014`	`<listitem>`

`‎src/bin/psql/input.c`

Lines changed: 27 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.43 2005/01/06 18:29:09 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.44 2005/06/10 15:34:26 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`@@ -24,6 +24,8 @@`
`24`	`24`	`#ifdefUSE_READLINE`
`25`	`25`	`staticbooluseReadline;`
`26`	`26`	`staticbooluseHistory;`
	`27`	`+char*psql_history;`
	`28`	`+`
`27`	`29`
`28`	`30`	`enumhistcontrol`
`29`	`31`	`{`
`@@ -177,16 +179,24 @@ initializeInput(int flags)`
`177`	`179`	`if (GetVariable(pset.vars,"HISTSIZE")==NULL)`
`178`	`180`	`SetVariable(pset.vars,"HISTSIZE","500");`
`179`	`181`	`using_history();`
`180`		`-if (get_home_path(home))`
	`182`	`+`
	`183`	`+if (GetVariable(pset.vars,"HISTFILE")==NULL)`
	`184`	`+{`
	`185`	`+if (get_home_path(home))`
	`186`	`+{`
	`187`	`+psql_history=pg_malloc(strlen(home)+1+`
	`188`	`+strlen(PSQLHISTORY)+1);`
	`189`	`+snprintf(psql_history,MAXPGPATH,"%s/%s",home,PSQLHISTORY);`
	`190`	`+}`
	`191`	`+}`
	`192`	`+else`
`181`	`193`	`{`
`182`		`-char*psql_history;`
	`194`	`+psql_history=pg_strdup(GetVariable(pset.vars,"HISTFILE"));`
	`195`	`+expand_tilde(&psql_history);`
	`196`	`+}`
`183`	`197`
`184`		`-psql_history=pg_malloc(strlen(home)+1+`
`185`		`-strlen(PSQLHISTORY)+1);`
`186`		`-sprintf(psql_history,"%s/%s",home,PSQLHISTORY);`
	`198`	`+if (psql_history)`
`187`	`199`	`read_history(psql_history);`
`188`		`-free(psql_history);`
`189`		`-}`
`190`	`200`	`}`
`191`	`201`	`#endif`
`192`	`202`
`@@ -227,25 +237,17 @@ finishInput(int exitstatus, void *arg)`
`227`	`237`	`#endif`
`228`	`238`	`{`
`229`	`239`	`#ifdefUSE_READLINE`
`230`		`-if (useHistory)`
	`240`	`+if (useHistory&&psql_history)`
`231`	`241`	`{`
`232`		`-charhome[MAXPGPATH];`
	`242`	`+inthist_size;`
`233`	`243`
`234`		`-if (get_home_path(home))`
`235`		`-{`
`236`		`-char*psql_history;`
`237`		`-inthist_size;`
`238`		`-`
`239`		`-hist_size=GetVariableNum(pset.vars,"HISTSIZE",-1,-1, true);`
`240`		`-if (hist_size >=0)`
`241`		`-stifle_history(hist_size);`
`242`		`-`
`243`		`-psql_history=pg_malloc(strlen(home)+1+`
`244`		`-strlen(PSQLHISTORY)+1);`
`245`		`-sprintf(psql_history,"%s/%s",home,PSQLHISTORY);`
`246`		`-write_history(psql_history);`
`247`		`-free(psql_history);`
`248`		`-}`
	`244`	`+hist_size=GetVariableNum(pset.vars,"HISTSIZE",-1,-1, true);`
	`245`	`+if (hist_size >=0)`
	`246`	`+stifle_history(hist_size);`
	`247`	`+`
	`248`	`+write_history(psql_history);`
	`249`	`+free(psql_history);`
	`250`	`+psql_history=NULL;`
`249`	`251`	`}`
`250`	`252`	`#endif`
`251`	`253`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitea88824

File tree

2 files changed

2 files changed

`‎doc/src/sgml/ref/psql-ref.sgml`

`‎src/bin/psql/input.c`

0 commit comments