sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-05 00:02:04 -04:00
Code Issues Projects Releases Wiki Activity

Fixed-size buffer in dumpClasses is not big enough anymore given the

Browse Source 
addition of a column list clause to the COPY command.  Spotted by
Martin Renters.
This commit is contained in:
Tom Lane 2002-08-22 21:29:34 +00:00
parent 5530b0c666
commit 19b3c55261
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/bin/pg_dump/pg_dump.c
View File

@ -22,7 +22,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.289 2002/08/22 00:01:45 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.290 2002/08/22 21:29:34 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -124,7 +124,7 @@ static char *GetPrivileges(Archive *AH, const char *s, const char *type);
static int dumpBlobs(Archive *AH, char *, void *); static int dumpBlobs(Archive *AH, char *, void *);
static int dumpDatabase(Archive *AH); static int dumpDatabase(Archive *AH);
static const char *getAttrName(int attrnum, TableInfo *tblInfo); static const char *getAttrName(int attrnum, TableInfo *tblInfo);
static const char* fmtCopyColumnList(const TableInfo* ti); static const char *fmtCopyColumnList(const TableInfo *ti);
extern char *optarg; extern char *optarg;
extern int optind, extern int optind,
@ -828,7 +828,16 @@ dumpClasses_nodumpData(Archive *fout, char *oid, void *dctxv)
*/ */
selectSourceSchema(tbinfo->relnamespace->nspname); selectSourceSchema(tbinfo->relnamespace->nspname);
column_list = fmtCopyColumnList(tbinfo); /*
* If possible, specify the column list explicitly so that we have no
* possibility of retrieving data in the wrong column order. (The
* default column ordering of COPY will not be what we want in certain
* corner cases involving ADD COLUMN and inheritance.)
*/
if (g_fout->remoteVersion >= 70300)
column_list = fmtCopyColumnList(tbinfo);
else
column_list = ""; /* can't select columns in COPY */
if (oids && hasoids) if (oids && hasoids)
{ {
@ -1123,11 +1132,11 @@ static void
dumpClasses(const TableInfo *tblinfo, const int numTables, Archive *fout, dumpClasses(const TableInfo *tblinfo, const int numTables, Archive *fout,
const bool oids) const bool oids)
{ {
int i; PQExpBuffer copyBuf = createPQExpBuffer();
DataDumperPtr dumpFn; DataDumperPtr dumpFn;
DumpContext *dumpCtx; DumpContext *dumpCtx;
char copyBuf[512];
char *copyStmt; char *copyStmt;
int i;
for (i = 0; i < numTables; i++) for (i = 0; i < numTables; i++)
{ {
@ -1162,11 +1171,12 @@ dumpClasses(const TableInfo *tblinfo, const int numTables, Archive *fout,
dumpFn = dumpClasses_nodumpData; dumpFn = dumpClasses_nodumpData;
column_list = fmtCopyColumnList(&(tblinfo[i])); column_list = fmtCopyColumnList(&(tblinfo[i]));
sprintf(copyBuf, "COPY %s %s %sFROM stdin;\n", resetPQExpBuffer(copyBuf);
fmtId(tblinfo[i].relname), appendPQExpBuffer(copyBuf, "COPY %s %s %sFROM stdin;\n",
column_list, fmtId(tblinfo[i].relname),
(oids && tblinfo[i].hasoids) ? "WITH OIDS " : ""); column_list,
copyStmt = copyBuf; (oids && tblinfo[i].hasoids) ? "WITH OIDS " : "");
copyStmt = copyBuf->data;
} }
else else
{ {
@ -1181,6 +1191,8 @@ dumpClasses(const TableInfo *tblinfo, const int numTables, Archive *fout,
dumpFn, dumpCtx); dumpFn, dumpCtx);
} }
} }
destroyPQExpBuffer(copyBuf);
} }
@ -6652,11 +6664,9 @@ fmtQualifiedId(const char *schema, const char *id)
/* /*
* return a column list clause for the given relation. * return a column list clause for the given relation.
* returns an empty string if the remote server is older than
* 7.3.
*/ */
static const char* static const char *
fmtCopyColumnList(const TableInfo* ti) fmtCopyColumnList(const TableInfo *ti)
{ {
static PQExpBuffer q = NULL; static PQExpBuffer q = NULL;
int numatts = ti->numatts; int numatts = ti->numatts;
@ -6665,16 +6675,11 @@ fmtCopyColumnList(const TableInfo* ti)
bool needComma; bool needComma;
int i; int i;
if (g_fout->remoteVersion < 70300)
return "";
if (q) /* first time through? */ if (q) /* first time through? */
resetPQExpBuffer(q); resetPQExpBuffer(q);
else else
q = createPQExpBuffer(); q = createPQExpBuffer();
resetPQExpBuffer(q);
appendPQExpBuffer(q, "("); appendPQExpBuffer(q, "(");
needComma = false; needComma = false;
for (i = 0; i < numatts; i++) for (i = 0; i < numatts; i++)