mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

psql \dX: check schema when listing statistics objects

Browse Source 
Commit ad600bba04 added psql command \dX listing extended statistics
objects, but it failed to consider search_path when selecting the
elements so some of the returned elements might be invisible.

The visibility was already considered for tab completion (added by
commit d99d58cdc8), so adding it to the query is fairly simple.

Reported and fix by Justin Pryzby, regression tests by me. Backpatch
to PostgreSQL 14, where \dX was introduced.

Batchpatch-through: 14
Author: Justin Pryzby
Reviewed-by: Tatsuro Yamada
Discussion: https://postgr.es/m/c027a541-5856-75a5-0868-341301e1624b%40nttcom.co.jp_1
This commit is contained in:
Tomas Vondra 2021-07-26 17:12:28 +02:00
parent 085f931f52
commit f68b609230
3 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/psql/describe.c
View File

@ -4774,7 +4774,7 @@ listExtendedStats(const char *pattern)
processSQLNamePattern(pset.db, &buf, pattern, processSQLNamePattern(pset.db, &buf, pattern,
false, false, false, false,
"es.stxnamespace::pg_catalog.regnamespace::text", "es.stxname", "es.stxnamespace::pg_catalog.regnamespace::text", "es.stxname",
NULL, NULL); NULL, "pg_catalog.pg_statistics_obj_is_visible(es.oid)");
appendPQExpBufferStr(&buf, "ORDER BY 1, 2;"); appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");

52
src/test/regress/expected/stats_ext.out
View File

