diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2022-04-02 10:00:10 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2022-04-02 10:00:10 -0400 |
| commit | c6dc6a0124fa130e1c083a870156c32ab4cf0ae2 (patch) | |
| tree | 1d2461b42459d5f340ffbf7bfe5f08ee574efa60 | |
| parent | 6974924347c908335607a4a2f252213d58e21b7c (diff) | |
| download | postgresql-c6dc6a0124fa130e1c083a870156c32ab4cf0ae2.tar.gz postgresql-c6dc6a0124fa130e1c083a870156c32ab4cf0ae2.zip | |
Use ORDER BY in catalog results in SQL/JSON tests
The buildfarm has revealed some instability in results from catalog
queries in tests from commit 1a36bc9dba8. Cure this by adding ORDER BY
to such queries.
| -rw-r--r-- | src/test/regress/expected/jsonb_sqljson.out | 16 | ||||
| -rw-r--r-- | src/test/regress/sql/jsonb_sqljson.sql | 8 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/test/regress/expected/jsonb_sqljson.out b/src/test/regress/expected/jsonb_sqljson.out index 1126d7caf55..3661b7a810b 100644 --- a/src/test/regress/expected/jsonb_sqljson.out +++ b/src/test/regress/expected/jsonb_sqljson.out @@ -949,18 +949,22 @@ Check constraints: SELECT check_clause FROM information_schema.check_constraints -WHERE constraint_name LIKE 'test_jsonb_constraint%'; +WHERE constraint_name LIKE 'test_jsonb_constraint%' +ORDER BY 1; check_clause -------------------------------------------------------------------------------------------------------------------------- + ((JSON_EXISTS((js)::jsonb, 'strict $."a"' RETURNING integer TRUE ON ERROR) < 2)) + ((JSON_QUERY((js)::jsonb, '$."a"' RETURNING character(5) OMIT QUOTES EMPTY ARRAY ON EMPTY) > ('a'::bpchar COLLATE "C"))) + ((JSON_QUERY((js)::jsonb, '$."a"' RETURNING jsonb WITH CONDITIONAL WRAPPER EMPTY OBJECT ON ERROR) < '[10]'::jsonb)) + ((JSON_VALUE((js)::jsonb, '$."a"' RETURNING integer DEFAULT (('12'::text || i))::integer ON EMPTY ERROR ON ERROR) > i)) ((js IS JSON)) (JSON_EXISTS((js)::jsonb, '$."a"' PASSING (i + 5) AS int, (i)::text AS txt, ARRAY[1, 2, 3] AS arr)) - ((JSON_VALUE((js)::jsonb, '$."a"' RETURNING integer DEFAULT (('12'::text || i))::integer ON EMPTY ERROR ON ERROR) > i)) - ((JSON_QUERY((js)::jsonb, '$."a"' RETURNING jsonb WITH CONDITIONAL WRAPPER EMPTY OBJECT ON ERROR) < '[10]'::jsonb)) - ((JSON_QUERY((js)::jsonb, '$."a"' RETURNING character(5) OMIT QUOTES EMPTY ARRAY ON EMPTY) > ('a'::bpchar COLLATE "C"))) - ((JSON_EXISTS((js)::jsonb, 'strict $."a"' RETURNING integer TRUE ON ERROR) < 2)) (6 rows) -SELECT pg_get_expr(adbin, adrelid) FROM pg_attrdef WHERE adrelid = 'test_jsonb_constraints'::regclass; +SELECT pg_get_expr(adbin, adrelid) +FROM pg_attrdef +WHERE adrelid = 'test_jsonb_constraints'::regclass +ORDER BY 1; pg_get_expr -------------------------------------------------------------------------------- JSON_QUERY('[1, 2]'::jsonb, '$[*]' RETURNING jsonb WITH UNCONDITIONAL WRAPPER) diff --git a/src/test/regress/sql/jsonb_sqljson.sql b/src/test/regress/sql/jsonb_sqljson.sql index 00a067a06a4..697b8ed1267 100644 --- a/src/test/regress/sql/jsonb_sqljson.sql +++ b/src/test/regress/sql/jsonb_sqljson.sql @@ -280,9 +280,13 @@ CREATE TABLE test_jsonb_constraints ( SELECT check_clause FROM information_schema.check_constraints -WHERE constraint_name LIKE 'test_jsonb_constraint%'; +WHERE constraint_name LIKE 'test_jsonb_constraint%' +ORDER BY 1; -SELECT pg_get_expr(adbin, adrelid) FROM pg_attrdef WHERE adrelid = 'test_jsonb_constraints'::regclass; +SELECT pg_get_expr(adbin, adrelid) +FROM pg_attrdef +WHERE adrelid = 'test_jsonb_constraints'::regclass +ORDER BY 1; INSERT INTO test_jsonb_constraints VALUES ('', 1); INSERT INTO test_jsonb_constraints VALUES ('1', 1); |