Merge changes.

This commit is contained in:
Daniel Nichter
2012-06-03 14:22:43 -04:00

View File

@@ -39,7 +39,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 51; plan tests => 54;
} }
my $q = new Quoter(); my $q = new Quoter();
@@ -453,36 +453,10 @@ $ni = make_nibble_iter(
); );
$ni->next(); $ni->next();
$ni->next(); $ni->next();
is_deeply( ok($expl[0]->{rows} > 40 && $expl[0]->{rows} < 80, 'Rows between 40-80');
\@expl, is($expl[0]->{key}, 'PRIMARY', 'Uses PRIMARY key');
[ is($expl[0]->{key_len}, '2', 'Uses 2 bytes of index');
{ is($expl[0]->{type} , 'range', 'Uses range type');
id => '1',
key => 'PRIMARY',
key_len => '2',
possible_keys => 'PRIMARY',
ref => undef,
rows => '54',
select_type => 'SIMPLE',
table => 'country',
type => 'range',
extra => 'Using where',
},
{
id => '1',
key => 'PRIMARY',
key_len => '2',
possible_keys => 'PRIMARY',
ref => undef,
rows => '49',
select_type => 'SIMPLE',
table => 'country',
type => 'range',
extra => 'Using where',
},
],
'exec_nibble callbackup and explain_sth'
) or print STDERR Dumper(\@expl);
# ######################################################################### # #########################################################################
# film_actor, multi-column pk # film_actor, multi-column pk