update

src/test/regress/expected/pg17.out

@@ -1013,93 +1013,6 @@ RESET citus.local_table_join_policy;
 RESET client_min_messages;
 DROP TABLE reference_table;
 -- End for Correlated sublinks are now supported as of PostgreSQL 17, resolving issue #4470.
--- Test for ALTER TABLE SET ACCESS METHOD DEFAULT
--- Step 1: Setup: create and distribute a table
-CREATE TABLE test_alter_access_method (id int);
-SELECT create_distributed_table('test_alter_access_method', 'id');
- create_distributed_table
----------------------------------------------------------------------
-
-(1 row)
-
--- Step 2: Attempt to set access method to DEFAULT (should fail)
-ALTER TABLE test_alter_access_method SET ACCESS METHOD DEFAULT;
-ERROR:  ALTER TABLE .. SET ACCESS METHOD DEFAULT commands are currently unsupported.
--- Step 3: Create and distribute a partitioned table
-CREATE TABLE test_partitioned_alter (id int, val text) PARTITION BY RANGE (id);
-CREATE TABLE test_partitioned_alter_part1 PARTITION OF test_partitioned_alter FOR VALUES FROM (1) TO (100);
-SELECT create_distributed_table('test_partitioned_alter', 'id');
- create_distributed_table
----------------------------------------------------------------------
-
-(1 row)
-
--- Verify the Citus tables
-SELECT table_name, citus_table_type FROM pg_catalog.citus_tables
-WHERE table_name::regclass::text LIKE '%_partitioned_table' ORDER BY 1;
-ERROR:  relation "pg_catalog.citus_tables" does not exist
--- Step 3: Add an exclusion constraint with a name to the distributed partitioned table
-ALTER TABLE distributed_partitioned_table ADD CONSTRAINT dist_exclude_named EXCLUDE USING btree (id WITH =, partition_col WITH =);
--- Step 4: Verify propagation of exclusion constraint to worker nodes
-\c - - :public_worker_1_host :worker_1_port
-SET search_path TO pg17;
-SELECT conname FROM pg_constraint WHERE conrelid = 'pg17.distributed_partitioned_table'::regclass AND conname = 'dist_exclude_named';
-      conname
----------------------------------------------------------------------
- dist_exclude_named
-(1 row)
-
--- Step 5: Add an exclusion constraint with a name to the Citus local partitioned table
-\c - - :master_host :master_port
-SET search_path TO pg17;
-ALTER TABLE local_partitioned_table ADD CONSTRAINT local_exclude_named EXCLUDE USING btree (partition_col WITH =);
--- Step 6: Verify the exclusion constraint on the local partitioned table
-SELECT conname, contype FROM pg_constraint WHERE conname = 'local_exclude_named' AND contype = 'x';
-       conname       | contype
----------------------------------------------------------------------
- local_exclude_named | x
-(1 row)
-
--- Step 7: Add exclusion constraints without names to both tables
-ALTER TABLE distributed_partitioned_table ADD EXCLUDE USING btree (id WITH =, partition_col WITH =);
-ALTER TABLE local_partitioned_table ADD EXCLUDE USING btree (partition_col WITH =);
--- Step 8: Verify the unnamed exclusion constraints were added
-SELECT conname, contype FROM pg_constraint WHERE conrelid = 'local_partitioned_table'::regclass AND contype = 'x';
-                  conname                   | contype
----------------------------------------------------------------------
- local_exclude_named                        | x
- local_partitioned_table_partition_col_excl | x
-(2 rows)
-
-\c - - :public_worker_1_host :worker_1_port
-SET search_path TO pg17;
-SELECT conname, contype FROM pg_constraint WHERE conrelid = 'pg17.distributed_partitioned_table'::regclass AND contype = 'x';
-                       conname                       | contype
----------------------------------------------------------------------
- dist_exclude_named                                  | x
- distributed_partitioned_table_id_partition_col_excl | x
-(2 rows)
-
--- Step 9: Drop the exclusion constraints from both tables
-\c - - :master_host :master_port
-SET search_path TO pg17;
-ALTER TABLE distributed_partitioned_table DROP CONSTRAINT dist_exclude_named;
-ALTER TABLE local_partitioned_table DROP CONSTRAINT local_exclude_named;
--- Step 10: Verify the constraints were dropped
-SELECT * FROM pg_constraint WHERE conname = 'dist_exclude_named' AND contype = 'x';
- oid | conname | connamespace | contype | condeferrable | condeferred | convalidated | conrelid | contypid | conindid | conparentid | confrelid | confupdtype | confdeltype | confmatchtype | conislocal | coninhcount | connoinherit | conkey | confkey | conpfeqop | conppeqop | conffeqop | confdelsetcols | conexclop | conbin
----------------------------------------------------------------------
-(0 rows)
-
-SELECT * FROM pg_constraint WHERE conname = 'local_exclude_named' AND contype = 'x';
- oid | conname | connamespace | contype | condeferrable | condeferred | convalidated | conrelid | contypid | conindid | conparentid | confrelid | confupdtype | confdeltype | confmatchtype | conislocal | coninhcount | connoinherit | conkey | confkey | conpfeqop | conppeqop | conffeqop | confdelsetcols | conexclop | conbin
----------------------------------------------------------------------
-(0 rows)
-
--- Step 11: Clean up - Drop the tables
-DROP TABLE distributed_partitioned_table CASCADE;
-DROP TABLE local_partitioned_table CASCADE;
--- End of Test for exclusion constraints on partitioned and distributed partitioned tables in Citus environment
 -- Propagate SET STATISTICS DEFAULT
 -- Relevant PG commit:
 -- https://github.com/postgres/postgres/commit/4f622503d
