Commitb2e859a

committed

Generate correct syntax for DROP OPERATOR with unary operators.

1 parentb5ab19a commitb2e859aCopy full SHA for b2e859a

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.58 2001/10/03 20:54:21 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.59 2001/10/22 19:31:09 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2`
`14`	`14`	`*`
`@@ -74,6 +74,8 @@ findTypeByOid(TypeInfo tinfo, int numTypes, const char oid, OidOptions opts)`
`74`	`74`	`return"'any'";`
`75`	`75`	`elseif ((opts&zeroAsStar)!=0)`
`76`	`76`	`return"*";`
	`77`	`+elseif ((opts&zeroAsNone)!=0)`
	`78`	`+return"NONE";`
`77`	`79`	`}`
`78`	`80`
`79`	`81`	`for (i=0;i<numTypes;i++)`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`*`
`24`	`24`	`* IDENTIFICATION`
`25`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.233 2001/10/03 20:54:21 tgl Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.234 2001/10/22 19:31:09 tgl Exp $`
`26`	`26`	`*`
`27`	`27`	`*-------------------------------------------------------------------------`
`28`	`28`	`*/`
`@@ -3642,10 +3642,13 @@ dumpOprs(Archive fout, OprInfo oprinfo, int numOperators,`
`3642`	`3642`	`}`
`3643`	`3643`
`3644`	`3644`	`resetPQExpBuffer(delq);`
`3645`		`-appendPQExpBuffer(delq,"DROP OPERATOR %s (%s",oprinfo[i].oprname,`
`3646`		`-findTypeByOid(tinfo,numTypes,oprinfo[i].oprleft,zeroAsOpaque));`
	`3645`	`+appendPQExpBuffer(delq,"DROP OPERATOR %s (%s",`
	`3646`	`+oprinfo[i].oprname,`
	`3647`	`+findTypeByOid(tinfo,numTypes,oprinfo[i].oprleft,`
	`3648`	`+zeroAsNone));`
`3647`	`3649`	`appendPQExpBuffer(delq,", %s);\n",`
`3648`		`-findTypeByOid(tinfo,numTypes,oprinfo[i].oprright,zeroAsOpaque));`
	`3650`	`+findTypeByOid(tinfo,numTypes,oprinfo[i].oprright,`
	`3651`	`+zeroAsNone));`
`3649`	`3652`
`3650`	`3653`	`resetPQExpBuffer(q);`
`3651`	`3654`	`appendPQExpBuffer(q,`

Lines changed: 2 additions & 1 deletion

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

Comments

(0)