database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-21 12:05:57 +03:00
Code

Report timezone offset in pg_dump/pg_dumpall

Browse Source 
Use consistent format for all such displays.

Report by Gavin Flower
This commit is contained in:
Bruce Momjian 2014-09-05 19:22:31 -04:00
parent a74a4aa23b
commit ad5d46a449
2 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -964,12 +964,15 @@ PrintTOCSummary(Archive *AHX, RestoreOptions *ropt)
teSection curSection; teSection curSection;
OutputContext sav; OutputContext sav;
const char *fmtName; const char *fmtName;
struct tm *tm = localtime(&AH->createDate);
char stamp_str[64];
sav = SaveOutput(AH); sav = SaveOutput(AH);
if (ropt->filename) if (ropt->filename)
SetOutput(AH, ropt->filename, 0 /* no compression */ ); SetOutput(AH, ropt->filename, 0 /* no compression */ );
ahprintf(AH, ";\n; Archive created at %s", ctime(&AH->createDate)); strftime(stamp_str, sizeof(stamp_str), "%Y-%m-%d %H:%M:%S %z", tm);
ahprintf(AH, ";\n; Archive created at %s\n", stamp_str);
ahprintf(AH, "; dbname: %s\n; TOC Entries: %d\n; Compression: %d\n", ahprintf(AH, "; dbname: %s\n; TOC Entries: %d\n; Compression: %d\n",
AH->archdbname, AH->tocCount, AH->compression); AH->archdbname, AH->tocCount, AH->compression);
@ -3455,21 +3458,9 @@ checkSeek(FILE *fp)
static void static void
dumpTimestamp(ArchiveHandle *AH, const char *msg, time_t tim) dumpTimestamp(ArchiveHandle *AH, const char *msg, time_t tim)
{ {
char buf[256]; char buf[64];
/* if (strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %z", localtime(&tim)) != 0)
* We don't print the timezone on Win32, because the names are long and
* localized, which means they may contain characters in various random
* encodings; this has been seen to cause encoding errors when reading the
* dump script.
*/
if (strftime(buf, sizeof(buf),
#ifndef WIN32
"%Y-%m-%d %H:%M:%S %Z",
#else
"%Y-%m-%d %H:%M:%S",
#endif
localtime(&tim)) != 0)
ahprintf(AH, "-- %s %s\n\n", msg, buf); ahprintf(AH, "-- %s %s\n\n", msg, buf);
} }

16
src/bin/pg_dump/pg_dumpall.c
View File

@ -2039,22 +2039,10 @@ executeCommand(PGconn *conn, const char *query)
static void static void
dumpTimestamp(char *msg) dumpTimestamp(char *msg)
{ {
char buf[256]; char buf[64];
time_t now = time(NULL); time_t now = time(NULL);
/* if (strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %z", localtime(&now)) != 0)
* We don't print the timezone on Win32, because the names are long and
* localized, which means they may contain characters in various random
* encodings; this has been seen to cause encoding errors when reading the
* dump script.
*/
if (strftime(buf, sizeof(buf),
#ifndef WIN32
"%Y-%m-%d %H:%M:%S %Z",
#else
"%Y-%m-%d %H:%M:%S",
#endif
localtime(&now)) != 0)
fprintf(OPF, "-- %s %s\n\n", msg, buf); fprintf(OPF, "-- %s %s\n\n", msg, buf);
} }