Resume for SchemaIterator. Use only next_lb; don't need first_lb in NibbleIterator.

This commit is contained in:
Daniel Nichter
2011-09-27 13:06:24 -06:00
parent d4b5409492
commit 25882d49e7
4 changed files with 76 additions and 12 deletions

View File

@@ -9,7 +9,7 @@ BEGIN {
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More tests => 29;
use Test::More tests => 30;
use SchemaIterator;
use FileIterator;
@@ -56,6 +56,7 @@ sub test_so {
$si = new SchemaIterator(
file_itr => $file_itr,
keep_ddl => defined $args{keep_ddl} ? $args{keep_ddl} : 1,
resume => $args{resume},
OptionParser => $o,
Quoter => $q,
TableParser => $tp,
@@ -65,6 +66,7 @@ sub test_so {
$si = new SchemaIterator(
dbh => $dbh,
keep_ddl => defined $args{keep_ddl} ? $args{keep_ddl} : 1,
resume => $args{resume},
OptionParser => $o,
Quoter => $q,
TableParser => $tp,
@@ -77,7 +79,7 @@ sub test_so {
my $res = "";
my @objs;
while ( my $obj = $si->next_schema_object() ) {
while ( my $obj = $si->next() ) {
if ( $args{return_objs} ) {
push @objs, $obj;
}
@@ -222,7 +224,7 @@ SKIP: {
unless @{$dbh->selectcol_arrayref('SHOW DATABASES LIKE "sakila"')};
test_so(
filteres => [qw(-d sakila)],
filters => [qw(-d sakila)],
result => "", # hack; uses unlike instead
unlike => qr/
actor_info
@@ -411,6 +413,21 @@ is(
'DDL deleted unless keep_ddl'
);
# ############################################################################
# Resume
# ############################################################################
SKIP: {
skip 'Sandbox master does not have the sakila database', 1
unless @{$dbh->selectcol_arrayref('SHOW DATABASES LIKE "sakila"')};
test_so(
filters => [qw(-d sakila)],
result => "$out/resume-from-sakila-payment.txt",
resume => 'sakila.payment',
test_name => "Resume"
);
};
# #############################################################################
# Done.
# #############################################################################

View File

@@ -0,0 +1,4 @@
sakila.payment
sakila.rental
sakila.staff
sakila.store