Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit e9ba117

Browse files
authored
Update psqlrc
1 parent 3df612f commit e9ba117

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

‎psqlrc/psqlrc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ from coalesce(case when not pg_is_in_recovery() then null -- not standby
9898
s.vartype, s.min_val, s.max_val, s.enumvals, s.extra_desc
9999
from t
100100
join pg_settings as s on t.name = s.name
101-
where not applied;
101+
where not t.applied and not s.pending_restart;
102102
\endif
103103

104104
\if :is_hba_file_error
@@ -114,11 +114,12 @@ if :is_pending_restart
114114
order by name, seqno desc
115115
)
116116
select f.sourcefile, f.sourceline, f.name,
117-
s.setting as current_setting,
117+
cs.setting as current_setting,
118118
f.setting as new_setting
119119
from f
120+
cross join current_setting(f.name) as cs(setting)
120121
join pg_settings as s on f.name = s.name
121-
and f.setting is distinct from s.setting
122+
and f.setting is distinct from cs.setting
122123
and s.pending_restart;
123124
\endif
124125

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /