percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-12-18 02:06:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove \, from any DSN part (value or bareword). Document that DSN values must be escaped.

Browse Source
This commit is contained in:
Daniel Nichter
2012-05-24 11:20:38 -06:00
parent 026d95ac24
commit bb5d64b4a6
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/percona-toolkit.pod
View File

@@ -313,6 +313,20 @@ provide defaults for all DSNs that do not specify the option's corresponding
key part. For example, if DSN C<h=host1> and option C<--port=12345> are key part. For example, if DSN C<h=host1> and option C<--port=12345> are
specified, then the tool automatically adds C<P=12345> to DSN. specified, then the tool automatically adds C<P=12345> to DSN.
=head2 ESCAPING VALUES
DSNs are usually specified on the command line, so shell quoting and escaping
must be taken into account. Special characters, like asterisk (C<*>), need
to be quoted and/or escaped properly to be passed as literal characters in
DSN values.
Since DSN parts are separated by commas, literal commas in DSN values must
be escaped with a single backslash (C<\>). And since a backslash is
the escape character for most shells, two backslashes are required to pass
a literal backslash. For example, if the username is literally C<my,name>,
it must be specified as C<my\\,name> on most shells. This applies to DSNs
and DSN-related options like C<--user>.
=head2 KEY PARTS =head2 KEY PARTS
Many of the tools add more parts to DSNs for special purposes, and sometimes Many of the tools add more parts to DSNs for special purposes, and sometimes

2
lib/DSNParser.pm
View File

@@ -131,9 +131,9 @@ sub parse {
# Parse given props # Parse given props
foreach my $dsn_part ( split($dsn_sep, $dsn) ) { foreach my $dsn_part ( split($dsn_sep, $dsn) ) {
$dsn_part =~ s/\\,/,/g;
if ( my ($prop_key, $prop_val) = $dsn_part =~ m/^(.)=(.*)$/ ) { if ( my ($prop_key, $prop_val) = $dsn_part =~ m/^(.)=(.*)$/ ) {
# Handle the typical DSN parts like h=host, P=3306, etc. # Handle the typical DSN parts like h=host, P=3306, etc.
$prop_val =~ s/\\,/,/g;
$given_props{$prop_key} = $prop_val; $given_props{$prop_key} = $prop_val;
} }
else { else {