percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-19 17:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test VP->flavor and fix some udnerlaying buys

Browse Source
This commit is contained in:
Brian Fraser
2012-07-12 23:37:53 -03:00
parent c5555234c1
commit ccccafd4df
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/VersionParser.pm
View File

@@ -131,10 +131,13 @@ sub BUILDARGS {
if ( @_ == 1 ) {
my %args;
if ( blessed($_[0]) && $_[0]->can("selectrow_hashref") ) {
my $dbh = $_[0];
my $query;
PTDEBUG && _d("VersionParser got a dbh, trying to get the version");
if ( eval { $query = $dbh->selectall_hashref(q<SHOW VARIABLES LIKE 'version%'>) } ) {
my $dbh = $_[0];
my $query = eval {
$dbh->selectall_arrayref(q<SHOW VARIABLES LIKE 'version%'>, { Slice => {} })
};
if ( $query ) {
$query = { map { $_->{variable_name} => $_->{value} } @$query };
@args{@methods} = $self->_split_version($query->{version});
$args{flavor} = delete $query->{version_comment}
if $query->{version_comment};

16
t/lib/VersionParser.t
View File

@@ -28,6 +28,12 @@ is(
'default ->innodb_version is NO'
);
is(
$v1->flavor(),
"Unknown",
"default ->flavor is Unknown"
);
my $v2;
$v2 = new_ok "VersionParser", [ qw( major 5 minor 5 revision 5 ) ], "new from parts works";
is( "$v2", "5.5.5" );
@@ -125,6 +131,16 @@ SKIP: {
$ver,
"object from dbh stringifies as expected"
);
my (undef, $flavor) = $dbh->selectrow_array("SHOW VARIABLES LIKE 'version_comment'");
SKIP: {
skip "Couldn't fetch version_comment from the db", 1 unless $flavor;
is(
$vp->flavor(),
$flavor,
"When created from a dbh, flavor is set through version_comment",
);
};
}
# #############################################################################