X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Fover.t;h=4c8f8098a3e3edefbf978eb6ea5be5608f0ece53;hb=7f4a11a6499aade26b418b7ae13cd12859f75bdd;hp=8bf64ecb30aa1e73e1ccf4a2716d920aa4277d1f;hpb=5f6a0d2342323541e44ff2f1e7329053d0263800;p=public-inbox.git diff --git a/t/over.t b/t/over.t index 8bf64ecb..4c8f8098 100644 --- a/t/over.t +++ b/t/over.t @@ -9,7 +9,7 @@ require_mods('DBD::SQLite'); use_ok 'PublicInbox::OverIdx'; my ($tmpdir, $for_destroy) = tmpdir(); my $over = PublicInbox::OverIdx->new("$tmpdir/over.sqlite3"); -$over->connect; +$over->dbh; # open file is($over->max, 0, 'max is zero on new DB (scalar context)'); is_deeply([$over->max], [0], 'max is zero on new DB (list context)'); my $x = $over->next_tid; @@ -23,20 +23,19 @@ $y = $over->sid('hello-WORLD'); is($y, $x+1, 'sid increases'); is($over->sid('hello-world'), $x, 'idempotent'); ok(!$over->{dbh}->{ReadOnly}, 'OverIdx is not ReadOnly'); -$over->disconnect; +$over->dbh_close; $over = PublicInbox::Over->new("$tmpdir/over.sqlite3"); -$over->connect; -ok($over->{dbh}->{ReadOnly}, 'Over is ReadOnly'); +ok($over->dbh->{ReadOnly}, 'Over is ReadOnly'); $over = PublicInbox::OverIdx->new("$tmpdir/over.sqlite3"); -$over->connect; +$over->dbh; is($over->sid('hello-world'), $x, 'idempotent across reopen'); $over->each_by_mid('never', sub { fail('should not be called') }); -$x = $over->create_ghost('never'); +$x = $over->resolve_mid_to_tid('never'); is(int($x), $x, 'integer tid for ghost'); -$y = $over->create_ghost('NEVAR'); +$y = $over->resolve_mid_to_tid('NEVAR'); is($y, $x + 1, 'integer tid for ghost increases'); my $ddd = compress(''); @@ -71,7 +70,7 @@ SKIP: { skip("no WAL in SQLite version $v < 3.7.0", 1) if $v lt v3.7.0; $over->{dbh}->do('PRAGMA journal_mode = WAL'); $over = PublicInbox::OverIdx->new("$tmpdir/over.sqlite3"); - is($over->connect->selectrow_array('PRAGMA journal_mode'), 'wal', + is($over->dbh->selectrow_array('PRAGMA journal_mode'), 'wal', 'WAL journal_mode not clobbered if manually set'); }