Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit26c2460

Browse files
committed
Fix very ancient breakage in alter-table tests: apparently, there was a
type named 'dt' back in Postgres 4.2, and the regression test wasn'tupdated when it was removed. Per report from Patricia Holben of GreatBridge.
1 parent653556c commit26c2460

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

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

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ ALTER TABLE tmp ADD COLUMN g polygon;
1313
ALTER TABLE tmp ADD COLUMN h abstime;
1414
ALTER TABLE tmp ADD COLUMN i char;
1515
ALTER TABLE tmp ADD COLUMN j abstime[];
16-
ALTER TABLE tmp ADD COLUMN k dt;
17-
ERROR: Unable to locate type name 'dt' in catalog
16+
ALTER TABLE tmp ADD COLUMN k int4;
1817
ALTER TABLE tmp ADD COLUMN l tid;
1918
ALTER TABLE tmp ADD COLUMN m xid;
2019
ALTER TABLE tmp ADD COLUMN n oidvector;
@@ -34,15 +33,15 @@ INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u,
3433
v, w, x, y, z)
3534
VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)',
3635
'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}',
37-
314159, '(1,1)', 512,
36+
314159, '(1,1)','512',
3837
'1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)',
39-
'(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["current" "infinity"]',
40-
'1/3', '1,name', '{1.0,2.0,3.0,4.0}', '{1.0,2.0,3.0,4.0}', '{1,2,3,4}');
41-
ERROR: Relation 'tmp' does not have attribute 'k'
38+
'(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["epoch" "infinity"]',
39+
'epoch', '01:00:10', '{1.0,2.0,3.0,4.0}', '{1.0,2.0,3.0,4.0}', '{1,2,3,4}');
4240
SELECT * FROM tmp;
43-
initial | a | b | c | d | e | f | g | h | i | j | l | m | n | p | q | r | s | t | u | v | w | x | y | z
44-
---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---
45-
(0 rows)
41+
initial | a | b | c | d | e | f | g | h | i | j | k | l | m | n | p | q | r | s | t | u | v | w | x | y | z
42+
---------+---+------+------+-----+-----+---+-----------------------+------------------------------+---+------------------------------------------------------------------------------------------------+--------+-------+-----+-----------------+---------------+-----------+-----------------------+-----------------------------+---------------------+---------------------------------------------+--------------------------+------------------+-----------+-----------+-----------
43+
| 4 | name | text | 4.1 | 4.1 | 2 | ((4.1,4.1),(3.1,3.1)) | Mon May 01 00:30:30 1995 PDT | c | {"Mon May 01 00:30:30 1995 PDT","Mon Aug 24 14:43:07 1992 PDT","Wed Dec 31 16:00:00 1969 PST"} | 314159 | (1,1) | 512 | 1 2 3 4 5 6 7 8 | magnetic disk | (1.1,1.1) | [(4.1,4.1),(3.1,3.1)] | ((0,2),(4.1,4.1),(3.1,3.1)) | (4.1,4.1),(3.1,3.1) | ["Wed Dec 31 16:00:00 1969 PST" "infinity"] | Thu Jan 01 00:00:00 1970 | @ 1 hour 10 secs | {1,2,3,4} | {1,2,3,4} | {1,2,3,4}
44+
(1 row)
4645

