Replace Db.PrepareDelegate with a subclass virtual function hook

While slightly less flexible, it fits the Engine's needs and simplifies
the DB API.
This commit is contained in:
Michael Gratton 2019-06-11 07:21:35 +10:00 committed by Michael James Gratton
parent 03b5fcee8a
commit 5e13dd0abd
7 changed files with 27 additions and 36 deletions

View file

@ -22,7 +22,7 @@ class Geary.Db.DatabaseTest : TestCase {
public void transient_open() throws Error {
Database db = new Geary.Db.Database.transient();
db.open.begin(
Geary.Db.DatabaseFlags.NONE, null, null,
Geary.Db.DatabaseFlags.NONE, null,
(obj, ret) => { async_complete(ret); }
);
db.open.end(async_result());
@ -40,7 +40,7 @@ class Geary.Db.DatabaseTest : TestCase {
Database db = new Geary.Db.Database.persistent(tmp_file);
db.open.begin(
Geary.Db.DatabaseFlags.NONE, null, null,
Geary.Db.DatabaseFlags.NONE, null,
(obj, ret) => { async_complete(ret); }
);
db.open.end(async_result());
@ -61,7 +61,7 @@ class Geary.Db.DatabaseTest : TestCase {
tmp_dir.get_child("test.db")
);
db.open.begin(
Geary.Db.DatabaseFlags.CREATE_FILE, null, null,
Geary.Db.DatabaseFlags.CREATE_FILE, null,
(obj, ret) => { async_complete(ret); }
);
db.open.end(async_result());
@ -85,7 +85,7 @@ class Geary.Db.DatabaseTest : TestCase {
db.open.begin(
Geary.Db.DatabaseFlags.CREATE_DIRECTORY |
Geary.Db.DatabaseFlags.CREATE_FILE,
null, null,
null,
(obj, ret) => { async_complete(ret); }
);
db.open.end(async_result());
@ -110,7 +110,7 @@ class Geary.Db.DatabaseTest : TestCase {
db.open.begin(
Geary.Db.DatabaseFlags.CREATE_DIRECTORY |
Geary.Db.DatabaseFlags.CREATE_FILE,
null, null,
null,
(obj, ret) => { async_complete(ret); }
);
db.open.end(async_result());
@ -134,7 +134,7 @@ class Geary.Db.DatabaseTest : TestCase {
db.open.begin(
Geary.Db.DatabaseFlags.CREATE_FILE |
Geary.Db.DatabaseFlags.CHECK_CORRUPTION,
null, null,
null,
(obj, ret) => { async_complete(ret); }
);
db.open.end(async_result());
@ -159,7 +159,7 @@ class Geary.Db.DatabaseTest : TestCase {
Geary.Db.DatabaseFlags.CREATE_DIRECTORY |
Geary.Db.DatabaseFlags.CREATE_FILE |
Geary.Db.DatabaseFlags.CHECK_CORRUPTION,
null, null,
null,
(obj, ret) => { async_complete(ret); }
);
db.open.end(async_result());

View file

@ -34,7 +34,7 @@ class Geary.Db.VersionedDatabaseTest : TestCase {
);
db.open.begin(
Geary.Db.DatabaseFlags.CREATE_FILE, null, null,
Geary.Db.DatabaseFlags.CREATE_FILE, null,
(obj, ret) => { async_complete(ret); }
);
db.open.end(async_result());

View file

@ -114,7 +114,7 @@ class Geary.ImapDB.AttachmentIoTest : TestCase {
this.db = new Geary.Db.Database.transient();
this.db.open.begin(
Geary.Db.DatabaseFlags.NONE, null, null,
Geary.Db.DatabaseFlags.NONE, null,
(obj, res) => { async_complete(res); }
);
this.db.open.end(async_result());