@@ -1198,6 +1111,39 @@ btree, for table "pg17.tbl"
 btree, for table "pg17.tbl_25122024"
 
 -- End of testing SET STATISTICS DEFAULT
+-- Test for ALTER TABLE SET ACCESS METHOD DEFAULT
+-- Step 1: Local table setup (non-distributed)
+CREATE TABLE test_local_table (id int);
+-- Step 2: Attempt to set access method to DEFAULT on a local table (should succeed, or at least not raise the new distributed-specific error)
+ALTER TABLE test_local_table SET ACCESS METHOD DEFAULT;
+-- Step 3: Setup: create and distribute a table
+CREATE TABLE test_alter_access_method (id int);
+SELECT create_distributed_table('test_alter_access_method', 'id');
+ create_distributed_table
+---------------------------------------------------------------------
+
+(1 row)
+
+-- Step 4: Attempt to set access method to DEFAULT on a distributed table (should fail with your custom error)
+ALTER TABLE test_alter_access_method SET ACCESS METHOD DEFAULT;
+ERROR:  ALTER TABLE .. SET ACCESS METHOD DEFAULT commands are currently unsupported.
+-- Step 5: Create and distribute a partitioned table
+CREATE TABLE test_partitioned_alter (id int, val text) PARTITION BY RANGE (id);
+CREATE TABLE test_partitioned_alter_part1 PARTITION OF test_partitioned_alter FOR VALUES FROM (1) TO (100);
+SELECT create_distributed_table('test_partitioned_alter', 'id');
+ create_distributed_table
+---------------------------------------------------------------------
+
+(1 row)
+
+-- Step 6: Attempt to set access method to DEFAULT on a partitioned, distributed table (should fail)
+ALTER TABLE test_partitioned_alter SET ACCESS METHOD DEFAULT;
+ERROR:  ALTER TABLE .. SET ACCESS METHOD DEFAULT commands are currently unsupported.
+-- Cleanup
+DROP TABLE test_local_table CASCADE;
+DROP TABLE test_alter_access_method CASCADE;
+DROP TABLE test_partitioned_alter CASCADE;
+-- End of Test for ALTER TABLE SET ACCESS METHOD DEFAULT
 \set VERBOSITY terse
 SET client_min_messages TO WARNING;
 DROP SCHEMA pg17 CASCADE;

src/test/regress/sql/pg17.sql

@@ -499,23 +499,6 @@ RESET client_min_messages;
 DROP TABLE reference_table;
 -- End for Correlated sublinks are now supported as of PostgreSQL 17, resolving issue #4470.
 
--- Test for ALTER TABLE SET ACCESS METHOD DEFAULT
--- Step 1: Setup: create and distribute a table
-CREATE TABLE test_alter_access_method (id int);
-SELECT create_distributed_table('test_alter_access_method', 'id');
-
--- Step 2: Attempt to set access method to DEFAULT (should fail)
-ALTER TABLE test_alter_access_method SET ACCESS METHOD DEFAULT;
-
--- Step 3: Create and distribute a partitioned table
-CREATE TABLE test_partitioned_alter (id int, val text) PARTITION BY RANGE (id);
-CREATE TABLE test_partitioned_alter_part1 PARTITION OF test_partitioned_alter FOR VALUES FROM (1) TO (100);
-SELECT create_distributed_table('test_partitioned_alter', 'id');
-
--- Step 4: Attempt to set access method to DEFAULT on partitioned table (should fail)
-ALTER TABLE test_partitioned_alter SET ACCESS METHOD DEFAULT;
--- End of Test for ALTER TABLE SET ACCESS METHOD DEFAULT
-
 -- Propagate SET STATISTICS DEFAULT
 -- Relevant PG commit:
 -- https://github.com/postgres/postgres/commit/4f622503d
@@ -546,6 +529,34 @@ ALTER INDEX tbl_idx ALTER COLUMN 2 SET STATISTICS -1;
 
 -- End of testing SET STATISTICS DEFAULT
 
+-- Test for ALTER TABLE SET ACCESS METHOD DEFAULT
+-- Step 1: Local table setup (non-distributed)
+CREATE TABLE test_local_table (id int);
+
+-- Step 2: Attempt to set access method to DEFAULT on a local table (should succeed, or at least not raise the new distributed-specific error)
+ALTER TABLE test_local_table SET ACCESS METHOD DEFAULT;
+
+-- Step 3: Setup: create and distribute a table
+CREATE TABLE test_alter_access_method (id int);
+SELECT create_distributed_table('test_alter_access_method', 'id');
+
+-- Step 4: Attempt to set access method to DEFAULT on a distributed table (should fail with your custom error)
+ALTER TABLE test_alter_access_method SET ACCESS METHOD DEFAULT;
+
+-- Step 5: Create and distribute a partitioned table
+CREATE TABLE test_partitioned_alter (id int, val text) PARTITION BY RANGE (id);
+CREATE TABLE test_partitioned_alter_part1 PARTITION OF test_partitioned_alter FOR VALUES FROM (1) TO (100);
+SELECT create_distributed_table('test_partitioned_alter', 'id');
+
+-- Step 6: Attempt to set access method to DEFAULT on a partitioned, distributed table (should fail)
+ALTER TABLE test_partitioned_alter SET ACCESS METHOD DEFAULT;
+
+-- Cleanup
+DROP TABLE test_local_table CASCADE;
+DROP TABLE test_alter_access_method CASCADE;
+DROP TABLE test_partitioned_alter CASCADE;
+-- End of Test for ALTER TABLE SET ACCESS METHOD DEFAULT
+
 \set VERBOSITY terse
 SET client_min_messages TO WARNING;
 DROP SCHEMA pg17 CASCADE;