diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-07-21 13:03:48 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-07-21 13:03:48 -0400 |
| commit | fc032bed2fb809ee69eaf2fece349f65274c876f (patch) | |
| tree | ffa25e5ca8c23870892aaf0b8b292b46637de7aa /src/backend/bootstrap/bootstrap.c | |
| parent | 3e66019f15549d3e1e13da665b2549684061d630 (diff) | |
| download | postgresql-fc032bed2fb809ee69eaf2fece349f65274c876f.tar.gz postgresql-fc032bed2fb809ee69eaf2fece349f65274c876f.zip | |
Be more careful about marking catalog columns NOT NULL by default.
The bug fixed in commit 72eab84a5 would not have occurred if initdb
had a less surprising rule about which columns should be marked
NOT NULL by default. Let's make that rule be strictly that the
column must be fixed-width and its predecessors must be fixed-width
and NOT NULL, removing the hacky and unsafe exceptions for oidvector
and int2vector.
Since we do still want all existing oidvector and int2vector columns
to be marked NOT NULL, we have to put BKI_FORCE_NOT_NULL labels on
them. But making this less magic and more documented seems like a
good idea, even if it's a shade more verbose.
I didn't bump catversion since the initial catalog contents are
not actually changed by this patch. Note however that the
contents of postgres.bki do change, and feeding an old copy of
that to a new backend will produce wrong results.
Discussion: https://postgr.es/m/204760.1595181800@sss.pgh.pa.us
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 5480a024e05..45b7efbe465 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -770,25 +770,18 @@ DefineAttr(char *name, char *type, int attnum, int nullness) /* * Mark as "not null" if type is fixed-width and prior columns are - * too. This corresponds to case where column can be accessed - * directly via C struct declaration. - * - * oidvector and int2vector are also treated as not-nullable, even - * though they are no longer fixed-width. + * likewise fixed-width and not-null. This corresponds to case where + * column can be accessed directly via C struct declaration. */ -#define MARKNOTNULL(att) \ - ((att)->attlen > 0 || \ - (att)->atttypid == OIDVECTOROID || \ - (att)->atttypid == INT2VECTOROID) - - if (MARKNOTNULL(attrtypes[attnum])) + if (attrtypes[attnum]->attlen > 0) { int i; /* check earlier attributes */ for (i = 0; i < attnum; i++) { - if (!attrtypes[i]->attnotnull) + if (attrtypes[i]->attlen <= 0 || + !attrtypes[i]->attnotnull) break; } if (i == attnum) |