michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support special backslash-l command

Browse Source
This commit is contained in:
Jamie Cameron
2011-02-25 21:23:26 -08:00
parent 02bc34a23c
commit 98f4e91399
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
postgresql/postgresql-lib.pl
View File

@@ -277,7 +277,9 @@ if ($gconfig{'debug_what_sql'}) {
}
&webmin_debug_log('SQL', "db=$_[0] sql=$sql".$params);
}
$sql =~ s/\\/\\\\/g;
if ($sql !~ /^\s*\\/) {
$sql =~ s/\\/\\\\/g;
}
if ($driver_handle &&
$sql !~ /^\s*(create|drop)\s+database/ && $sql !~ /^\s*\\/ &&
!$force_nodbi) {
@@ -362,13 +364,16 @@ if ($driver_handle &&
else {
# Check for a \ command
my $break_f = 0 ;
if ( $sql =~ /^\s*\\/ ) {
$break_f = 1 ;
if ( $sql !~ /^\s*\\copy\s+/ &&
$sql !~ /^\s*\\i\s+/ ) {
&error ( &text ( 'r_command', ) ) ;
}
}
if ($sql =~ /^\s*\\l\s*$/) {
# \l command to list encodings needs no special handling
}
elsif ($sql =~ /^\s*\\/ ) {
$break_f = 1 ;
if ($sql !~ /^\s*\\copy\s+/ &&
$sql !~ /^\s*\\i\s+/) {
&error ( &text ( 'r_command', ) ) ;
}
}
if (@params) {
# Sub in ? parameters
@@ -404,7 +409,7 @@ else {
delete($ENV{'LANG'}); # to force output to english
delete($ENV{'LANGUAGE'});
if ( $break_f == 0 ) {
if ($break_f == 0) {
# Running a normal SQL command, not one with a \
#$ENV{'PAGER'} = "cat";
if (&foreign_check("proc")) {
@@ -464,10 +469,10 @@ else {
$emsgf = &transname();
$rc = &system_logged ( "$cmd >$emsgf 2>&1");
$emsg = `cat $emsgf` ;
unlink ( $emsgf ) ;
$emsg = &read_file_contents($emsgf);
&unlink_file($emsgf) ;
if ($rc) {
&error ( "<pre>$emsg</pre>" );
&error("<pre>$emsg</pre>");
}
else {
@titles = ( " Command Invocation " ) ;