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

rename content db table -> content_item

Browse source
This commit is contained in:
bobufa 2018-08-13 23:48:15 +02:00
parent 1d9ce7f471
commit f5547076d2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,7 @@ public class Database : Qlite.Database {
public Column<int> foreign_id = new Column.Integer("foreign_id") { not_null = true }; public Column<int> foreign_id = new Column.Integer("foreign_id") { not_null = true };
internal ContentTable(Database db) { internal ContentTable(Database db) {
base(db, "contentx"); base(db, "content_item");
init({id, conversation_id, time, local_time, content_type, foreign_id}); init({id, conversation_id, time, local_time, content_type, foreign_id});
unique({content_type, foreign_id}, "IGNORE"); unique({content_type, foreign_id}, "IGNORE");
} }
@ -228,7 +228,7 @@ public class Database : Qlite.Database {
message.fts_rebuild(); message.fts_rebuild();
} else if (oldVersion < 8) { } else if (oldVersion < 8) {
exec(""" exec("""
insert into contentx (conversation_id, time, local_time, content_type, foreign_id) insert into content_item (conversation_id, time, local_time, content_type, foreign_id)
select conversation.id, message.time, message.local_time, 1, message.id select conversation.id, message.time, message.local_time, 1, message.id
from message join conversation on from message join conversation on
message.account_id=conversation.account_id and message.account_id=conversation.account_id and

4
libdino/src/service/search_processor.vala
View file

@ -63,7 +63,7 @@ public class SearchProcessor : StreamInteractionModule, Object {
.outer_join_with(db.real_jid, db.real_jid.message_id, db.message.id) .outer_join_with(db.real_jid, db.real_jid.message_id, db.message.id)
.with(db.account.enabled, "=", true); .with(db.account.enabled, "=", true);
if (join_content) { if (join_content) {
rows.join_on(db.content, "message.id=contentx.foreign_id AND contentx.content_type=1") rows.join_on(db.content, "message.id=content_item.foreign_id AND content_item.content_type=1")
.with(db.content.content_type, "=", 1); .with(db.content.content_type, "=", 1);
} }
if (with != null) { if (with != null) {
@ -226,7 +226,7 @@ public class SearchProcessor : StreamInteractionModule, Object {
public Gee.List<MessageItem> match_messages(string query, int offset = -1) { public Gee.List<MessageItem> match_messages(string query, int offset = -1) {
Gee.List<MessageItem> ret = new ArrayList<MessageItem>(); Gee.List<MessageItem> ret = new ArrayList<MessageItem>();
QueryBuilder rows = prepare_search(query, false).limit(10); QueryBuilder rows = prepare_search(query, true).limit(10);
if (offset > 0) { if (offset > 0) {
rows.offset(offset); rows.offset(offset);
} }