diff options
| author | Heikki Linnakangas | 2008-07-01 11:46:48 +0000 |
|---|---|---|
| committer | Heikki Linnakangas | 2008-07-01 11:46:48 +0000 |
| commit | 65919ec9494c8406fdce40d2d386e2e7b6a43060 (patch) | |
| tree | c460e526e01e3b6c107379ed9f910a7423f79ba7 | |
| parent | 3ccb2c590ca5eb3d718170f6cb6cbc8b4b879a59 (diff) | |
Move volatility, language, etc. modifiers before function body in the pg_dump
output for CREATE FUNCTION. This makes it easier to read especially if the
function body is long.
Original idea and patch by Greg Sabino Mullane, though this is a stripped
down version of that.
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 4122dad8455..88ed75fd505 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -12,7 +12,7 @@ * by PostgreSQL * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.492 2008/05/16 23:36:05 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.493 2008/07/01 11:46:48 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -6775,14 +6775,12 @@ dumpFunc(Archive *fout, FuncInfo *finfo) rettypename = getFormattedTypeName(finfo->prorettype, zeroAsOpaque); appendPQExpBuffer(q, "CREATE FUNCTION %s ", funcsig); - appendPQExpBuffer(q, "RETURNS %s%s\n %s\n LANGUAGE %s", + appendPQExpBuffer(q, "RETURNS %s%s", (proretset[0] == 't') ? "SETOF " : "", - rettypename, - asPart->data, - fmtId(lanname)); - + rettypename); free(rettypename); + appendPQExpBuffer(q, "\n LANGUAGE %s", fmtId(lanname)); if (provolatile[0] != PROVOLATILE_VOLATILE) { if (provolatile[0] == PROVOLATILE_IMMUTABLE) @@ -6850,7 +6848,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo) appendStringLiteralAH(q, pos, fout); } - appendPQExpBuffer(q, ";\n"); + appendPQExpBuffer(q, "\n %s;\n", asPart->data); ArchiveEntry(fout, finfo->dobj.catId, finfo->dobj.dumpId, funcsig_tag, |