NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitfaba9fa

committed

pg_dump was trying to use an incorrect (or, perhaps, only obsolete?)

syntax for CREATE OPERATOR with SORT parameters. Fixed.It is now actually possible to dump and reload a database containingfully specified user-definable operators ...

1 parent29e2916 commitfaba9faCopy full SHA for faba9fa

File tree

1 file changed

+22

-21

lines changed

src/bin/pg_dump
- pg_dump.c

1 file changed

+22

-21

lines changed

`‎src/bin/pg_dump/pg_dump.c‎`

Lines changed: 22 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`*`
`23`	`23`	`* IDENTIFICATION`
`24`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.102 1999/02/13 23:20:23 momjian Exp $`
	`24`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.103 1999/04/14 23:47:19 tgl Exp $`
`25`	`25`	`*`
`26`	`26`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`27`	`27`	`*`
`@@ -2321,7 +2321,8 @@ dumpOprs(FILE fout, OprInfo oprinfo, int numOperators,`
`2321`	`2321`	`charnegator[MAXQUERYLEN];`
`2322`	`2322`	`charrestrictor[MAXQUERYLEN];`
`2323`	`2323`	`charjoin[MAXQUERYLEN];`
`2324`		`-charsortop[MAXQUERYLEN];`
	`2324`	`+charsort1[MAXQUERYLEN];`
	`2325`	`+charsort2[MAXQUERYLEN];`
`2325`	`2326`
`2326`	`2327`	`for (i=0;i<numOperators;i++)`
`2327`	`2328`	`{`
`@@ -2347,49 +2348,48 @@ dumpOprs(FILE fout, OprInfo oprinfo, int numOperators,`
`2347`	`2348`	`if (strcmp(oprinfo[i].oprkind,"r")==0\|\|`
`2348`	`2349`	`strcmp(oprinfo[i].oprkind,"b")==0)`
`2349`	`2350`	`{`
`2350`		`-sprintf(leftarg,", LEFTARG = %s ",`
	`2351`	`+sprintf(leftarg,",\n\tLEFTARG = %s ",`
`2351`	`2352`	`fmtId(findTypeByOid(tinfo,numTypes,oprinfo[i].oprleft), false));`
`2352`	`2353`	`}`
`2353`	`2354`	`if (strcmp(oprinfo[i].oprkind,"l")==0\|\|`
`2354`	`2355`	`strcmp(oprinfo[i].oprkind,"b")==0)`
`2355`	`2356`	`{`
`2356`		`-sprintf(rightarg,", RIGHTARG = %s ",`
	`2357`	`+sprintf(rightarg,",\n\tRIGHTARG = %s ",`
`2357`	`2358`	`fmtId(findTypeByOid(tinfo,numTypes,oprinfo[i].oprright), false));`
`2358`	`2359`	`}`
`2359`	`2360`	`if (strcmp(oprinfo[i].oprcom,"0")==0)`
`2360`	`2361`	`commutator[0]='\0';`
`2361`	`2362`	`else`
`2362`		`-sprintf(commutator,", COMMUTATOR = %s ",`
	`2363`	`+sprintf(commutator,",\n\tCOMMUTATOR = %s ",`
`2363`	`2364`	`findOprByOid(oprinfo,numOperators,oprinfo[i].oprcom));`
`2364`	`2365`
`2365`	`2366`	`if (strcmp(oprinfo[i].oprnegate,"0")==0)`
`2366`	`2367`	`negator[0]='\0';`
`2367`	`2368`	`else`
`2368`		`-sprintf(negator,", NEGATOR = %s ",`
	`2369`	`+sprintf(negator,",\n\tNEGATOR = %s ",`
`2369`	`2370`	`findOprByOid(oprinfo,numOperators,oprinfo[i].oprnegate));`
`2370`	`2371`
`2371`	`2372`	`if (strcmp(oprinfo[i].oprrest,"-")==0)`
`2372`	`2373`	`restrictor[0]='\0';`
`2373`	`2374`	`else`
`2374`		`-sprintf(restrictor,", RESTRICT = %s ",oprinfo[i].oprrest);`
	`2375`	`+sprintf(restrictor,",\n\tRESTRICT = %s ",oprinfo[i].oprrest);`
`2375`	`2376`
`2376`	`2377`	`if (strcmp(oprinfo[i].oprjoin,"-")==0)`
`2377`	`2378`	`join[0]='\0';`
`2378`	`2379`	`else`
`2379`		`-sprintf(join,", JOIN = %s ",oprinfo[i].oprjoin);`
	`2380`	`+sprintf(join,",\n\tJOIN = %s ",oprinfo[i].oprjoin);`
`2380`	`2381`
`2381`	`2382`	`if (strcmp(oprinfo[i].oprlsortop,"0")==0)`
`2382`		`-sortop[0]='\0';`
	`2383`	`+sort1[0]='\0';`
`2383`	`2384`	`else`
`2384`		`-{`
`2385`		`-sprintf(sortop,", SORT = %s ",`
`2386`		`-findOprByOid(oprinfo,numOperators,`
`2387`		`-oprinfo[i].oprlsortop));`
`2388`		`-if (strcmp(oprinfo[i].oprrsortop,"0")!=0)`
`2389`		`-sprintf(sortop,"%s , %s",sortop,`
`2390`		`-findOprByOid(oprinfo,numOperators,`
`2391`		`-oprinfo[i].oprlsortop));`
`2392`		`-}`
	`2385`	`+sprintf(sort1,",\n\tSORT1 = %s ",`
	`2386`	`+findOprByOid(oprinfo,numOperators,oprinfo[i].oprlsortop));`
	`2387`	`+`
	`2388`	`+if (strcmp(oprinfo[i].oprrsortop,"0")==0)`
	`2389`	`+sort2[0]='\0';`
	`2390`	`+else`
	`2391`	`+sprintf(sort2,",\n\tSORT2 = %s ",`
	`2392`	`+findOprByOid(oprinfo,numOperators,oprinfo[i].oprrsortop));`
`2393`	`2393`
`2394`	`2394`	`becomeUser(fout,oprinfo[i].usename);`
`2395`	`2395`
`@@ -2403,17 +2403,18 @@ dumpOprs(FILE fout, OprInfo oprinfo, int numOperators,`
`2403`	`2403`
`2404`	`2404`	`sprintf(q,`
`2405`	`2405`	`"CREATE OPERATOR %s "`
`2406`		`-"(PROCEDURE = %s %s %s %s %s %s %s %s %s);\n",`
	`2406`	`+"(PROCEDURE = %s %s%s%s%s%s%s%s%s%s);\n",`
`2407`	`2407`	`oprinfo[i].oprname,`
`2408`	`2408`	`oprinfo[i].oprcode,`
`2409`	`2409`	`leftarg,`
`2410`	`2410`	`rightarg,`
`2411`	`2411`	`commutator,`
`2412`	`2412`	`negator,`
`2413`	`2413`	`restrictor,`
`2414`		`-(strcmp(oprinfo[i].oprcanhash,"t")==0) ?", HASHES" :"",`
	`2414`	`+(strcmp(oprinfo[i].oprcanhash,"t")==0) ?",\n\tHASHES" :"",`
`2415`	`2415`	`join,`
`2416`		`-sortop);`
	`2416`	`+sort1,`
	`2417`	`+sort2);`
`2417`	`2418`
`2418`	`2419`	`fputs(q,fout);`
`2419`	`2420`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfaba9fa

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/pg_dump.c‎`

0 commit comments