git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b057512)

Need to do CommandCounterIncrement after StoreAttrMissingVal.

author Tom Lane <tgl@sss.pgh.pa.us>

Wed, 2 Apr 2025 15:13:01 +0000 (11:13 -0400)

committer Tom Lane <tgl@sss.pgh.pa.us>

Wed, 2 Apr 2025 15:13:01 +0000 (11:13 -0400)

Without this, an additional change to the same pg_attribute row
within the same command will fail. This is possible at least with
ALTER TABLE ADD COLUMN on a multiple-inheritance-pathway structure.
(Another potential hazard is that immediately-following operations
might not see the missingval.)

Introduced by 95f650674, which split the former coding that
used a single pg_attribute update to change both atthasdef and
atthasmissing/attmissingval into two updates, but missed that
this should entail two CommandCounterIncrements as well. Like
that fix, back-patch through v13.

Reported-by: Alexander Lakhin <exclusion@gmail.com>
Author: Tender Wang <tndrwang@gmail.com>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/025a3ffa-5eff-4a88-97fb-8f583b015965@gmail.com
Backpatch-through: 13

src/backend/commands/tablecmds.c patch | blob | blame | history

src/test/regress/expected/inherit.out patch | blob | blame | history

src/test/regress/sql/inherit.sql patch | blob | blame | history

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c

index f47b82dbcf377e7506a275dd6712068c7e348fd8..11fcb51a165d518f5b570e9521183f9e056abcb8 100644 (file)

--- a/src/backend/commands/tablecmds.c

+++ b/src/backend/commands/tablecmds.c

@@ -7533,6 +7533,8 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,

if (!missingIsNull)

{

StoreAttrMissingVal(rel, attribute->attnum, missingval);

+ /* Make the additional catalog change visible */

+ CommandCounterIncrement();

has_missing = true;

}

FreeExecutorState(estate);

diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out

index c01e9d5244fd3f5602e3ec20d0320a1ea5379ffb..2a8bfba768e7f2fb533f1b2d5d161ae54bc5e48d 100644 (file)

--- a/src/test/regress/expected/inherit.out

+++ b/src/test/regress/expected/inherit.out

@@ -1096,17 +1096,30 @@ CREATE TABLE inhta ();

CREATE TABLE inhtb () INHERITS (inhta);

CREATE TABLE inhtc () INHERITS (inhtb);

CREATE TABLE inhtd () INHERITS (inhta, inhtb, inhtc);

-ALTER TABLE inhta ADD COLUMN i int;

+ALTER TABLE inhta ADD COLUMN i int, ADD COLUMN j bigint DEFAULT 1;

NOTICE: merging definition of column "i" for child "inhtd"

NOTICE: merging definition of column "i" for child "inhtd"

+NOTICE: merging definition of column "j" for child "inhtd"

+NOTICE: merging definition of column "j" for child "inhtd"

\d+ inhta

Table "public.inhta"

Column | Type | Collation | Nullable | Default | Storage | Stats target | Description

--------+---------+-----------+----------+---------+---------+--------------+-------------

i | integer | | | | plain | |

+ j | bigint | | | 1 | plain | |

Child tables: inhtb,

inhtd

+\d+ inhtd

+ Table "public.inhtd"

+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description

+--------+---------+-----------+----------+---------+---------+--------------+-------------

+ i | integer | | | | plain | |

+ j | bigint | | | 1 | plain | |

+Inherits: inhta,

+ inhtb,

+ inhtc

+

DROP TABLE inhta, inhtb, inhtc, inhtd;

-- Test for renaming in diamond inheritance

CREATE TABLE inht2 (x int) INHERITS (inht1);

diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql

index 9b4bd4606f915c59f5d7ffed883299a516fc12e4..699e8ac09c88ef35fbfdc1bc73628433eb057602 100644 (file)

--- a/src/test/regress/sql/inherit.sql

+++ b/src/test/regress/sql/inherit.sql

@@ -380,8 +380,9 @@ CREATE TABLE inhta ();

CREATE TABLE inhtb () INHERITS (inhta);

CREATE TABLE inhtc () INHERITS (inhtb);

CREATE TABLE inhtd () INHERITS (inhta, inhtb, inhtc);

-ALTER TABLE inhta ADD COLUMN i int;

+ALTER TABLE inhta ADD COLUMN i int, ADD COLUMN j bigint DEFAULT 1;

\d+ inhta

+\d+ inhtd

DROP TABLE inhta, inhtb, inhtc, inhtd;

-- Test for renaming in diamond inheritance

This is the main PostgreSQL git repository.