Skip to content

Commit 3157cbe

Browse files
committed
Stabilize recently-added information_schema test queries.
These queries could show unexpected entries if the core system, or concurrently-running test scripts, created any functions that would appear in the information_schema views. Restrict them to showing functions belonging to this test's schema, as the far-older nearby test case does. Per experimentation with conversion of some built-in functions to SQL-function-body style.
1 parent fae6562 commit 3157cbe

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

src/test/regress/expected/create_function_3.out

+11-3
Original file line numberDiff line numberDiff line change
@@ -475,26 +475,34 @@ SELECT r0.routine_name, r1.routine_name
475475
FROM information_schema.routine_routine_usage rru
476476
JOIN information_schema.routines r0 ON r0.specific_name = rru.specific_name
477477
JOIN information_schema.routines r1 ON r1.specific_name = rru.routine_name
478+
WHERE r0.routine_schema = 'temp_func_test' AND
479+
r1.routine_schema = 'temp_func_test'
478480
ORDER BY 1, 2;
479481
routine_name | routine_name
480482
----------------+----------------
481483
functest_is_4b | functest_is_4a
482484
(1 row)
483485

484-
SELECT routine_name, sequence_name FROM information_schema.routine_sequence_usage ORDER BY 1, 2;
486+
SELECT routine_name, sequence_name FROM information_schema.routine_sequence_usage
487+
WHERE routine_schema = 'temp_func_test'
488+
ORDER BY 1, 2;
485489
routine_name | sequence_name
486490
---------------+---------------
487491
functest_is_5 | functest1
488492
functest_is_6 | functest1
489493
(2 rows)
490494

491-
SELECT routine_name, table_name, column_name FROM information_schema.routine_column_usage ORDER BY 1, 2;
495+
SELECT routine_name, table_name, column_name FROM information_schema.routine_column_usage
496+
WHERE routine_schema = 'temp_func_test'
497+
ORDER BY 1, 2;
492498
routine_name | table_name | column_name
493499
---------------+------------+-------------
494500
functest_is_7 | functest2 | a
495501
(1 row)
496502

497-
SELECT routine_name, table_name FROM information_schema.routine_table_usage ORDER BY 1, 2;
503+
SELECT routine_name, table_name FROM information_schema.routine_table_usage
504+
WHERE routine_schema = 'temp_func_test'
505+
ORDER BY 1, 2;
498506
routine_name | table_name
499507
---------------+------------
500508
functest_is_7 | functest2

src/test/regress/sql/create_function_3.sql

+11-3
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,18 @@ SELECT r0.routine_name, r1.routine_name
277277
FROM information_schema.routine_routine_usage rru
278278
JOIN information_schema.routines r0 ON r0.specific_name = rru.specific_name
279279
JOIN information_schema.routines r1 ON r1.specific_name = rru.routine_name
280+
WHERE r0.routine_schema = 'temp_func_test' AND
281+
r1.routine_schema = 'temp_func_test'
282+
ORDER BY 1, 2;
283+
SELECT routine_name, sequence_name FROM information_schema.routine_sequence_usage
284+
WHERE routine_schema = 'temp_func_test'
285+
ORDER BY 1, 2;
286+
SELECT routine_name, table_name, column_name FROM information_schema.routine_column_usage
287+
WHERE routine_schema = 'temp_func_test'
288+
ORDER BY 1, 2;
289+
SELECT routine_name, table_name FROM information_schema.routine_table_usage
290+
WHERE routine_schema = 'temp_func_test'
280291
ORDER BY 1, 2;
281-
SELECT routine_name, sequence_name FROM information_schema.routine_sequence_usage ORDER BY 1, 2;
282-
SELECT routine_name, table_name, column_name FROM information_schema.routine_column_usage ORDER BY 1, 2;
283-
SELECT routine_name, table_name FROM information_schema.routine_table_usage ORDER BY 1, 2;
284292

285293
DROP FUNCTION functest_IS_4a CASCADE;
286294
DROP SEQUENCE functest1 CASCADE;

0 commit comments

Comments
 (0)