anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move DatabaseError handling into Qlite

Browse source
This commit is contained in:
fiaxh 2017-10-28 23:48:07 +02:00
parent d9b91206c0
commit b9df78e449
18 changed files with 166 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libdino/src/service/database.vala
View file

@ -186,7 +186,7 @@ public class Database : Qlite.Database {
public Map<string, int> jid_table_reverse = new HashMap<string, int>();
public Map<int, Account> account_table_cache = new HashMap<int, Account>();
public Database(string fileName) throws DatabaseError {
public Database(string fileName) {
base(fileName, VERSION);
account = new AccountTable(this);
jid = new JidTable(this);

4
plugins/http-files/src/plugin.vala
View file

@ -9,7 +9,6 @@ public class Plugin : RootInterface, Object {
public FileProvider file_provider;
public void registered(Dino.Application app) {
try {
this.app = app;
Manager.start(this.app.stream_interactor, app.db);
@ -21,9 +20,6 @@ public class Plugin : RootInterface, Object {
app.stream_interactor.get_module(FileManager.IDENTITY).add_provider(file_provider);
app.plugin_registry.register_message_display(new FileMessageFilterDisplay(app.db));
} catch (Error e) {
print(@"Error initializing http-files: $(e.message)\n");
}
}
public void shutdown() {

4
plugins/omemo/src/account_settings_widget.vala
View file

@ -36,7 +36,6 @@ public class AccountSettingWidget : Plugins.AccountSettingsWidget, Box {
public void set_account(Account account) {
this.account = account;
btn.visible = false;
try {
Qlite.Row? row = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id).inner;
if (row == null) {
fingerprint.set_markup("%s\n<span font='8'>%s</span>".printf(_("Own fingerprint"), _("Will be generated on first connect")));
@ -45,9 +44,6 @@ public class AccountSettingWidget : Plugins.AccountSettingsWidget, Box {
fingerprint.set_markup("%s\n<span font_family='monospace' font='8'>%s</span>".printf(_("Own fingerprint"), res));
btn.visible = true;
}
} catch (Qlite.DatabaseError e) {
fingerprint.set_markup("%s\n<span font='8'>%s</span>".printf(_("Own fingerprint"), _("Database error")));
}
}
public void deactivate() {

8
plugins/omemo/src/database.vala
View file

@ -23,11 +23,11 @@ public class Database : Qlite.Database {
index("identity_meta_list_idx", {address_name});
}
public QueryBuilder with_address(string address_name) throws DatabaseError {
public QueryBuilder with_address(string address_name) {
return select().with(this.address_name, "=", address_name);
}
public void insert_device_list(string address_name, ArrayList<int32> devices) throws DatabaseError {
public void insert_device_list(string address_name, ArrayList<int32> devices) {
update().with(this.address_name, "=", address_name).set(now_active, false).perform();
foreach (int32 device_id in devices) {
upsert()
@ -39,7 +39,7 @@ public class Database : Qlite.Database {
}
}
public int64 insert_device_bundle(string address_name, int device_id, Bundle bundle) throws DatabaseError {
public int64 insert_device_bundle(string address_name, int device_id, Bundle bundle) {
if (bundle == null || bundle.identity_key == null) return -1;
return upsert()
.value(this.address_name, address_name, true)
@ -108,7 +108,7 @@ public class Database : Qlite.Database {
public PreKeyTable pre_key { get; private set; }
public SessionTable session { get; private set; }
public Database(string fileName) throws DatabaseError {
public Database(string fileName) {
base(fileName, VERSION);
identity_meta = new IdentityMetaTable(this);
identity = new IdentityTable(this);

17
plugins/omemo/src/manager.vala
View file

@ -196,7 +196,6 @@ public class Manager : StreamInteractionModule, Object {
if (module == null) {
return;
}
try {
ArrayList<int32> device_list = module.get_device_list(jid);
db.identity_meta.insert_device_list(jid, device_list);
int inc = 0;
@ -207,28 +206,14 @@ public class Manager : StreamInteractionModule, Object {
if (inc > 0) {
if (Plugin.DEBUG) print(@"OMEMO: new bundles $inc/$(device_list.size) for $jid\n");
}
} catch (DatabaseError e) {
// Ignore
print(@"OMEMO: failed to use database: $(e.message)\n");
}
}
public void on_bundle_fetched(Account account, string jid, int32 device_id, Bundle bundle) {
try {
db.identity_meta.insert_device_bundle(jid, device_id, bundle);
} catch (DatabaseError e) {
// Ignore
print(@"OMEMO: failed to use database: $(e.message)\n");
}
}
private void on_store_created(Account account, Store store) {
Qlite.Row? row = null;
try {
row = db.identity.row_with(db.identity.account_id, account.id).inner;
} catch (Error e) {
// Ignore error
}
Qlite.Row? row = db.identity.row_with(db.identity.account_id, account.id).inner;
int identity_id = -1;
if (row == null) {

4
plugins/omemo/src/plugin.vala
View file

@ -30,7 +30,6 @@ public class Plugin : RootInterface, Object {
public ContactDetailsProvider contact_details_provider;
public void registered(Dino.Application app) {
try {
ensure_context();
this.app = app;
this.db = new Database(Path.build_filename(Application.get_storage_dir(), "omemo.db"));
@ -52,9 +51,6 @@ public class Plugin : RootInterface, Object {
locales_dir = LOCALE_INSTALL_DIR;
}
internationalize(GETTEXT_PACKAGE, locales_dir);
} catch (Error e) {
print(@"Error initializing OMEMO: $(e.message)\n");
}
}
public void shutdown() {

8
plugins/omemo/src/pre_key_store.vala
View file

@ -27,26 +27,18 @@ private class BackedPreKeyStore : SimplePreKeyStore {
}
public void on_pre_key_stored(PreKeyStore.Key key) {
try {
db.pre_key.insert().or("REPLACE")
.value(db.pre_key.identity_id, identity_id)
.value(db.pre_key.pre_key_id, (int) key.key_id)
.value(db.pre_key.record_base64, Base64.encode(key.record))
.perform();
} catch (Error e) {
print(@"OMEMO: Error while updating pre key store: $(e.message)\n");
}
}
public void on_pre_key_deleted(PreKeyStore.Key key) {
try {
db.pre_key.delete()
.with(db.pre_key.identity_id, "=", identity_id)
.with(db.pre_key.pre_key_id, "=", (int) key.key_id)
.perform();
} catch (Error e) {
print(@"OMEMO: Error while updating pre key store: $(e.message)\n");
}
}
}

8
plugins/omemo/src/session_store.vala
View file

@ -29,28 +29,20 @@ private class BackedSessionStore : SimpleSessionStore {
}
public void on_session_stored(SessionStore.Session session) {
try {
db.session.insert().or("REPLACE")
.value(db.session.identity_id, identity_id)
.value(db.session.address_name, session.name)
.value(db.session.device_id, session.device_id)
.value(db.session.record_base64, Base64.encode(session.record))
.perform();
} catch (Error e) {
print(@"OMEMO: Error while updating session store: $(e.message)\n");
}
}
public void on_session_deleted(SessionStore.Session session) {
try {
db.session.delete()
.with(db.session.identity_id, "=", identity_id)
.with(db.session.address_name, "=", session.name)
.with(db.session.device_id, "=", session.device_id)
.perform();
} catch (Error e) {
print(@"OMEMO: Error while updating session store: $(e.message)\n");
}
}
}

9
plugins/omemo/src/signed_pre_key_store.vala
View file

@ -27,27 +27,18 @@ private class BackedSignedPreKeyStore : SimpleSignedPreKeyStore {
}
public void on_signed_pre_key_stored(SignedPreKeyStore.Key key) {
try {
db.signed_pre_key.insert().or("REPLACE")
.value(db.signed_pre_key.identity_id, identity_id)
.value(db.signed_pre_key.signed_pre_key_id, (int) key.key_id)
.value(db.signed_pre_key.record_base64, Base64.encode(key.record))
.perform();
} catch (Error e) {
print(@"OMEMO: Error while updating signed pre key store: $(e.message)\n");
}
}
public void on_signed_pre_key_deleted(SignedPreKeyStore.Key key) {
try {
db.signed_pre_key.delete()
.with(db.signed_pre_key.identity_id, "=", identity_id)
.with(db.signed_pre_key.signed_pre_key_id, "=", (int) key.key_id)
.perform();
} catch (Error e) {
print(@"OMEMO: Error while updating signed pre key store: $(e.message)\n");
}
}
}

51
qlite/src/database.vala
View file

@ -2,17 +2,6 @@ using Sqlite;
namespace Qlite {
public errordomain DatabaseError {
ILLEGAL_QUERY,
NOT_SUPPORTED,
OPEN_ERROR,
PREPARE_ERROR,
EXEC_ERROR,
NON_UNIQUE,
ILLEGAL_REFERENCE,
NOT_INITIALIZED
}
public class Database {
private string file_name;
private Sqlite.Database db;
@ -33,29 +22,25 @@ public class Database {
meta_table.init({meta_name, meta_int_val, meta_text_val});
}
public void init(Table[] tables) throws DatabaseError {
public void init(Table[] tables) {
Sqlite.config(Config.SERIALIZED);
int ec = Sqlite.Database.open_v2(file_name, out db, OPEN_READWRITE | OPEN_CREATE | 0x00010000);
if (ec != Sqlite.OK) {
throw new DatabaseError.OPEN_ERROR(@"SQLite error: $(db.errcode()) - $(db.errmsg())");
error(@"SQLite error: %d - %s", db.errcode(), db.errmsg());
}
this.tables = tables;
start_migration();
if (debug) db.trace((message) => print(@"Qlite trace: $message\n"));
}
public void ensure_init() throws DatabaseError {
if (tables == null) throw new DatabaseError.NOT_INITIALIZED(@"Database $file_name was not initialized, call init()");
public void ensure_init() {
if (tables == null) error(@"Database $file_name was not initialized, call init()");
}
private void start_migration() throws DatabaseError {
private void start_migration() {
meta_table.create_table_at_version(expected_version);
long old_version = 0;
try {
old_version = meta_table.row_with(meta_name, "version")[meta_int_val, -1];
} catch (DatabaseError e) {
old_version = -1;
}
if (old_version == -1) {
foreach (Table t in tables) {
t.create_table_at_version(expected_version);
@ -97,61 +82,61 @@ public class Database {
// To be implemented by actual implementation if required
// new table columns are added, outdated columns are still present and will be removed afterwards
public virtual void migrate(long old_version) throws DatabaseError {
public virtual void migrate(long old_version) {
}
public QueryBuilder select(Column[]? columns = null) throws DatabaseError {
public QueryBuilder select(Column[]? columns = null) {
ensure_init();
return new QueryBuilder(this).select(columns);
}
public InsertBuilder insert() throws DatabaseError {
public InsertBuilder insert() {
ensure_init();
return new InsertBuilder(this);
}
public UpdateBuilder update(Table table) throws DatabaseError {
public UpdateBuilder update(Table table) {
ensure_init();
return new UpdateBuilder(this, table);
}
public UpsertBuilder upsert(Table table) throws DatabaseError {
public UpsertBuilder upsert(Table table) {
ensure_init();
return new UpsertBuilder(this, table);
}
public UpdateBuilder update_named(string table) throws DatabaseError {
public UpdateBuilder update_named(string table) {
ensure_init();
return new UpdateBuilder.for_name(this, table);
}
public DeleteBuilder delete() throws DatabaseError {
public DeleteBuilder delete() {
ensure_init();
return new DeleteBuilder(this);
}
public RowIterator query_sql(string sql, string[]? args = null) throws DatabaseError {
public RowIterator query_sql(string sql, string[]? args = null) {
ensure_init();
return new RowIterator(this, sql, args);
}
internal Statement prepare(string sql) throws DatabaseError {
internal Statement prepare(string sql) {
ensure_init();
Sqlite.Statement statement;
if (db.prepare_v2(sql, sql.length, out statement) != OK) {
throw new DatabaseError.PREPARE_ERROR(@"SQLite error: $(db.errcode()) - $(db.errmsg())");
error("SQLite error: %d - %s", db.errcode(), db.errmsg());
}
return statement;
}
public void exec(string sql) throws DatabaseError {
public void exec(string sql) {
ensure_init();
if (db.exec(sql) != OK) {
throw new DatabaseError.EXEC_ERROR(@"SQLite error: $(db.errcode()) - $(db.errmsg())");
throw new Error(-1, 0, @"SQLite error: $(db.errcode()) - $(db.errmsg())");
}
}
public bool is_known_column(string table, string field) throws DatabaseError {
public bool is_known_column(string table, string field) {
ensure_init();
foreach (Table t in tables) {
if (t.is_known_column(field)) return true;

14
qlite/src/delete_builder.vala
View file

@ -16,8 +16,8 @@ public class DeleteBuilder : StatementBuilder {
base(db);
}
public DeleteBuilder from(Table table) throws DatabaseError {
if (this.table != null) throw new DatabaseError.ILLEGAL_QUERY("cannot use from() multiple times.");
public DeleteBuilder from(Table table) {
if (this.table != null) error("Qlite Error: ILLEGAL QUERY: cannot use from() multiple times.");
this.table = table;
this.table_name = table.name;
return this;
@ -28,8 +28,8 @@ public class DeleteBuilder : StatementBuilder {
return this;
}
public DeleteBuilder where(string selection, string[]? selection_args = null) throws DatabaseError {
if (this.selection != "1") throw new DatabaseError.ILLEGAL_QUERY("selection was already done, but where() was called.");
public DeleteBuilder where(string selection, string[]? selection_args = null) {
if (this.selection != "1") error("selection was already done, but where() was called.");
this.selection = selection;
foreach (string arg in selection_args) {
this.selection_args += new StatementBuilder.StringField(arg);
@ -43,7 +43,7 @@ public class DeleteBuilder : StatementBuilder {
return this;
}
internal override Statement prepare() throws DatabaseError {
internal override Statement prepare() {
Statement stmt = db.prepare(@"DELETE FROM $table_name WHERE $selection");
for (int i = 0; i < selection_args.length; i++) {
selection_args[i].bind(stmt, i+1);
@ -51,9 +51,9 @@ public class DeleteBuilder : StatementBuilder {
return stmt;
}
public void perform() throws DatabaseError {
public void perform() {
if (prepare().step() != DONE) {
throw new DatabaseError.EXEC_ERROR(@"SQLite error: $(db.errcode()) - $(db.errmsg())");
error(@"SQLite error: %d - %s", db.errcode(), db.errmsg());
}
}

10
qlite/src/insert_builder.vala
View file

@ -45,13 +45,13 @@ public class InsertBuilder : StatementBuilder {
return this;
}
public InsertBuilder value_null<T>(Column<T> column) throws DatabaseError {
if (column.not_null) throw new DatabaseError.ILLEGAL_QUERY(@"Can't set non-null column $(column.name) to null");
public InsertBuilder value_null<T>(Column<T> column) {
if (column.not_null) error("Qlite Error: ILLEGAL QUERY: Can't set non-null column %s to null", column.name);
fields += new NullField<T>(column);
return this;
}
internal override Statement prepare() throws DatabaseError {
internal override Statement prepare() {
string fields_text = "";
string value_qs = "";
for (int i = 0; i < fields.length; i++) {
@ -72,9 +72,9 @@ public class InsertBuilder : StatementBuilder {
return stmt;
}
public int64 perform() throws DatabaseError {
public int64 perform() {
if (prepare().step() != DONE) {
throw new DatabaseError.EXEC_ERROR(@"SQLite error: $(db.errcode()) - $(db.errmsg())");
error(@"SQLite error: %d - %s", db.errcode(), db.errmsg());
}
return db.last_insert_rowid();
}

22
qlite/src/query_builder.vala
View file

@ -49,8 +49,8 @@ public class QueryBuilder : StatementBuilder {
return this;
}
public QueryBuilder from(Table table) throws DatabaseError {
if (this.table_name != null) throw new DatabaseError.ILLEGAL_QUERY("cannot use from() multiple times.");
public QueryBuilder from(Table table) {
if (this.table_name != null) error("cannot use from() multiple times.");
this.table = table;
this.table_name = table.name;
return this;
@ -61,8 +61,8 @@ public class QueryBuilder : StatementBuilder {
return this;
}
public QueryBuilder where(string selection, string[] selection_args = {}) throws DatabaseError {
if (this.selection != "1") throw new DatabaseError.ILLEGAL_QUERY("selection was already done, but where() was called.");
public QueryBuilder where(string selection, string[] selection_args = {}) {
if (this.selection != "1") error("selection was already done, but where() was called.");
this.selection = selection;
foreach (string arg in selection_args) {
this.selection_args += new StatementBuilder.StringField(arg);
@ -102,26 +102,26 @@ public class QueryBuilder : StatementBuilder {
return this;
}
public int64 count() throws DatabaseError {
public int64 count() {
this.column_selector = @"COUNT($column_selector) AS count";
this.single_result = true;
return row().get_integer("count");
}
private Row? row_() throws DatabaseError {
if (!single_result) throw new DatabaseError.NON_UNIQUE("query is not suited to return a single row, but row() was called.");
private Row? row_() {
if (!single_result) error("query is not suited to return a single row, but row() was called.");
return iterator().get_next();
}
public RowOption row() throws DatabaseError {
public RowOption row() {
return new RowOption(row_());
}
public T get<T>(Column<T> field) throws DatabaseError {
public T get<T>(Column<T> field) {
return row()[field];
}
internal override Statement prepare() throws DatabaseError {
internal override Statement prepare() {
Statement stmt = db.prepare(@"SELECT $column_selector $(table_name == null ? "" : @"FROM $((!) table_name)") WHERE $selection $(OrderingTerm.all_to_string(order_by_terms)) $(limit_val > 0 ? @" LIMIT $limit_val" : "")");
for (int i = 0; i < selection_args.length; i++) {
selection_args[i].bind(stmt, i+1);
@ -129,7 +129,7 @@ public class QueryBuilder : StatementBuilder {
return stmt;
}
public RowIterator iterator() throws DatabaseError {
public RowIterator iterator() {
return new RowIterator.from_query_builder(db, this);
}

4
qlite/src/row.vala
View file

@ -56,12 +56,12 @@ public class RowIterator {
private Database db;
private Statement stmt;
public RowIterator.from_query_builder(Database db, QueryBuilder query) throws DatabaseError {
public RowIterator.from_query_builder(Database db, QueryBuilder query) {
this.db = db;
this.stmt = query.prepare();
}
public RowIterator(Database db, string sql, string[]? args = null) throws DatabaseError {
public RowIterator(Database db, string sql, string[]? args = null) {
this.db = db;
this.stmt = db.prepare(sql);
if (args != null) {

2
qlite/src/statement_builder.vala
View file

@ -9,7 +9,7 @@ public abstract class StatementBuilder {
this.db = db;
}
internal abstract Statement prepare() throws DatabaseError;
internal abstract Statement prepare();
internal abstract class AbstractField<T> {
public T value;

28
qlite/src/table.vala
View file

@ -49,42 +49,42 @@ public class Table {
add_post_statement(stmt);
}
private void ensure_init() throws DatabaseError {
if (columns == null) throw new DatabaseError.NOT_INITIALIZED(@"Table $name was not initialized, call init()");
private void ensure_init() {
if (columns == null) error("Table %s was not initialized, call init()", name);
}
public QueryBuilder select(Column[]? columns = null) throws DatabaseError {
public QueryBuilder select(Column[]? columns = null) {
ensure_init();
return db.select(columns).from(this);
}
public InsertBuilder insert() throws DatabaseError {
public InsertBuilder insert() {
ensure_init();
return db.insert().into(this);
}
public UpdateBuilder update() throws DatabaseError {
public UpdateBuilder update() {
ensure_init();
return db.update(this);
}
public UpsertBuilder upsert() throws DatabaseError {
public UpsertBuilder upsert() {
ensure_init();
return db.upsert(this);
}
public DeleteBuilder delete() throws DatabaseError {
public DeleteBuilder delete() {
ensure_init();
return db.delete().from(this);
}
public RowOption row_with<T>(Column<T> column, T value) throws DatabaseError {
public RowOption row_with<T>(Column<T> column, T value) {
ensure_init();
if (!column.unique && !column.primary_key) throw new DatabaseError.NON_UNIQUE(@"$(column.name) is not suited to identify a row, but used with row_with()");
if (!column.unique && !column.primary_key) error("%s is not suited to identify a row, but used with row_with()", column.name);
return select().with(column, "=", value).row();
}
public bool is_known_column(string column) throws DatabaseError {
public bool is_known_column(string column) {
ensure_init();
foreach (Column c in columns) {
if (c.name == column) return true;
@ -92,7 +92,7 @@ public class Table {
return false;
}
public void create_table_at_version(long version) throws DatabaseError {
public void create_table_at_version(long version) {
ensure_init();
string sql = @"CREATE TABLE IF NOT EXISTS $name (";
for (int i = 0; i < columns.length; i++) {
@ -105,7 +105,7 @@ public class Table {
db.exec(sql);
}
public void add_columns_for_version(long old_version, long new_version) throws DatabaseError {
public void add_columns_for_version(long old_version, long new_version) {
ensure_init();
foreach (Column c in columns) {
if (c.min_version <= new_version && c.max_version >= new_version && c.min_version > old_version) {
@ -114,7 +114,7 @@ public class Table {
}
}
public void delete_columns_for_version(long old_version, long new_version) throws DatabaseError {
public void delete_columns_for_version(long old_version, long new_version) {
bool column_deletion_required = false;
string column_list = "";
foreach (Column c in columns) {
@ -137,7 +137,7 @@ public class Table {
}
}
internal void post() throws DatabaseError {
internal void post() {
foreach (string stmt in post_statements) {
db.exec(stmt);
}

14
qlite/src/update_builder.vala
View file

@ -39,14 +39,14 @@ public class UpdateBuilder : StatementBuilder {
return this;
}
public UpdateBuilder set_null<T>(Column<T> column) throws DatabaseError {
if (column.not_null) throw new DatabaseError.ILLEGAL_QUERY(@"Can't set non-null column $(column.name) to null");
public UpdateBuilder set_null<T>(Column<T> column) {
if (column.not_null) error("Can't set non-null column %s to null", column.name);
fields += new NullField<T>(column);
return this;
}
public UpdateBuilder where(string selection, string[] selection_args = {}) throws DatabaseError {
if (this.selection != "1") throw new DatabaseError.ILLEGAL_QUERY("selection was already done, but where() was called.");
public UpdateBuilder where(string selection, string[] selection_args = {}) {
if (this.selection != "1") error("selection was already done, but where() was called.");
this.selection = selection;
foreach (string arg in selection_args) {
this.selection_args += new StatementBuilder.StringField(arg);
@ -70,7 +70,7 @@ public class UpdateBuilder : StatementBuilder {
return this;
}
internal override Statement prepare() throws DatabaseError {
internal override Statement prepare() {
string sql = "UPDATE";
if (or_val != null) sql += @" OR $((!)or_val)";
sql += @" $table_name SET ";
@ -91,10 +91,10 @@ public class UpdateBuilder : StatementBuilder {
return stmt;
}
public void perform() throws DatabaseError {
public void perform() {
if (fields.length == 0) return;
if (prepare().step() != DONE) {
throw new DatabaseError.EXEC_ERROR(@"SQLite error: $(db.errcode()) - $(db.errmsg())");
error("SQLite error: %d - %s", db.errcode(), db.errmsg());
}
}

12
qlite/src/upsert_builder.vala
View file

@ -26,14 +26,14 @@ public class UpsertBuilder : StatementBuilder {
return this;
}
public UpsertBuilder value_null<T>(Column<T> column) throws DatabaseError {
if (column.not_null) throw new DatabaseError.ILLEGAL_QUERY(@"Can't set non-null column $(column.name) to null");
public UpsertBuilder value_null<T>(Column<T> column) {
if (column.not_null) error("Can't set non-null column %s to null", column.name);
fields += new NullField<T>(column);
return this;
}
internal override Statement prepare() throws DatabaseError {
throw new DatabaseError.NOT_SUPPORTED("prepare() not available for upsert.");
internal override Statement prepare() {
error("prepare() not available for upsert.");
}
internal Statement prepare_update() {
@ -98,9 +98,9 @@ public class UpsertBuilder : StatementBuilder {
return stmt;
}
public int64 perform() throws DatabaseError {
public int64 perform() {
if (prepare_update().step() != DONE || prepare_insert().step() != DONE) {
throw new DatabaseError.EXEC_ERROR(@"SQLite error: $(db.errcode()) - $(db.errmsg())");
error(@"SQLite error: %d - %s", db.errcode(), db.errmsg());
}
return db.last_insert_rowid();
}