Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ae63017

Browse filesBrowse files
peterepetere
committed
Preparatory test cleanup
Add a little bit of explanation, clarity, and space. Extraced from a larger patch so that the changes from that patch would be easier to identify. Discussion: https://www.postgresql.org/message-id/flat/04e12818-2f98-257c-b926-2845d74ed04f%402ndquadrant.com
1 parent 61fa6ca commit ae63017
Copy full SHA for ae63017

File tree

2 files changed

+49
-48
lines changed
Filter options

2 files changed

+49
-48
lines changed

‎src/test/regress/expected/alter_table.out

Copy file name to clipboardExpand all lines: src/test/regress/expected/alter_table.out
+38-38Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3448,21 +3448,21 @@ ALTER TABLE old_system_table DROP CONSTRAINT new_system_table_pkey;
34483448
ALTER TABLE old_system_table DROP COLUMN othercol;
34493449
DROP TABLE old_system_table;
34503450
-- set logged
3451-
CREATE UNLOGGED TABLE unlogged1(f1 SERIAL PRIMARY KEY, f2 TEXT);
3451+
CREATE UNLOGGED TABLE unlogged1(f1 SERIAL PRIMARY KEY, f2 TEXT); -- has sequence, toast
34523452
-- check relpersistence of an unlogged table
34533453
SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^unlogged1'
34543454
UNION ALL
3455-
SELECT 'toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^unlogged1'
3455+
SELECT r.relname || ' toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^unlogged1'
34563456
UNION ALL
3457-
SELECT 'toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^unlogged1'
3457+
SELECT r.relname || ' toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^unlogged1'
34583458
ORDER BY relname;
3459-
relname | relkind | relpersistence
3460-
------------------+---------+----------------
3461-
toast index | i | u
3462-
toast table | t | u
3463-
unlogged1 | r | u
3464-
unlogged1_f1_seq | S | p
3465-
unlogged1_pkey | i | u
3459+
relname | relkind | relpersistence
3460+
-----------------------+---------+----------------
3461+
unlogged1 | r | u
3462+
unlogged1 toast index | i | u
3463+
unlogged1 toast table | t | u
3464+
unlogged1_f1_seq | S | p
3465+
unlogged1_pkey | i | u
34663466
(5 rows)
34673467

34683468
CREATE UNLOGGED TABLE unlogged2(f1 SERIAL PRIMARY KEY, f2 INTEGER REFERENCES unlogged1); -- foreign key
@@ -3474,39 +3474,39 @@ ALTER TABLE unlogged1 SET LOGGED;
34743474
-- check relpersistence of an unlogged table after changing to permanent
34753475
SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^unlogged1'
34763476
UNION ALL
3477-
SELECT 'toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^unlogged1'
3477+
SELECT r.relname || ' toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^unlogged1'
34783478
UNION ALL
3479-
SELECT 'toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^unlogged1'
3479+
SELECT r.relname || ' toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^unlogged1'
34803480
ORDER BY relname;
3481-
relname | relkind | relpersistence
3482-
------------------+---------+----------------
3483-
toast index | i | p
3484-
toast table | t | p
3485-
unlogged1 | r | p
3486-
unlogged1_f1_seq | S | p
3487-
unlogged1_pkey | i | p
3481+
relname | relkind | relpersistence
3482+
-----------------------+---------+----------------
3483+
unlogged1 | r | p
3484+
unlogged1 toast index | i | p
3485+
unlogged1 toast table | t | p
3486+
unlogged1_f1_seq | S | p
3487+
unlogged1_pkey | i | p
34883488
(5 rows)
34893489

34903490
ALTER TABLE unlogged1 SET LOGGED; -- silently do nothing
34913491
DROP TABLE unlogged3;
34923492
DROP TABLE unlogged2;
34933493
DROP TABLE unlogged1;
34943494
-- set unlogged
3495-
CREATE TABLE logged1(f1 SERIAL PRIMARY KEY, f2 TEXT);
3495+
CREATE TABLE logged1(f1 SERIAL PRIMARY KEY, f2 TEXT); -- has sequence, toast
34963496
-- check relpersistence of a permanent table
34973497
SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^logged1'
34983498
UNION ALL
3499-
SELECT 'toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^logged1'
3499+
SELECT r.relname || ' toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^logged1'
35003500
UNION ALL
3501-
SELECT 'toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^logged1'
3501+
SELECT r.relname ||' toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^logged1'
35023502
ORDER BY relname;
3503-
relname | relkind | relpersistence
3504-
----------------+---------+----------------
3505-
logged1 | r | p
3506-
logged1_f1_seq | S | p
3507-
logged1_pkey | i | p
3508-
toast index | i | p
3509-
toast table | t | p
3503+
relname | relkind | relpersistence
3504+
---------------------+---------+----------------
3505+
logged1 | r | p
3506+
logged1 toast index | i | p
3507+
logged1 toast table | t | p
3508+
logged1_f1_seq | S | p
3509+
logged1_pkey | i | p
35103510
(5 rows)
35113511

