diff options
author | Andrew Dunstan <andrew@dunslane.net> | 2021-06-28 11:05:54 -0400 |
---|---|---|
committer | Andrew Dunstan <andrew@dunslane.net> | 2021-06-28 11:05:54 -0400 |
commit | e1c1c30f635390b6a3ae4993e8cac213a33e6e3f (patch) | |
tree | f91c0903c634bcbe7b06c4548af82d6e351e2090 /src/backend/catalog | |
parent | c31833779d5a4775d7220be4b9143bec66c9a9fd (diff) | |
download | postgresql-e1c1c30f635390b6a3ae4993e8cac213a33e6e3f.tar.gz |
Pre branch pgindent / pgperltidy run
Along the way make a slight adjustment to
src/include/utils/queryjumble.h to avoid an unused typedef.
Diffstat (limited to 'src/backend/catalog')
-rw-r--r-- | src/backend/catalog/genbki.pl | 10 | ||||
-rw-r--r-- | src/backend/catalog/heap.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl index 81363a0710..f023cb1209 100644 --- a/src/backend/catalog/genbki.pl +++ b/src/backend/catalog/genbki.pl @@ -890,11 +890,11 @@ sub morph_row_for_pgattr # Copy the type data from pg_type, and add some type-dependent items my $type = $types{$atttype}; - $row->{atttypid} = $type->{oid}; - $row->{attlen} = $type->{typlen}; - $row->{attbyval} = $type->{typbyval}; - $row->{attalign} = $type->{typalign}; - $row->{attstorage} = $type->{typstorage}; + $row->{atttypid} = $type->{oid}; + $row->{attlen} = $type->{typlen}; + $row->{attbyval} = $type->{typbyval}; + $row->{attalign} = $type->{typalign}; + $row->{attstorage} = $type->{typstorage}; $row->{attcompression} = '\0'; # set attndims if it's an array type diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 1293dc04ca..09370a8a5a 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -2294,7 +2294,7 @@ StoreAttrDefault(Relation rel, AttrNumber attnum, valuesAtt[Anum_pg_attribute_atthasdef - 1] = true; replacesAtt[Anum_pg_attribute_atthasdef - 1] = true; - if (rel->rd_rel->relkind == RELKIND_RELATION && add_column_mode && + if (rel->rd_rel->relkind == RELKIND_RELATION && add_column_mode && !attgenerated) { expr2 = expression_planner(expr2); |