percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-19 02:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 'h=localhost' if no DSN or DSN options given. Remove unused DSN parts (D and t) and don't copy some parts. Move issue_947.t tests into standard_options.t and remove issue_947.t.

Browse Source
This commit is contained in:
Daniel Nichter
2011-10-14 07:59:43 -06:00
parent 60d8b1a710
commit 48fb4baa7c
5 changed files with 143 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Cxn.pm
View File

@@ -57,18 +57,29 @@ sub new {
foreach my $arg ( @required_args ) {
die "I need a $arg argument" unless $args{$arg};
};
die "I need a dsn or dsn_string argument"
unless $args{dsn} || $args{dsn_string};
my ($dp, $o) = @args{@required_args};
# Any tool that connects to MySQL should have a standard set of
# connection options like --host, --port, --user, etc. These
# are default values; they're used in the DSN if the DSN doesn't
# explicate the corresponding part (h=--host, P=--port, etc.).
my $dsn_defaults = $dp->parse_options($o);
my $dsn = $args{dsn};
if ( !$dsn ) {
# If there's no DSN and no DSN string, then the user probably ran
# the tool without specifying a DSN or any default connection options.
# They're probably relying on DBI/DBD::mysql to do the right thing
# by connecting to localhost. On many systems, connecting just to
# localhost causes DBI to use a built-in socket, i.e. it doesn't
# always equate to 'h=127.0.0.1,P=3306'.
$args{dsn_string} ||= 'h=' . ($dsn_defaults->{h} || 'localhost');
$dsn = $dp->parse(
$args{dsn_string}, $args{prev_dsn}, $dp->parse_options($o));
$args{dsn_string}, $args{prev_dsn}, $dsn_defaults);
}
my $self = {
dsn_string => $args{dsn_string},
dsn => $dsn,
dbh => $args{dbh},
set => $args{set},