summaryrefslogtreecommitdiff
path: root/src/bin/pg_dump/common.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2001-10-03 20:54:22 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2001-10-03 20:54:22 +0000
commit2e5fda7b7e0613b4b7c69d69b609e639deac7c17 (patch)
treecb76595ec5aa439e05891df3209e08a9b537247d /src/bin/pg_dump/common.c
parent16def00ffb3397b8cf1344534fbfd1f3b2cfd33d (diff)
downloadpostgresql-2e5fda7b7e0613b4b7c69d69b609e639deac7c17.tar.gz
DROP AGGREGATE and COMMENT ON AGGREGATE now accept the expected syntax
'aggname (aggtype)'. The old syntax 'aggname aggtype' is still accepted for backwards compatibility. Fix pg_dump, which was actually broken for most cases of user-defined aggregates. Clean up error messages associated with these commands.
Diffstat (limited to 'src/bin/pg_dump/common.c')
-rw-r--r--src/bin/pg_dump/common.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 2fc9430630..f1ba9aed4b 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.57 2001/07/03 20:21:47 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.58 2001/10/03 20:54:21 tgl Exp $
*
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
*
@@ -56,7 +56,7 @@ static int strInArray(const char *pattern, char **arr, int arr_size);
* findTypeByOid
* given an oid of a type, return its typename
*
- * if oid is "0", return "opaque" -- this is a special case
+ * Can return various special cases for oid 0.
*
* NOTE: should hash this, but just do linear search for now
*/
@@ -68,19 +68,12 @@ findTypeByOid(TypeInfo *tinfo, int numTypes, const char *oid, OidOptions opts)
if (strcmp(oid, "0") == 0)
{
-
if ((opts & zeroAsOpaque) != 0)
- {
-
return g_opaque_type;
-
- }
else if ((opts & zeroAsAny) != 0)
- {
-
return "'any'";
-
- }
+ else if ((opts & zeroAsStar) != 0)
+ return "*";
}
for (i = 0; i < numTypes; i++)