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

Generate correct syntax for DROP OPERATOR with unary operators.

Browse Source
This commit is contained in:
Tom Lane 2001-10-22 19:31:09 +00:00
parent b5ab19a610
commit b2e859a4fe
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/pg_dump/common.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.58 2001/10/03 20:54:21 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.59 2001/10/22 19:31:09 tgl Exp $
* *
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2 * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
* *
@ -74,6 +74,8 @@ findTypeByOid(TypeInfo *tinfo, int numTypes, const char *oid, OidOptions opts)
return "'any'"; return "'any'";
else if ((opts & zeroAsStar) != 0) else if ((opts & zeroAsStar) != 0)
return "*"; return "*";
else if ((opts & zeroAsNone) != 0)
return "NONE";
} }
for (i = 0; i < numTypes; i++) for (i = 0; i < numTypes; i++)

11
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.233 2001/10/03 20:54:21 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.234 2001/10/22 19:31:09 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -3642,10 +3642,13 @@ dumpOprs(Archive *fout, OprInfo *oprinfo, int numOperators,
} }
resetPQExpBuffer(delq); resetPQExpBuffer(delq);
appendPQExpBuffer(delq, "DROP OPERATOR %s (%s", oprinfo[i].oprname, appendPQExpBuffer(delq, "DROP OPERATOR %s (%s",
findTypeByOid(tinfo, numTypes, oprinfo[i].oprleft, zeroAsOpaque)); oprinfo[i].oprname,
findTypeByOid(tinfo, numTypes, oprinfo[i].oprleft,
zeroAsNone));
appendPQExpBuffer(delq, ", %s);\n", appendPQExpBuffer(delq, ", %s);\n",
findTypeByOid(tinfo, numTypes, oprinfo[i].oprright, zeroAsOpaque)); findTypeByOid(tinfo, numTypes, oprinfo[i].oprright,
zeroAsNone));
resetPQExpBuffer(q); resetPQExpBuffer(q);
appendPQExpBuffer(q, appendPQExpBuffer(q,

3
src/bin/pg_dump/pg_dump.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_dump.h,v 1.72 2001/10/03 20:54:21 tgl Exp $ * $Id: pg_dump.h,v 1.73 2001/10/22 19:31:09 tgl Exp $
* *
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2 * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
* *
@ -224,6 +224,7 @@ typedef enum _OidOptions
zeroAsOpaque = 1, zeroAsOpaque = 1,
zeroAsAny = 2, zeroAsAny = 2,
zeroAsStar = 4, zeroAsStar = 4,
zeroAsNone = 8,
useBaseTypeName = 1024 useBaseTypeName = 1024
} OidOptions; } OidOptions;