mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
syntax for CREATE OPERATOR with SORT parameters.  Fixed.
It is now actually possible to dump and reload a database containing
fully specified user-definable operators ...
This commit is contained in:
Tom Lane 1999-04-14 23:47:19 +00:00
parent 29e2916827
commit faba9fa747
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/bin/pg_dump/pg_dump.c
View File

@ -21,7 +21,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.102 1999/02/13 23:20:23 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.103 1999/04/14 23:47:19 tgl Exp $
* *
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
* *
@ -2321,7 +2321,8 @@ dumpOprs(FILE *fout, OprInfo *oprinfo, int numOperators,
char negator[MAXQUERYLEN]; char negator[MAXQUERYLEN];
char restrictor[MAXQUERYLEN]; char restrictor[MAXQUERYLEN];
char join[MAXQUERYLEN]; char join[MAXQUERYLEN];
char sortop[MAXQUERYLEN]; char sort1[MAXQUERYLEN];
char sort2[MAXQUERYLEN];
for (i = 0; i < numOperators; i++) for (i = 0; i < numOperators; i++)
{ {
@ -2347,49 +2348,48 @@ dumpOprs(FILE *fout, OprInfo *oprinfo, int numOperators,
if (strcmp(oprinfo[i].oprkind, "r") == 0 || if (strcmp(oprinfo[i].oprkind, "r") == 0 ||
strcmp(oprinfo[i].oprkind, "b") == 0) strcmp(oprinfo[i].oprkind, "b") == 0)
{ {
sprintf(leftarg, ", LEFTARG = %s ", sprintf(leftarg, ",\n\tLEFTARG = %s ",
fmtId(findTypeByOid(tinfo, numTypes, oprinfo[i].oprleft), false)); fmtId(findTypeByOid(tinfo, numTypes, oprinfo[i].oprleft), false));
} }
if (strcmp(oprinfo[i].oprkind, "l") == 0 || if (strcmp(oprinfo[i].oprkind, "l") == 0 ||
strcmp(oprinfo[i].oprkind, "b") == 0) strcmp(oprinfo[i].oprkind, "b") == 0)
{ {
sprintf(rightarg, ", RIGHTARG = %s ", sprintf(rightarg, ",\n\tRIGHTARG = %s ",
fmtId(findTypeByOid(tinfo, numTypes, oprinfo[i].oprright), false)); fmtId(findTypeByOid(tinfo, numTypes, oprinfo[i].oprright), false));
} }
if (strcmp(oprinfo[i].oprcom, "0") == 0) if (strcmp(oprinfo[i].oprcom, "0") == 0)
commutator[0] = '\0'; commutator[0] = '\0';
else else
sprintf(commutator, ", COMMUTATOR = %s ", sprintf(commutator, ",\n\tCOMMUTATOR = %s ",
findOprByOid(oprinfo, numOperators, oprinfo[i].oprcom)); findOprByOid(oprinfo, numOperators, oprinfo[i].oprcom));
if (strcmp(oprinfo[i].oprnegate, "0") == 0) if (strcmp(oprinfo[i].oprnegate, "0") == 0)
negator[0] = '\0'; negator[0] = '\0';
else else
sprintf(negator, ", NEGATOR = %s ", sprintf(negator, ",\n\tNEGATOR = %s ",
findOprByOid(oprinfo, numOperators, oprinfo[i].oprnegate)); findOprByOid(oprinfo, numOperators, oprinfo[i].oprnegate));
if (strcmp(oprinfo[i].oprrest, "-") == 0) if (strcmp(oprinfo[i].oprrest, "-") == 0)
restrictor[0] = '\0'; restrictor[0] = '\0';
else else
sprintf(restrictor, ", RESTRICT = %s ", oprinfo[i].oprrest); sprintf(restrictor, ",\n\tRESTRICT = %s ", oprinfo[i].oprrest);
if (strcmp(oprinfo[i].oprjoin, "-") == 0) if (strcmp(oprinfo[i].oprjoin, "-") == 0)
join[0] = '\0'; join[0] = '\0';
else else
sprintf(join, ", JOIN = %s ", oprinfo[i].oprjoin); sprintf(join, ",\n\tJOIN = %s ", oprinfo[i].oprjoin);
if (strcmp(oprinfo[i].oprlsortop, "0") == 0) if (strcmp(oprinfo[i].oprlsortop, "0") == 0)
sortop[0] = '\0'; sort1[0] = '\0';
else else
{ sprintf(sort1, ",\n\tSORT1 = %s ",
sprintf(sortop, ", SORT = %s ", findOprByOid(oprinfo, numOperators, oprinfo[i].oprlsortop));
findOprByOid(oprinfo, numOperators,
oprinfo[i].oprlsortop)); if (strcmp(oprinfo[i].oprrsortop, "0") == 0)
if (strcmp(oprinfo[i].oprrsortop, "0") != 0) sort2[0] = '\0';
sprintf(sortop, "%s , %s", sortop, else
findOprByOid(oprinfo, numOperators, sprintf(sort2, ",\n\tSORT2 = %s ",
oprinfo[i].oprlsortop)); findOprByOid(oprinfo, numOperators, oprinfo[i].oprrsortop));
}
becomeUser(fout, oprinfo[i].usename); becomeUser(fout, oprinfo[i].usename);
@ -2403,7 +2403,7 @@ dumpOprs(FILE *fout, OprInfo *oprinfo, int numOperators,
sprintf(q, sprintf(q,
"CREATE OPERATOR %s " "CREATE OPERATOR %s "
"(PROCEDURE = %s %s %s %s %s %s %s %s %s);\n ", "(PROCEDURE = %s %s%s%s%s%s%s%s%s%s);\n",
oprinfo[i].oprname, oprinfo[i].oprname,
oprinfo[i].oprcode, oprinfo[i].oprcode,
leftarg, leftarg,
@ -2411,9 +2411,10 @@ dumpOprs(FILE *fout, OprInfo *oprinfo, int numOperators,
commutator, commutator,
negator, negator,
restrictor, restrictor,
(strcmp(oprinfo[i].oprcanhash, "t") == 0) ? ", HASHES" : "", (strcmp(oprinfo[i].oprcanhash, "t") == 0) ? ",\n\tHASHES" : "",
join, join,
sortop); sort1,
sort2);
fputs(q, fout); fputs(q, fout);
} }