Skip to content

P
Postgres FD Implementation
Commit 690c5435 authored by Tom Lane's avatar Tom Lane
Browse files
Options

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 386e3d76.
Per buildfarm.
parent 7c7d4fdd
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
src/test/regress/expected/index_including.out
View file @ 690c5435
...@@ -143,14 +143,14 @@ DROP TABLE tbl; ...@@ -143,14 +143,14 @@ DROP TABLE tbl;
*/ */
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 int); CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 int);
CREATE UNIQUE INDEX tbl_idx ON tbl using btree(c1, c2, c3, c4); 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 indexdef
----------------------------------------------------------------- -----------------------------------------------------------------
CREATE UNIQUE INDEX tbl_idx ON tbl USING btree (c1, c2, c3, c4) CREATE UNIQUE INDEX tbl_idx ON tbl USING btree (c1, c2, c3, c4)
(1 row) (1 row)
ALTER TABLE tbl DROP COLUMN c3; 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 indexdef
---------- ----------
(0 rows) (0 rows)
...@@ -163,14 +163,14 @@ DROP TABLE tbl; ...@@ -163,14 +163,14 @@ DROP TABLE tbl;
*/ */
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box); 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); 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 indexdef
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
CREATE UNIQUE INDEX tbl_idx ON tbl USING btree (c1, c2) INCLUDING (c3, c4) CREATE UNIQUE INDEX tbl_idx ON tbl USING btree (c1, c2) INCLUDING (c3, c4)
(1 row) (1 row)
ALTER TABLE tbl DROP COLUMN c3; 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 indexdef
---------- ----------
(0 rows) (0 rows)
...@@ -182,20 +182,20 @@ DROP TABLE tbl; ...@@ -182,20 +182,20 @@ DROP TABLE tbl;
* as well as key columns deletion. It's explained in documentation. * 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)); 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 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_key ON tbl USING btree (c1, c2) INCLUDING (c3, c4)
(1 row) (1 row)
ALTER TABLE tbl DROP COLUMN c3; 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 indexdef
---------- ----------
(0 rows) (0 rows)
ALTER TABLE tbl DROP COLUMN c1; 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 indexdef
---------- ----------
(0 rows) (0 rows)
...@@ -207,11 +207,11 @@ DROP TABLE tbl; ...@@ -207,11 +207,11 @@ DROP TABLE tbl;
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box, UNIQUE(c1, c2) INCLUDING(c3,c4)); 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; 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); 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 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_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) (2 rows)
DROP TABLE tbl; DROP TABLE tbl;
...@@ -219,27 +219,27 @@ DROP TABLE tbl; ...@@ -219,27 +219,27 @@ DROP TABLE tbl;
* 5. REINDEX * 5. REINDEX
*/ */
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box, UNIQUE(c1, c2) INCLUDING(c3,c4)); 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 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_key ON tbl USING btree (c1, c2) INCLUDING (c3, c4)
(1 row) (1 row)
ALTER TABLE tbl DROP COLUMN c3; 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 indexdef
---------- ----------
(0 rows) (0 rows)
REINDEX INDEX tbl_c1_c2_c3_c4_key; REINDEX INDEX tbl_c1_c2_c3_c4_key;
ERROR: relation "tbl_c1_c2_c3_c4_key" does not exist 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 indexdef
---------- ----------
(0 rows) (0 rows)
ALTER TABLE tbl DROP COLUMN c1; 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 indexdef
---------- ----------
(0 rows) (0 rows)
......
src/test/regress/sql/index_including.sql
View file @ 690c5435
...@@ -88,9 +88,9 @@ DROP TABLE tbl; ...@@ -88,9 +88,9 @@ DROP TABLE tbl;
*/ */
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 int); CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 int);
CREATE UNIQUE INDEX tbl_idx ON tbl using btree(c1, c2, c3, c4); 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; 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; DROP TABLE tbl;
/* /*
...@@ -100,9 +100,9 @@ DROP TABLE tbl; ...@@ -100,9 +100,9 @@ DROP TABLE tbl;
*/ */
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box); 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); 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; 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; DROP TABLE tbl;
/* /*
...@@ -111,11 +111,11 @@ DROP TABLE tbl; ...@@ -111,11 +111,11 @@ DROP TABLE tbl;
* as well as key columns deletion. It's explained in documentation. * 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)); 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; 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; 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; DROP TABLE tbl;
...@@ -125,7 +125,7 @@ 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)); 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; 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); 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; DROP TABLE tbl;
...@@ -133,13 +133,13 @@ DROP TABLE tbl; ...@@ -133,13 +133,13 @@ DROP TABLE tbl;
* 5. REINDEX * 5. REINDEX
*/ */
CREATE TABLE tbl (c1 int,c2 int, c3 int, c4 box, UNIQUE(c1, c2) INCLUDING(c3,c4)); 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; 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; 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; 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; DROP TABLE tbl;
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment