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

Fix unstable regression test output. 

Output order from the pg_indexes view might vary depending on the
phase of the moon, so add ORDER BY to ensure stable results of tests
added by commit 386e3d7609.
Per buildfarm.
This commit is contained in:
Tom Lane 2016-04-08 14:15:12 -04:00
parent 7c7d4fddab
commit 690c543550
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/regress/expected/index_including.out
View File

@ -143,14 +143,14 @@ DROP TABLE tbl;
*/
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 int);
CREATE UNIQUE INDEX tbl_idx ON tbl using btree(c1, c2, c3, c4);
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
-----------------------------------------------------------------
CREATE UNIQUE INDEX tbl_idx ON tbl USING btree (c1, c2, c3, c4)
(1 row)
ALTER TABLE tbl DROP COLUMN c3;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------
(0 rows)
@ -163,14 +163,14 @@ DROP TABLE tbl;
*/
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box);
CREATE UNIQUE INDEX tbl_idx ON tbl using btree(c1, c2) INCLUDING(c3,c4);
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------------------------------------------------------------------------
CREATE UNIQUE INDEX tbl_idx ON tbl USING btree (c1, c2) INCLUDING (c3, c4)
(1 row)
ALTER TABLE tbl DROP COLUMN c3;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------
(0 rows)
@ -182,20 +182,20 @@ DROP TABLE tbl;
* as well as key columns deletion. It's explained in documentation.
*/
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box, UNIQUE(c1, c2) INCLUDING(c3,c4));
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------------------------------------------------------------------------------------
CREATE UNIQUE INDEX tbl_c1_c2_c3_c4_key ON tbl USING btree (c1, c2) INCLUDING (c3, c4)
(1 row)
ALTER TABLE tbl DROP COLUMN c3;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------
(0 rows)
ALTER TABLE tbl DROP COLUMN c1;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------
(0 rows)
@ -207,11 +207,11 @@ DROP TABLE tbl;
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box, UNIQUE(c1, c2) INCLUDING(c3,c4));
INSERT INTO tbl select x, 2*x, 3*x, box('4,4,4,4') from generate_series(1,1000) as x;
CREATE UNIQUE INDEX CONCURRENTLY on tbl (c1, c2) INCLUDING (c3, c4);
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------------------------------------------------------------------------------------
CREATE UNIQUE INDEX tbl_c1_c2_c3_c4_key ON tbl USING btree (c1, c2) INCLUDING (c3, c4)
CREATE UNIQUE INDEX tbl_c1_c2_c3_c4_idx ON tbl USING btree (c1, c2) INCLUDING (c3, c4)
CREATE UNIQUE INDEX tbl_c1_c2_c3_c4_key ON tbl USING btree (c1, c2) INCLUDING (c3, c4)
(2 rows)
DROP TABLE tbl;
@ -219,27 +219,27 @@ DROP TABLE tbl;
* 5. REINDEX
*/
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box, UNIQUE(c1, c2) INCLUDING(c3,c4));
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------------------------------------------------------------------------------------
CREATE UNIQUE INDEX tbl_c1_c2_c3_c4_key ON tbl USING btree (c1, c2) INCLUDING (c3, c4)
(1 row)
ALTER TABLE tbl DROP COLUMN c3;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------
(0 rows)
REINDEX INDEX tbl_c1_c2_c3_c4_key;
ERROR: relation "tbl_c1_c2_c3_c4_key" does not exist
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------
(0 rows)
ALTER TABLE tbl DROP COLUMN c1;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
indexdef
----------
(0 rows)

24
src/test/regress/sql/index_including.sql
View File

@ -88,9 +88,9 @@ DROP TABLE tbl;
*/
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 int);
CREATE UNIQUE INDEX tbl_idx ON tbl using btree(c1, c2, c3, c4);
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
ALTER TABLE tbl DROP COLUMN c3;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
DROP TABLE tbl;
/*
@ -100,9 +100,9 @@ DROP TABLE tbl;
*/
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box);
CREATE UNIQUE INDEX tbl_idx ON tbl using btree(c1, c2) INCLUDING(c3,c4);
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
ALTER TABLE tbl DROP COLUMN c3;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
DROP TABLE tbl;
/*
@ -111,11 +111,11 @@ DROP TABLE tbl;
* as well as key columns deletion. It's explained in documentation.
*/
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box, UNIQUE(c1, c2) INCLUDING(c3,c4));
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
ALTER TABLE tbl DROP COLUMN c3;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
ALTER TABLE tbl DROP COLUMN c1;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
DROP TABLE tbl;
@ -125,7 +125,7 @@ DROP TABLE tbl;
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box, UNIQUE(c1, c2) INCLUDING(c3,c4));
INSERT INTO tbl select x, 2*x, 3*x, box('4,4,4,4') from generate_series(1,1000) as x;
CREATE UNIQUE INDEX CONCURRENTLY on tbl (c1, c2) INCLUDING (c3, c4);
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
DROP TABLE tbl;
@ -133,13 +133,13 @@ DROP TABLE tbl;
* 5. REINDEX
*/
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box, UNIQUE(c1, c2) INCLUDING(c3,c4));
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
ALTER TABLE tbl DROP COLUMN c3;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
REINDEX INDEX tbl_c1_c2_c3_c4_key;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
ALTER TABLE tbl DROP COLUMN c1;
select indexdef from pg_indexes where tablename='tbl';
select indexdef from pg_indexes where tablename = 'tbl' order by indexname;
DROP TABLE tbl;
/*