35123512
CREATE TABLE logged2(f1 SERIAL PRIMARY KEY, f2 INTEGER REFERENCES logged1); -- foreign key
@@ -3519,17 +3519,17 @@ ALTER TABLE logged1 SET UNLOGGED;
35193519
-- check relpersistence of a permanent table after changing to unlogged
35203520
SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^logged1'
35213521
UNION ALL
3522-
SELECT 'toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^logged1'
3522+
SELECT r.relname || ' toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^logged1'
35233523
UNION ALL
3524-
SELECT 'toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^logged1'
3524+
SELECT r.relname || ' toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^logged1'
35253525
ORDER BY relname;
3526-
relname | relkind | relpersistence
3527-
----------------+---------+----------------
3528-
logged1 | r | u
3529-
logged1_f1_seq | S | p
3530-
logged1_pkey | i | u
3531-
toast index | i | u
3532-
toast table | t | u
3526+
relname | relkind | relpersistence
3527+
---------------------+---------+----------------
3528+
logged1 | r | u
3529+
logged1 toast index | i | u
3530+
logged1 toast table | t | u
3531+
logged1_f1_seq | S | p
3532+
logged1_pkey | i | u
35333533
(5 rows)
35343534

35353535
ALTER TABLE logged1 SET UNLOGGED; -- silently do nothing

‎src/test/regress/sql/alter_table.sql

Copy file name to clipboardExpand all lines: src/test/regress/sql/alter_table.sql
+11-10Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2180,13 +2180,13 @@ ALTER TABLE old_system_table DROP COLUMN othercol;
21802180
DROP TABLE old_system_table;
21812181

21822182
-- set logged
2183-
CREATE UNLOGGED TABLE unlogged1(f1 SERIAL PRIMARY KEY, f2 TEXT);
2183+
CREATE UNLOGGED TABLE unlogged1(f1 SERIAL PRIMARY KEY, f2 TEXT); -- has sequence, toast
21842184
-- check relpersistence of an unlogged table
21852185
SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^unlogged1'
21862186
UNION ALL
2187-
SELECT 'toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^unlogged1'
2187+
SELECT r.relname || ' toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^unlogged1'
21882188
UNION ALL
2189-
SELECT 'toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^unlogged1'
2189+
SELECT r.relname || ' toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^unlogged1'
21902190
ORDER BY relname;
21912191
CREATE UNLOGGED TABLE unlogged2(f1 SERIAL PRIMARY KEY, f2 INTEGER REFERENCES unlogged1); -- foreign key
21922192
CREATE UNLOGGED TABLE unlogged3(f1 SERIAL PRIMARY KEY, f2 INTEGER REFERENCES unlogged3); -- self-referencing foreign key
@@ -2196,22 +2196,23 @@ ALTER TABLE unlogged1 SET LOGGED;
21962196
-- check relpersistence of an unlogged table after changing to permanent
21972197
SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^unlogged1'
21982198
UNION ALL
2199-
SELECT 'toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^unlogged1'
2199+
SELECT r.relname || ' toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^unlogged1'
22002200
UNION ALL
2201-
SELECT 'toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^unlogged1'
2201+
SELECT r.relname || ' toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^unlogged1'
22022202
ORDER BY relname;
22032203
ALTER TABLE unlogged1 SET LOGGED; -- silently do nothing
22042204
DROP TABLE unlogged3;
22052205
DROP TABLE unlogged2;
22062206
DROP TABLE unlogged1;
2207+
22072208
-- set unlogged
2208-
CREATE TABLE logged1(f1 SERIAL PRIMARY KEY, f2 TEXT);
2209+
CREATE TABLE logged1(f1 SERIAL PRIMARY KEY, f2 TEXT); -- has sequence, toast
22092210
-- check relpersistence of a permanent table
22102211
SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^logged1'
22112212
UNION ALL
2212-
SELECT 'toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^logged1'
2213+
SELECT r.relname || ' toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^logged1'
22132214
UNION ALL
2214-
SELECT 'toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^logged1'
2215+
SELECT r.relname ||' toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^logged1'
22152216
ORDER BY relname;
22162217
CREATE TABLE logged2(f1 SERIAL PRIMARY KEY, f2 INTEGER REFERENCES logged1); -- foreign key
22172218
CREATE TABLE logged3(f1 SERIAL PRIMARY KEY, f2 INTEGER REFERENCES logged3); -- self-referencing foreign key
@@ -2222,9 +2223,9 @@ ALTER TABLE logged1 SET UNLOGGED;
22222223
-- check relpersistence of a permanent table after changing to unlogged
22232224
SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^logged1'
22242225
UNION ALL
2225-
SELECT 'toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^logged1'
2226+
SELECT r.relname || ' toast table', t.relkind, t.relpersistence FROM pg_class r JOIN pg_class t ON t.oid = r.reltoastrelid WHERE r.relname ~ '^logged1'
22262227
UNION ALL
2227-
SELECT 'toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^logged1'
2228+
SELECT r.relname || ' toast index', ri.relkind, ri.relpersistence FROM pg_class r join pg_class t ON t.oid = r.reltoastrelid JOIN pg_index i ON i.indrelid = t.oid JOIN pg_class ri ON ri.oid = i.indexrelid WHERE r.relname ~ '^logged1'
22282229
ORDER BY relname;
22292230
ALTER TABLE logged1 SET UNLOGGED; -- silently do nothing
22302231
DROP TABLE logged3;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.