diff options
| author | Teodor Sigaev <teodor@sigaev.ru> | 2016-04-08 21:52:13 +0300 |
|---|---|---|
| committer | Teodor Sigaev <teodor@sigaev.ru> | 2016-04-08 21:52:13 +0300 |
| commit | 8b99edefcab1e82c43139a2c7dc06d31fb27b3e4 (patch) | |
| tree | 5428925d16447c4d204e0956e6d2ae1032847585 /src/backend/utils/adt/ruleutils.c | |
| parent | 35e2e357cb054dc9e5d890fe754c56f0722f015e (diff) | |
| download | postgresql-8b99edefcab1e82c43139a2c7dc06d31fb27b3e4.tar.gz postgresql-8b99edefcab1e82c43139a2c7dc06d31fb27b3e4.zip | |
Revert CREATE INDEX ... INCLUDING ...
It's not ready yet, revert two commits
690c543550b0d2852060c18d270cdb534d339d9a - unstable test output
386e3d7609c49505e079c40c65919d99feb82505 - patch itself
Diffstat (limited to 'src/backend/utils/adt/ruleutils.c')
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 0e1eefd8dac..2b47e95a687 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -1140,21 +1140,6 @@ pg_get_indexdef_worker(Oid indexrelid, int colno, Oid keycoltype; Oid keycolcollation; - /* - * attrsOnly flag is used for building unique-constraint and - * exclusion-constraint error messages. Included attrs are - * meaningless there, so do not include them into the message. - */ - if (attrsOnly && keyno >= idxrec->indnkeyatts) - break; - - /* Report the INCLUDED attributes, if any. */ - if ((!attrsOnly) && keyno == idxrec->indnkeyatts) - { - appendStringInfoString(&buf, ") INCLUDING ("); - sep = ""; - } - if (!colno) appendStringInfoString(&buf, sep); sep = ", "; @@ -1168,7 +1153,6 @@ pg_get_indexdef_worker(Oid indexrelid, int colno, attname = get_relid_attribute_name(indrelid, attnum); if (!colno || colno == keyno + 1) appendStringInfoString(&buf, quote_identifier(attname)); - get_atttypetypmodcoll(indrelid, attnum, &keycoltype, &keycoltypmod, &keycolcollation); @@ -1208,9 +1192,6 @@ pg_get_indexdef_worker(Oid indexrelid, int colno, appendStringInfo(&buf, " COLLATE %s", generate_collation_name((indcoll))); - if(keyno >= idxrec->indnkeyatts) - continue; - /* Add the operator class name, if not default */ get_opclass_name(indclass->values[keyno], keycoltype, &buf); @@ -1539,19 +1520,6 @@ pg_get_constraintdef_worker(Oid constraintId, bool fullCommand, appendStringInfoChar(&buf, ')'); - /* Fetch and build including column list */ - isnull = true; - val = SysCacheGetAttr(CONSTROID, tup, - Anum_pg_constraint_conincluding, &isnull); - if (!isnull) - { - appendStringInfoString(&buf, " INCLUDING ("); - - decompile_column_index_array(val, conForm->conrelid, &buf); - - appendStringInfoChar(&buf, ')'); - } - indexId = get_constraint_index(constraintId); /* XXX why do we only print these bits if fullCommand? */ |