- Notifications
You must be signed in to change notification settings - Fork5
Commit0426f34
committed
Rearrange the handling of error context reports.
Remove the code in plpgsql that suppressed the innermost line of CONTEXTfor messages emitted by RAISE commands. That was never more than a quickbackwards-compatibility hack, and it's pretty silly in cases where theRAISE is nested in several levels of function. What's more, it violatedour design theory that verbosity of error reports should be controlledon the client side not the server side.To alleviate the resulting noise increase, introduce a feature in libpqand psql whereby the CONTEXT field of messages can be suppressed, eitheralways or only for non-error messages. Printing CONTEXT for errors onlyis now their default behavior.The actual code changes here are pretty small, but the effects on theregression test outputs are widespread. I had to edit some of thealternative expected outputs by hand; hopefully the buildfarm will soonfind anything I fat-fingered.In passing, fix up (again) the output line counts in psql's varioushelp displays. Add some commentary about how to verify them.Pavel Stehule, reviewed by Petr Jelínek, Jeevan Chalke, and others1 parentc80b5f6 commit0426f34
File tree
48 files changed
+237
-610
lines changed- contrib
- dblink
- expected
- sql
- hstore_plperl/expected
- hstore_plpython/expected
- ltree_plpython/expected
- sepgsql/expected
- doc/src/sgml
- ref
- src
- bin/psql
- interfaces/libpq
- pl
- plperl/expected
- plpgsql/src
- plpython/expected
- test/regress
- expected
- sql
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
48 files changed
+237
-610
lines changedLines changed: 2 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
| 2 | + | |
| 3 | + | |
2 | 4 |
| |
3 | 5 |
| |
4 | 6 |
| |
|
Lines changed: 3 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 | 2 |
| |
| 3 | + | |
| 4 | + | |
| 5 | + | |
3 | 6 |
| |
4 | 7 |
| |
5 | 8 |
| |
|
Lines changed: 0 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
29 | 29 |
| |
30 | 30 |
| |
31 | 31 |
| |
32 |
| - | |
33 | 32 |
| |
34 | 33 |
| |
35 | 34 |
| |
| |||
46 | 45 |
| |
47 | 46 |
| |
48 | 47 |
| |
49 |
| - | |
50 | 48 |
| |
51 | 49 |
| |
52 | 50 |
| |
| |||
67 | 65 |
| |
68 | 66 |
| |
69 | 67 |
| |
70 |
| - | |
71 | 68 |
| |
72 | 69 |
| |
73 | 70 |
| |
| |||
92 | 89 |
| |
93 | 90 |
| |
94 | 91 |
| |
95 |
| - | |
96 | 92 |
| |
97 | 93 |
| |
98 | 94 |
| |
| |||
120 | 116 |
| |
121 | 117 |
| |
122 | 118 |
| |
123 |
| - | |
124 | 119 |
| |
125 | 120 |
| |
126 |
| - | |
127 | 121 |
| |
128 | 122 |
| |
129 | 123 |
| |
| |||
161 | 155 |
| |
162 | 156 |
| |
163 | 157 |
| |
164 |
| - | |
165 | 158 |
| |
166 | 159 |
| |
167 | 160 |
| |
|
Lines changed: 0 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
16 |
| - | |
17 | 16 |
| |
18 | 17 |
| |
19 | 18 |
| |
| |||
32 | 31 |
| |
33 | 32 |
| |
34 | 33 |
| |
35 |
| - | |
36 | 34 |
| |
37 | 35 |
| |
38 | 36 |
| |
|
Lines changed: 0 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
9 | 9 |
| |
10 | 10 |
| |
11 | 11 |
| |
12 |
| - | |
13 | 12 |
| |
14 | 13 |
| |
15 | 14 |
| |
| |||
24 | 23 |
| |
25 | 24 |
| |
26 | 25 |
| |
27 |
| - | |
28 | 26 |
| |
29 | 27 |
| |
30 | 28 |
| |
|
Lines changed: 0 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
166 | 166 |
| |
167 | 167 |
| |
168 | 168 |
| |
169 |
| - | |
170 | 169 |
| |
171 |
| - | |
172 | 170 |
| |
173 |
| - | |
174 | 171 |
| |
175 |
| - | |
176 | 172 |
| |
177 |
| - | |
178 | 173 |
| |
179 | 174 |
| |
180 | 175 |
| |
|
Lines changed: 0 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
136 | 136 |
| |
137 | 137 |
| |
138 | 138 |
| |
139 |
| - | |
140 | 139 |
| |
141 | 140 |
| |
142 | 141 |
| |
| |||
147 | 146 |
| |
148 | 147 |
| |
149 | 148 |
| |
150 |
| - | |
151 | 149 |
| |
152 | 150 |
| |
153 | 151 |
| |
|
Lines changed: 40 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
5582 | 5582 |
| |
5583 | 5583 |
| |
5584 | 5584 |
| |
| 5585 | + | |
| 5586 | + | |
| 5587 | + | |
| 5588 | + | |
| 5589 | + | |
| 5590 | + | |
| 5591 | + | |
| 5592 | + | |
| 5593 | + | |
| 5594 | + | |
| 5595 | + | |
| 5596 | + | |
| 5597 | + | |
| 5598 | + | |
| 5599 | + | |
| 5600 | + | |
| 5601 | + | |
| 5602 | + | |
| 5603 | + | |
| 5604 | + | |
| 5605 | + | |
| 5606 | + | |
| 5607 | + | |
| 5608 | + | |
| 5609 | + | |
| 5610 | + | |
| 5611 | + | |
| 5612 | + | |
| 5613 | + | |
| 5614 | + | |
| 5615 | + | |
| 5616 | + | |
| 5617 | + | |
| 5618 | + | |
| 5619 | + | |
| 5620 | + | |
| 5621 | + | |
| 5622 | + | |
| 5623 | + | |
| 5624 | + | |
5585 | 5625 |
| |
5586 | 5626 |
| |
5587 | 5627 |
| |
|
Lines changed: 15 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3190 | 3190 |
| |
3191 | 3191 |
| |
3192 | 3192 |
| |
| 3193 | + | |
| 3194 | + | |
| 3195 | + | |
| 3196 | + | |
| 3197 | + | |
| 3198 | + | |
| 3199 | + | |
| 3200 | + | |
| 3201 | + | |
| 3202 | + | |
| 3203 | + | |
| 3204 | + | |
| 3205 | + | |
| 3206 | + | |
| 3207 | + | |
3193 | 3208 |
| |
3194 | 3209 |
| |
3195 | 3210 |
| |
|
Lines changed: 1 addition & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2029 | 2029 |
| |
2030 | 2030 |
| |
2031 | 2031 |
| |
| 2032 | + | |
2032 | 2033 |
| |
2033 | 2034 |
| |
2034 | 2035 |
| |
|
Lines changed: 19 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
65 | 65 |
| |
66 | 66 |
| |
67 | 67 |
| |
68 |
| - | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
69 | 73 |
| |
70 | 74 |
| |
71 | 75 |
| |
| |||
158 | 162 |
| |
159 | 163 |
| |
160 | 164 |
| |
161 |
| - | |
162 |
| - | |
163 |
| - | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
164 | 171 |
| |
165 | 172 |
| |
166 | 173 |
| |
| |||
307 | 314 |
| |
308 | 315 |
| |
309 | 316 |
| |
310 |
| - | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
311 | 324 |
| |
312 | 325 |
| |
313 | 326 |
| |
| |||
339 | 352 |
| |
340 | 353 |
| |
341 | 354 |
| |
| 355 | + | |
342 | 356 |
| |
343 | 357 |
| |
344 | 358 |
| |
|
Lines changed: 1 addition & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
129 | 129 |
| |
130 | 130 |
| |
131 | 131 |
| |
| 132 | + | |
132 | 133 |
| |
133 | 134 |
| |
134 | 135 |
| |
|
Lines changed: 24 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
154 | 154 |
| |
155 | 155 |
| |
156 | 156 |
| |
| 157 | + | |
157 | 158 |
| |
158 | 159 |
| |
159 | 160 |
| |
| |||
868 | 869 |
| |
869 | 870 |
| |
870 | 871 |
| |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
| 879 | + | |
| 880 | + | |
| 881 | + | |
| 882 | + | |
| 883 | + | |
| 884 | + | |
| 885 | + | |
| 886 | + | |
| 887 | + | |
| 888 | + | |
| 889 | + | |
| 890 | + | |
| 891 | + | |
| 892 | + | |
| 893 | + | |
871 | 894 |
| |
872 | 895 |
| |
873 | 896 |
| |
| |||
889 | 912 |
| |
890 | 913 |
| |
891 | 914 |
| |
| 915 | + | |
892 | 916 |
|
Lines changed: 10 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3962 | 3962 |
| |
3963 | 3963 |
| |
3964 | 3964 |
| |
| 3965 | + | |
| 3966 | + | |
| 3967 | + | |
| 3968 | + | |
| 3969 | + | |
| 3970 | + | |
| 3971 | + | |
3965 | 3972 |
| |
3966 | 3973 |
| |
3967 | 3974 |
| |
| |||
4461 | 4468 |
| |
4462 | 4469 |
| |
4463 | 4470 |
| |
4464 |
| - | |
4465 |
| - | |
| 4471 | + | |
| 4472 | + | |
| 4473 | + | |
4466 | 4474 |
| |
4467 | 4475 |
| |
4468 | 4476 |
| |
|
Lines changed: 1 addition & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
169 | 169 |
| |
170 | 170 |
| |
171 | 171 |
| |
| 172 | + |
Lines changed: 13 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2782 | 2782 |
| |
2783 | 2783 |
| |
2784 | 2784 |
| |
| 2785 | + | |
2785 | 2786 |
| |
2786 | 2787 |
| |
2787 | 2788 |
| |
| |||
5553 | 5554 |
| |
5554 | 5555 |
| |
5555 | 5556 |
| |
| 5557 | + | |
| 5558 | + | |
| 5559 | + | |
| 5560 | + | |
| 5561 | + | |
| 5562 | + | |
| 5563 | + | |
| 5564 | + | |
| 5565 | + | |
| 5566 | + | |
| 5567 | + | |
| 5568 | + | |
5556 | 5569 |
| |
5557 | 5570 |
| |
5558 | 5571 |
| |
|
0 commit comments
Comments
(0)