FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ArticlesDatabase.swift compatible with the DatabaseQueue revisions.

Browse Source
This commit is contained in:
Brent Simmons 2019-12-15 17:26:45 -08:00
parent 3573de3456
commit 9cb0bcbc94
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Frameworks/ArticlesDatabase/ArticlesDatabase.swift
View File

@ -36,8 +36,9 @@ public final class ArticlesDatabase {
self.queue = queue self.queue = queue
self.articlesTable = ArticlesTable(name: DatabaseTableName.articles, accountID: accountID, queue: queue) self.articlesTable = ArticlesTable(name: DatabaseTableName.articles, accountID: accountID, queue: queue)
queue.runCreateStatements(ArticlesDatabase.tableCreationStatements) try! queue.runCreateStatements(ArticlesDatabase.tableCreationStatements)
queue.runInDatabase { database in queue.runInDatabase { databaseResult in
let database = databaseResult.database!
if !self.articlesTable.containsColumn("searchRowID", in: database) { if !self.articlesTable.containsColumn("searchRowID", in: database) {
database.executeStatements("ALTER TABLE articles add column searchRowID INTEGER;") database.executeStatements("ALTER TABLE articles add column searchRowID INTEGER;")
} }
@ -45,7 +46,7 @@ public final class ArticlesDatabase {
database.executeStatements("DROP TABLE if EXISTS tags;DROP INDEX if EXISTS tags_tagName_index;DROP INDEX if EXISTS articles_feedID_index;DROP INDEX if EXISTS statuses_read_index;DROP TABLE if EXISTS attachments;DROP TABLE if EXISTS attachmentsLookup;") database.executeStatements("DROP TABLE if EXISTS tags;DROP INDEX if EXISTS tags_tagName_index;DROP INDEX if EXISTS articles_feedID_index;DROP INDEX if EXISTS statuses_read_index;DROP TABLE if EXISTS attachments;DROP TABLE if EXISTS attachmentsLookup;")
} }
queue.vacuumIfNeeded(daysBetweenVacuums: 9) // queue.vacuumIfNeeded(daysBetweenVacuums: 9) // TODO: restore this after we do database cleanups.
DispatchQueue.main.async { DispatchQueue.main.async {
self.articlesTable.indexUnindexedArticles() self.articlesTable.indexUnindexedArticles()
} }