Revision 13281
Added by Aaron Marcuse-Kubitza over 10 years ago
| trunk/lib/sh/db.sh | ||
|---|---|---|
| 294 | 294 |
local can_redir="$(! isset SUDO_USER; exit2bool)"; echo_vars can_redir |
| 295 | 295 |
local verbose_="$(test "$can_redir" && can_log; exit2bool)" |
| 296 | 296 |
echo_vars verbose_ |
| 297 |
local data_bypasses_filter="$(test "$output_data" -a "$can_redir";
|
|
| 298 |
exit2bool)"; echo_vars data_bypasses_filter
|
|
| 297 |
local data2stdout="$(test "$output_data" -a "$can_redir"; exit2bool)"
|
|
| 298 |
echo_vars data2stdout
|
|
| 299 | 299 |
|
| 300 | 300 |
if test "$verbose_"; then set -- --echo-all --echo-hidden "$@"; fi |
| 301 | 301 |
local redirs=("${redirs[@]}" '40<&0' "0<${stdin:-&20}" '41>&1')
|
| ... | ... | |
| 307 | 307 |
$(if test "$verbose_"; then echo NOTICE; else echo WARNING; fi);" |
| 308 | 308 |
cat |
| 309 | 309 |
)|cmd_log_fd=${can_redir:+1} pg_cmd --file /dev/fd/40 \
|
| 310 |
${data_bypasses_filter:+--output /dev/fd/41 }--set ON_ERROR_STOP=1 --quiet "$@"\
|
|
| 310 |
${data2stdout:+--output /dev/fd/41 }--set ON_ERROR_STOP=1 --quiet "$@"\
|
|
| 311 | 311 |
|| verbosity_min=2 die_error_hidden |
| 312 | 312 |
# --output is for query *results*, not echoed statements |
| 313 | 313 |
} |
Also available in: Unified diff
lib/sh/db.sh: psql(): $data_bypasses_filter: renamed to $data2stdout for clarity