NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitd4e6133

committed

Revert commit0725065.

The previous commit was intended to make psql show the full path name whendoing a \s (history save), but it was very badly implemented and would showconfusing if not outright wrong information in many situations; forinstance if the path name given to \s is absolute, or if \cd commandsinvolving relative paths have been issued. Consensus seems to be thatwe don't especially need this functionality in \s, and certainly not in \salone. So revert rather than trying to fix it up. Per gripe fromIan Barwick.Although the bogus behavior exists in all supported versions, I'm notback-patching, because the work created for translators (by change ofa translatable message) would probably outweigh the value of what isafter all a mostly-cosmetic change.

1 parent2636ecf commitd4e6133Copy full SHA for d4e6133

File tree

2 files changed

-9

lines changed

src/bin/psql
- command.c
- settings.h

2 files changed

-9

lines changed

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

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -289,11 +289,6 @@ exec_command(const char *cmd,`
`289`	`289`	`success= false;`
`290`	`290`	`}`
`291`	`291`
`292`		`-if (pset.dirname)`
`293`		`-free(pset.dirname);`
`294`		`-pset.dirname=pg_strdup(dir);`
`295`		`-canonicalize_path(pset.dirname);`
`296`		`-`
`297`	`292`	`if (opt)`
`298`	`293`	`free(opt);`
`299`	`294`	`}`
`@@ -1102,8 +1097,7 @@ exec_command(const char *cmd,`
`1102`	`1097`	`/* This scrolls off the screen when using /dev/tty */`
`1103`	`1098`	`success=saveHistory(fname ?fname :DEVTTY,-1, false, false);`
`1104`	`1099`	`if (success&& !pset.quiet&&fname)`
`1105`		`-printf(gettext("Wrote history to file \"%s/%s\".\n"),`
`1106`		`-pset.dirname ?pset.dirname :".",fname);`
	`1100`	`+printf(_("Wrote history to file \"%s\".\n"),fname);`
`1107`	`1101`	`if (!fname)`
`1108`	`1102`	`putchar('\n');`
`1109`	`1103`	`free(fname);`

`‎src/bin/psql/settings.h`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,6 @@ typedef struct _psqlSettings`
`84`	`84`	`intsversion;/* backend server version */`
`85`	`85`	`constcharprogname;/ in case you renamed psql */`
`86`	`86`	`charinputfile;/ file being currently processed, if any */`
`87`		`-chardirname;/ current directory for \s display */`
`88`		`-`
`89`	`87`	`uint64lineno;/* also for error reporting */`
`90`	`88`
`91`	`89`	`booltiming;/* enable timing of all queries */`

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!

Commitd4e6133

File tree

2 files changed

2 files changed

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

`‎src/bin/psql/settings.h`

0 commit comments