4746
DROP TABLE tmp;
4847
-- the wolf bug - schema mods caused inconsistent row descriptors
@@ -59,8 +58,7 @@ ALTER TABLE tmp ADD COLUMN g polygon;
5958
ALTER TABLE tmp ADD COLUMN h abstime;
6059
ALTER TABLE tmp ADD COLUMN i char;
6160
ALTER TABLE tmp ADD COLUMN j abstime[];
62-
ALTER TABLE tmp ADD COLUMN k dt;
63-
ERROR: Unable to locate type name 'dt' in catalog
61+
ALTER TABLE tmp ADD COLUMN k int4;
6462
ALTER TABLE tmp ADD COLUMN l tid;
6563
ALTER TABLE tmp ADD COLUMN m xid;
6664
ALTER TABLE tmp ADD COLUMN n oidvector;
@@ -79,16 +77,16 @@ ALTER TABLE tmp ADD COLUMN z int2[];
7977
INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u,
8078
v, w, x, y, z)
8179
VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)',
82-
'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}',
83-
314159, '(1,1)', 512,
80+
'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}',
81+
314159, '(1,1)','512',
8482
'1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)',
85-
'(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["current" "infinity"]',
86-
'1/3', '1,name', '{1.0,2.0,3.0,4.0}', '{1.0,2.0,3.0,4.0}', '{1,2,3,4}');
87-
ERROR: Relation 'tmp' does not have attribute 'k'
83+
'(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["epoch" "infinity"]',
84+
'epoch', '01:00:10', '{1.0,2.0,3.0,4.0}', '{1.0,2.0,3.0,4.0}', '{1,2,3,4}');
8885
SELECT * FROM tmp;
89-
initial | a | b | c | d | e | f | g | h | i | j | l | m | n | p | q | r | s | t | u | v | w | x | y | z
90-
---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---
91-
(0 rows)
86+
initial | a | b | c | d | e | f | g | h | i | j | k | l | m | n | p | q | r | s | t | u | v | w | x | y | z
87+
---------+---+------+------+-----+-----+---+-----------------------+------------------------------+---+------------------------------------------------------------------------------------------------+--------+-------+-----+-----------------+---------------+-----------+-----------------------+-----------------------------+---------------------+---------------------------------------------+--------------------------+------------------+-----------+-----------+-----------
88+
| 4 | name | text | 4.1 | 4.1 | 2 | ((4.1,4.1),(3.1,3.1)) | Mon May 01 00:30:30 1995 PDT | c | {"Mon May 01 00:30:30 1995 PDT","Mon Aug 24 14:43:07 1992 PDT","Wed Dec 31 16:00:00 1969 PST"} | 314159 | (1,1) | 512 | 1 2 3 4 5 6 7 8 | magnetic disk | (1.1,1.1) | [(4.1,4.1),(3.1,3.1)] | ((0,2),(4.1,4.1),(3.1,3.1)) | (4.1,4.1),(3.1,3.1) | ["Wed Dec 31 16:00:00 1969 PST" "infinity"] | Thu Jan 01 00:00:00 1970 | @ 1 hour 10 secs | {1,2,3,4} | {1,2,3,4} | {1,2,3,4}
89+
(1 row)
9290

9391
DROP TABLE tmp;
9492
--

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ALTER TABLE tmp ADD COLUMN i char;
2525

2626
ALTERTABLE tmp ADD COLUMN j abstime[];
2727

28-
ALTERTABLE tmp ADD COLUMN kdt;
28+
ALTERTABLE tmp ADD COLUMN kint4;
2929

3030
ALTERTABLE tmp ADD COLUMN l tid;
3131

@@ -60,10 +60,10 @@ INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u,
6060
v, w, x, y, z)
6161
VALUES (4,'name','text',4.1,4.1,2,'(4.1,4.1,3.1,3.1)',
6262
'Mon May 1 00:30:30 1995','c','{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}',
63-
314159,'(1,1)',512,
63+
314159,'(1,1)','512',
6464
'1 2 3 4 5 6 7 8','magnetic disk','(1.1,1.1)','(4.1,4.1,3.1,3.1)',
65-
'(0,2,4.1,4.1,3.1,3.1)','(4.1,4.1,3.1,3.1)','["current" "infinity"]',
66-
'1/3','1,name','{1.0,2.0,3.0,4.0}','{1.0,2.0,3.0,4.0}','{1,2,3,4}');
65+
'(0,2,4.1,4.1,3.1,3.1)','(4.1,4.1,3.1,3.1)','["epoch" "infinity"]',
66+
'epoch','01:00:10','{1.0,2.0,3.0,4.0}','{1.0,2.0,3.0,4.0}','{1,2,3,4}');
6767

6868
SELECT*FROM tmp;
6969

@@ -94,7 +94,7 @@ ALTER TABLE tmp ADD COLUMN i char;
9494

9595
ALTERTABLE tmp ADD COLUMN j abstime[];
9696

97-
ALTERTABLE tmp ADD COLUMN kdt;
97+
ALTERTABLE tmp ADD COLUMN kint4;
9898

9999
ALTERTABLE tmp ADD COLUMN l tid;
100100

@@ -128,11 +128,11 @@ ALTER TABLE tmp ADD COLUMN z int2[];
128128
INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u,
129129
v, w, x, y, z)
130130
VALUES (4,'name','text',4.1,4.1,2,'(4.1,4.1,3.1,3.1)',
131-
'Mon May 1 00:30:30 1995','c','{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}',
132-
314159,'(1,1)',512,
131+
'Mon May 1 00:30:30 1995','c','{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}',
132+
314159,'(1,1)','512',
133133
'1 2 3 4 5 6 7 8','magnetic disk','(1.1,1.1)','(4.1,4.1,3.1,3.1)',
134-
'(0,2,4.1,4.1,3.1,3.1)','(4.1,4.1,3.1,3.1)','["current" "infinity"]',
135-
'1/3','1,name','{1.0,2.0,3.0,4.0}','{1.0,2.0,3.0,4.0}','{1,2,3,4}');
134+
'(0,2,4.1,4.1,3.1,3.1)','(4.1,4.1,3.1,3.1)','["epoch" "infinity"]',
135+
'epoch','01:00:10','{1.0,2.0,3.0,4.0}','{1.0,2.0,3.0,4.0}','{1,2,3,4}');
136136

137137
SELECT*FROM tmp;
138138

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp