rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALTER TABLE: rework determination of access method ID 

Avoid setting an access method OID for relation kinds that don't take
one.  Code review for new feature added in 374c7a2290.

Author: Justin Pryzby <pryzby@telsasoft.com>
Reported-by: Alexander Lakhin <exclusion@gmail.com>
Discussion: https://postgr.es/m/e5516ac1-5264-c3c0-d822-9e6f614ea93b@gmail.com
This commit is contained in:
Alvaro Herrera 2024-03-28 16:51:20 +01:00
parent be98a550cc
commit e2395cdbe8
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/commands/tablecmds.c
View File

@ -958,22 +958,26 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
} }
/* /*
* Select access method to use: an explicitly indicated one, or (in the * For relations with table AM and partitioned tables, select access
* case of a partitioned table) the parent's, if it has one. * method to use: an explicitly indicated one, or (in the case of a
* partitioned table) the parent's, if it has one.
*/ */
if (stmt->accessMethod != NULL) if (stmt->accessMethod != NULL)
accessMethodId = get_table_am_oid(stmt->accessMethod, false);
else if (stmt->partbound)
{ {
Assert(list_length(inheritOids) == 1); Assert(RELKIND_HAS_TABLE_AM(relkind) || relkind == RELKIND_PARTITIONED_TABLE);
accessMethodId = get_rel_relam(linitial_oid(inheritOids)); accessMethodId = get_table_am_oid(stmt->accessMethod, false);
} }
else else if (RELKIND_HAS_TABLE_AM(relkind) || relkind == RELKIND_PARTITIONED_TABLE)
accessMethodId = InvalidOid; {
if (stmt->partbound)
{
Assert(list_length(inheritOids) == 1);
accessMethodId = get_rel_relam(linitial_oid(inheritOids));
}
/* still nothing? use the default */ if (RELKIND_HAS_TABLE_AM(relkind) && !OidIsValid(accessMethodId))
if (RELKIND_HAS_TABLE_AM(relkind) && !OidIsValid(accessMethodId)) accessMethodId = get_table_am_oid(default_table_access_method, false);
accessMethodId = get_table_am_oid(default_table_access_method, false); }
/* /*
* Create the relation. Inherited defaults and constraints are passed in * Create the relation. Inherited defaults and constraints are passed in

3
src/test/regress/expected/create_am.out
View File

@ -547,6 +547,9 @@ CREATE TABLE i_am_a_failure() USING "I do not exist AM";
ERROR: access method "I do not exist AM" does not exist ERROR: access method "I do not exist AM" does not exist
CREATE TABLE i_am_a_failure() USING "btree"; CREATE TABLE i_am_a_failure() USING "btree";
ERROR: access method "btree" is not of type TABLE ERROR: access method "btree" is not of type TABLE
-- Other weird invalid cases that cause problems
CREATE FOREIGN TABLE fp PARTITION OF pg_am DEFAULT SERVER x;
ERROR: "pg_am" is not partitioned
-- Drop table access method, which fails as objects depends on it -- Drop table access method, which fails as objects depends on it
DROP ACCESS METHOD heap2; DROP ACCESS METHOD heap2;
ERROR: cannot drop access method heap2 because other objects depend on it ERROR: cannot drop access method heap2 because other objects depend on it

3
src/test/regress/sql/create_am.sql
View File

@ -348,6 +348,9 @@ CREATE TABLE i_am_a_failure() USING i_do_not_exist_am;
CREATE TABLE i_am_a_failure() USING "I do not exist AM"; CREATE TABLE i_am_a_failure() USING "I do not exist AM";
CREATE TABLE i_am_a_failure() USING "btree"; CREATE TABLE i_am_a_failure() USING "btree";
-- Other weird invalid cases that cause problems
CREATE FOREIGN TABLE fp PARTITION OF pg_am DEFAULT SERVER x;
-- Drop table access method, which fails as objects depends on it -- Drop table access method, which fails as objects depends on it
DROP ACCESS METHOD heap2; DROP ACCESS METHOD heap2;