mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-02-23 19:39:53 +08:00
Don't set a fast default for anything but a plain table
The fast default code added in Release 11 omitted to check that the table a fast default was being added to was a plain table. Thus one could be added to a foreign table, which predicably blows up. Here we perform that check. In addition, on the back branches, since some of these might have escaped into the wild, if we encounter a missing value for an attribute of something other than a plain table we ignore it. Fixes bug #17056 Backpatch to release 11, Reviewed by: Andres Freund, Álvaro Herrera and Tom Lane
This commit is contained in:
parent
981524d2e3
commit
0a4efdc7eb
@ -2161,6 +2161,13 @@ SetAttrMissing(Oid relid, char *attname, char *value)
|
|||||||
/* lock the table the attribute belongs to */
|
/* lock the table the attribute belongs to */
|
||||||
tablerel = table_open(relid, AccessExclusiveLock);
|
tablerel = table_open(relid, AccessExclusiveLock);
|
||||||
|
|
||||||
|
/* Don't do anything unless it's a plain table */
|
||||||
|
if (tablerel->rd_rel->relkind != RELKIND_RELATION)
|
||||||
|
{
|
||||||
|
table_close(tablerel, AccessExclusiveLock);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* Lock the attribute row and get the data */
|
/* Lock the attribute row and get the data */
|
||||||
attrrel = table_open(AttributeRelationId, RowExclusiveLock);
|
attrrel = table_open(AttributeRelationId, RowExclusiveLock);
|
||||||
atttup = SearchSysCacheAttName(relid, attname);
|
atttup = SearchSysCacheAttName(relid, attname);
|
||||||
@ -2287,7 +2294,8 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,
|
|||||||
valuesAtt[Anum_pg_attribute_atthasdef - 1] = true;
|
valuesAtt[Anum_pg_attribute_atthasdef - 1] = true;
|
||||||
replacesAtt[Anum_pg_attribute_atthasdef - 1] = true;
|
replacesAtt[Anum_pg_attribute_atthasdef - 1] = true;
|
||||||
|
|
||||||
if (add_column_mode && !attgenerated)
|
if (rel->rd_rel->relkind == RELKIND_RELATION && add_column_mode &&
|
||||||
|
!attgenerated)
|
||||||
{
|
{
|
||||||
expr2 = expression_planner(expr2);
|
expr2 = expression_planner(expr2);
|
||||||
estate = CreateExecutorState();
|
estate = CreateExecutorState();
|
||||||
|
@ -797,7 +797,26 @@ SELECT * FROM t WHERE a IS NULL;
|
|||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
ROLLBACK;
|
ROLLBACK;
|
||||||
|
-- verify that a default set on a non-plain table doesn't set a missing
|
||||||
|
-- value on the attribute
|
||||||
|
CREATE FOREIGN DATA WRAPPER dummy;
|
||||||
|
CREATE SERVER s0 FOREIGN DATA WRAPPER dummy;
|
||||||
|
CREATE FOREIGN TABLE ft1 (c1 integer NOT NULL) SERVER s0;
|
||||||
|
ALTER FOREIGN TABLE ft1 ADD COLUMN c8 integer DEFAULT 0;
|
||||||
|
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10);
|
||||||
|
SELECT count(*)
|
||||||
|
FROM pg_attribute
|
||||||
|
WHERE attrelid = 'ft1'::regclass AND
|
||||||
|
(attmissingval IS NOT NULL OR atthasmissing);
|
||||||
|
count
|
||||||
|
-------
|
||||||
|
0
|
||||||
|
(1 row)
|
||||||
|
|
||||||
-- cleanup
|
-- cleanup
|
||||||
|
DROP FOREIGN TABLE ft1;
|
||||||
|
DROP SERVER s0;
|
||||||
|
DROP FOREIGN DATA WRAPPER dummy;
|
||||||
DROP TABLE vtype;
|
DROP TABLE vtype;
|
||||||
DROP TABLE vtype2;
|
DROP TABLE vtype2;
|
||||||
DROP TABLE follower;
|
DROP TABLE follower;
|
||||||
|
@ -524,8 +524,22 @@ SET LOCAL enable_seqscan = false;
|
|||||||
SELECT * FROM t WHERE a IS NULL;
|
SELECT * FROM t WHERE a IS NULL;
|
||||||
ROLLBACK;
|
ROLLBACK;
|
||||||
|
|
||||||
|
-- verify that a default set on a non-plain table doesn't set a missing
|
||||||
|
-- value on the attribute
|
||||||
|
CREATE FOREIGN DATA WRAPPER dummy;
|
||||||
|
CREATE SERVER s0 FOREIGN DATA WRAPPER dummy;
|
||||||
|
CREATE FOREIGN TABLE ft1 (c1 integer NOT NULL) SERVER s0;
|
||||||
|
ALTER FOREIGN TABLE ft1 ADD COLUMN c8 integer DEFAULT 0;
|
||||||
|
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10);
|
||||||
|
SELECT count(*)
|
||||||
|
FROM pg_attribute
|
||||||
|
WHERE attrelid = 'ft1'::regclass AND
|
||||||
|
(attmissingval IS NOT NULL OR atthasmissing);
|
||||||
|
|
||||||
-- cleanup
|
-- cleanup
|
||||||
|
DROP FOREIGN TABLE ft1;
|
||||||
|
DROP SERVER s0;
|
||||||
|
DROP FOREIGN DATA WRAPPER dummy;
|
||||||
DROP TABLE vtype;
|
DROP TABLE vtype;
|
||||||
DROP TABLE vtype2;
|
DROP TABLE vtype2;
|
||||||
DROP TABLE follower;
|
DROP TABLE follower;
|
||||||
|
Loading…
Reference in New Issue
Block a user