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

Ooops, I was a little too enthusiastic about suppressing default

Browse Source 
index opclasses; they might be default for some other datatype,
in which case we mustn't suppress 'em.
This commit is contained in:
Tom Lane 2001-10-04 22:00:10 +00:00
parent 3f8a50c013
commit 1ca0874faa
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/utils/adt/ruleutils.c
View File

@ -3,7 +3,7 @@
* back to source text * back to source text
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.83 2001/10/01 20:15:26 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.84 2001/10/04 22:00:10 tgl Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -136,7 +136,7 @@ static void get_sublink_expr(Node *node, deparse_context *context);
static void get_from_clause(Query *query, deparse_context *context); static void get_from_clause(Query *query, deparse_context *context);
static void get_from_clause_item(Node *jtnode, Query *query, static void get_from_clause_item(Node *jtnode, Query *query,
deparse_context *context); deparse_context *context);
static void get_opclass_name(Oid opclass, bool only_nondefault, static void get_opclass_name(Oid opclass, Oid actual_datatype,
StringInfo buf); StringInfo buf);
static bool tleIsArrayAssign(TargetEntry *tle); static bool tleIsArrayAssign(TargetEntry *tle);
static char *quote_identifier(char *ident); static char *quote_identifier(char *ident);
@ -408,7 +408,9 @@ pg_get_indexdef(PG_FUNCTION_ARGS)
sep = ""; sep = "";
for (keyno = 0; keyno < INDEX_MAX_KEYS; keyno++) for (keyno = 0; keyno < INDEX_MAX_KEYS; keyno++)
{ {
if (idxrec->indkey[keyno] == InvalidAttrNumber) AttrNumber attnum = idxrec->indkey[keyno];
if (attnum == InvalidAttrNumber)
break; break;
appendStringInfo(&keybuf, sep); appendStringInfo(&keybuf, sep);
@ -419,13 +421,15 @@ pg_get_indexdef(PG_FUNCTION_ARGS)
*/ */
appendStringInfo(&keybuf, "%s", appendStringInfo(&keybuf, "%s",
quote_identifier(get_relid_attribute_name(idxrec->indrelid, quote_identifier(get_relid_attribute_name(idxrec->indrelid,
idxrec->indkey[keyno]))); attnum)));
/* /*
* If not a functional index, add the operator class name * If not a functional index, add the operator class name
*/ */
if (idxrec->indproc == InvalidOid) if (idxrec->indproc == InvalidOid)
get_opclass_name(idxrec->indclass[keyno], true, &keybuf); get_opclass_name(idxrec->indclass[keyno],
get_atttype(idxrec->indrelid, attnum),
&keybuf);
} }
if (idxrec->indproc != InvalidOid) if (idxrec->indproc != InvalidOid)
@ -446,7 +450,7 @@ pg_get_indexdef(PG_FUNCTION_ARGS)
appendStringInfo(&buf, "%s(%s)", appendStringInfo(&buf, "%s(%s)",
quote_identifier(NameStr(procStruct->proname)), quote_identifier(NameStr(procStruct->proname)),
keybuf.data); keybuf.data);
get_opclass_name(idxrec->indclass[0], true, &buf); get_opclass_name(idxrec->indclass[0], procStruct->prorettype, &buf);
ReleaseSysCache(proctup); ReleaseSysCache(proctup);
} }
@ -2504,12 +2508,14 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
* get_opclass_name - fetch name of an index operator class * get_opclass_name - fetch name of an index operator class
* *
* The opclass name is appended (after a space) to buf. * The opclass name is appended (after a space) to buf.
* If "only_nondefault" is true, the opclass name is appended only if *
* it isn't the default for its datatype. * Output is suppressed if the opclass is the default for the given
* actual_datatype. (If you don't want this behavior, just pass
* InvalidOid for actual_datatype.)
* ---------- * ----------
*/ */
static void static void
get_opclass_name(Oid opclass, bool only_nondefault, get_opclass_name(Oid opclass, Oid actual_datatype,
StringInfo buf) StringInfo buf)
{ {
HeapTuple ht_opc; HeapTuple ht_opc;
@ -2521,7 +2527,7 @@ get_opclass_name(Oid opclass, bool only_nondefault,
if (!HeapTupleIsValid(ht_opc)) if (!HeapTupleIsValid(ht_opc))
elog(ERROR, "cache lookup failed for opclass %u", opclass); elog(ERROR, "cache lookup failed for opclass %u", opclass);
opcrec = (Form_pg_opclass) GETSTRUCT(ht_opc); opcrec = (Form_pg_opclass) GETSTRUCT(ht_opc);
if (!only_nondefault || !opcrec->opcdefault) if (actual_datatype != opcrec->opcintype || !opcrec->opcdefault)
appendStringInfo(buf, " %s", appendStringInfo(buf, " %s",
quote_identifier(NameStr(opcrec->opcname))); quote_identifier(NameStr(opcrec->opcname)));
ReleaseSysCache(ht_opc); ReleaseSysCache(ht_opc);