diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 22 | ||||
| -rw-r--r-- | src/backend/utils/cache/typcache.c | 2 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 752757be116..07b454418d7 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -2496,15 +2496,23 @@ pg_get_constraintdef_worker(Oid constraintId, bool fullCommand, } case CONSTRAINT_NOTNULL: { - AttrNumber attnum; + if (conForm->conrelid) + { + AttrNumber attnum; - attnum = extractNotNullColumn(tup); + attnum = extractNotNullColumn(tup); - appendStringInfo(&buf, "NOT NULL %s", - quote_identifier(get_attname(conForm->conrelid, - attnum, false))); - if (((Form_pg_constraint) GETSTRUCT(tup))->connoinherit) - appendStringInfoString(&buf, " NO INHERIT"); + appendStringInfo(&buf, "NOT NULL %s", + quote_identifier(get_attname(conForm->conrelid, + attnum, false))); + if (((Form_pg_constraint) GETSTRUCT(tup))->connoinherit) + appendStringInfoString(&buf, " NO INHERIT"); + } + else if (conForm->contypid) + { + /* conkey is null for domain not-null constraints */ + appendStringInfoString(&buf, "NOT NULL VALUE"); + } break; } diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index d86c3b06fa0..aa4720cb598 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -1071,7 +1071,7 @@ load_domaintype_info(TypeCacheEntry *typentry) Expr *check_expr; DomainConstraintState *r; - /* Ignore non-CHECK constraints (presently, shouldn't be any) */ + /* Ignore non-CHECK constraints */ if (c->contype != CONSTRAINT_CHECK) continue; |