@ -2991,6 +2991,7 @@ create statistics stts_s1.stts_foo on col1, col2 from stts_t3;
create statistics stts_s2.stts_yama (dependencies, mcv) on col1, col3 from stts_t3; create statistics stts_s2.stts_yama (dependencies, mcv) on col1, col3 from stts_t3;
insert into stts_t1 select i,i from generate_series(1,100) i; insert into stts_t1 select i,i from generate_series(1,100) i;
analyze stts_t1; analyze stts_t1;
set search_path to public, stts_s1, stts_s2, tststats;
\dX \dX
List of extended statistics List of extended statistics
Schema | Name | Definition | Ndistinct | Dependencies | MCV Schema | Name | Definition | Ndistinct | Dependencies | MCV
@ -3006,7 +3007,7 @@ analyze stts_t1;
public | stts_hoge | col1, col2, col3 FROM stts_t3 | defined | defined | defined public | stts_hoge | col1, col2, col3 FROM stts_t3 | defined | defined | defined
stts_s1 | stts_foo | col1, col2 FROM stts_t3 | defined | defined | defined stts_s1 | stts_foo | col1, col2 FROM stts_t3 | defined | defined | defined
stts_s2 | stts_yama | col1, col3 FROM stts_t3 | | defined | defined stts_s2 | stts_yama | col1, col3 FROM stts_t3 | | defined | defined
tststats | priv_test_stats | a, b FROM tststats.priv_test_tbl | | | defined tststats | priv_test_stats | a, b FROM priv_test_tbl | | | defined
(12 rows) (12 rows)
\dX stts_? \dX stts_?
@ -3041,7 +3042,7 @@ analyze stts_t1;
public | stts_hoge | col1, col2, col3 FROM stts_t3 | defined | defined | defined public | stts_hoge | col1, col2, col3 FROM stts_t3 | defined | defined | defined
stts_s1 | stts_foo | col1, col2 FROM stts_t3 | defined | defined | defined stts_s1 | stts_foo | col1, col2 FROM stts_t3 | defined | defined | defined
stts_s2 | stts_yama | col1, col3 FROM stts_t3 | | defined | defined stts_s2 | stts_yama | col1, col3 FROM stts_t3 | | defined | defined
tststats | priv_test_stats | a, b FROM tststats.priv_test_tbl | | | defined tststats | priv_test_stats | a, b FROM priv_test_tbl | | | defined
(12 rows) (12 rows)
\dX+ stts_? \dX+ stts_?
@ -3068,30 +3069,45 @@ analyze stts_t1;
stts_s2 | stts_yama | col1, col3 FROM stts_t3 | | defined | defined stts_s2 | stts_yama | col1, col3 FROM stts_t3 | | defined | defined
(1 row) (1 row)
set search_path to public, stts_s1;
\dX
List of extended statistics
Schema | Name | Definition | Ndistinct | Dependencies | MCV
---------+------------------------+------------------------------------------------------------------------+-----------+--------------+---------
public | func_deps_stat | ((a * 2)), upper(b), ((c + (1)::numeric)) FROM functional_dependencies | | defined |
public | mcv_lists_arrays_stats | a, b, c FROM mcv_lists_arrays | | | defined
public | mcv_lists_bool_stats | a, b, c FROM mcv_lists_bool | | | defined
public | mcv_lists_stats | a, b, d FROM mcv_lists | | | defined
public | stts_1 | a, b FROM stts_t1 | defined | |
public | stts_2 | a, b FROM stts_t1 | defined | defined |
public | stts_3 | a, b FROM stts_t1 | defined | defined | defined
public | stts_4 | b, c FROM stts_t2 | defined | defined | defined
public | stts_hoge | col1, col2, col3 FROM stts_t3 | defined | defined | defined
stts_s1 | stts_foo | col1, col2 FROM stts_t3 | defined | defined | defined
(10 rows)
create role regress_stats_ext nosuperuser; create role regress_stats_ext nosuperuser;
set role regress_stats_ext; set role regress_stats_ext;
\dX \dX
List of extended statistics List of extended statistics
Schema | Name | Definition | Ndistinct | Dependencies | MCV Schema | Name | Definition | Ndistinct | Dependencies | MCV
----------+------------------------+------------------------------------------------------------------------+-----------+--------------+--------- --------+------------------------+------------------------------------------------------------------------+-----------+--------------+---------
public | func_deps_stat | ((a * 2)), upper(b), ((c + (1)::numeric)) FROM functional_dependencies | | defined | public | func_deps_stat | ((a * 2)), upper(b), ((c + (1)::numeric)) FROM functional_dependencies | | defined |
public | mcv_lists_arrays_stats | a, b, c FROM mcv_lists_arrays | | | defined public | mcv_lists_arrays_stats | a, b, c FROM mcv_lists_arrays | | | defined
public | mcv_lists_bool_stats | a, b, c FROM mcv_lists_bool | | | defined public | mcv_lists_bool_stats | a, b, c FROM mcv_lists_bool | | | defined
public | mcv_lists_stats | a, b, d FROM mcv_lists | | | defined public | mcv_lists_stats | a, b, d FROM mcv_lists | | | defined
public | stts_1 | a, b FROM stts_t1 | defined | | public | stts_1 | a, b FROM stts_t1 | defined | |
public | stts_2 | a, b FROM stts_t1 | defined | defined | public | stts_2 | a, b FROM stts_t1 | defined | defined |
public | stts_3 | a, b FROM stts_t1 | defined | defined | defined public | stts_3 | a, b FROM stts_t1 | defined | defined | defined
public | stts_4 | b, c FROM stts_t2 | defined | defined | defined public | stts_4 | b, c FROM stts_t2 | defined | defined | defined
public | stts_hoge | col1, col2, col3 FROM stts_t3 | defined | defined | defined public | stts_hoge | col1, col2, col3 FROM stts_t3 | defined | defined | defined
stts_s1 | stts_foo | col1, col2 FROM stts_t3 | defined | defined | defined (9 rows)
stts_s2 | stts_yama | col1, col3 FROM stts_t3 | | defined | defined
tststats | priv_test_stats | a, b FROM tststats.priv_test_tbl | | | defined
(12 rows)
reset role; reset role;
drop table stts_t1, stts_t2, stts_t3; drop table stts_t1, stts_t2, stts_t3;
drop schema stts_s1, stts_s2 cascade; drop schema stts_s1, stts_s2 cascade;
drop user regress_stats_ext; drop user regress_stats_ext;
reset search_path;
-- User with no access -- User with no access
CREATE USER regress_stats_user1; CREATE USER regress_stats_user1;
GRANT USAGE ON SCHEMA tststats TO regress_stats_user1; GRANT USAGE ON SCHEMA tststats TO regress_stats_user1;

5
src/test/regress/sql/stats_ext.sql
View File

@ -1529,6 +1529,7 @@ create statistics stts_s2.stts_yama (dependencies, mcv) on col1, col3 from stts_
insert into stts_t1 select i,i from generate_series(1,100) i; insert into stts_t1 select i,i from generate_series(1,100) i;
analyze stts_t1; analyze stts_t1;
set search_path to public, stts_s1, stts_s2, tststats;
\dX \dX
\dX stts_? \dX stts_?
@ -1538,6 +1539,9 @@ analyze stts_t1;
\dX+ *stts_hoge \dX+ *stts_hoge
\dX+ stts_s2.stts_yama \dX+ stts_s2.stts_yama
set search_path to public, stts_s1;
\dX
create role regress_stats_ext nosuperuser; create role regress_stats_ext nosuperuser;
set role regress_stats_ext; set role regress_stats_ext;
\dX \dX
@ -1546,6 +1550,7 @@ reset role;
drop table stts_t1, stts_t2, stts_t3; drop table stts_t1, stts_t2, stts_t3;
drop schema stts_s1, stts_s2 cascade; drop schema stts_s1, stts_s2 cascade;
drop user regress_stats_ext; drop user regress_stats_ext;
reset search_path;
-- User with no access -- User with no access
CREATE USER regress_stats_user1; CREATE USER regress_stats_user1;