diff --git a/Sources/TelegramModeratorBot/Database.swift b/Sources/TelegramModeratorBot/Database.swift index d23fa47..bd60b88 100644 --- a/Sources/TelegramModeratorBot/Database.swift +++ b/Sources/TelegramModeratorBot/Database.swift @@ -8,37 +8,36 @@ struct User: Codable, FetchableRecord, PersistableRecord { final class Database: Sendable { - private var dbWriter: any DatabaseWriter + private let dbWriter: any DatabaseWriter - init(_ dbWriter: any GRDB.DatabaseWriter) throws { + init(_ dbWriter: any GRDB.DatabaseWriter) throws { self.dbWriter = dbWriter try migrator.migrate(dbWriter) } - let dbQueue = try DatabaseQueue(path: "./db.sqlite") - - let db = try Connection("./db.sqlite") +// let dbQueue = try DatabaseQueue(path: "./db.sqlite") +// +// let db = try Connection("./db.sqlite") + private var migrator: DatabaseMigrator { + var migrator = DatabaseMigrator() #if DEBUG - // Speed up development by nuking the database when migrations change - // See migrator.eraseDatabaseOnSchemaChange = true #endif - private var migrator: DatabaseMigrator { - var migrator = DatabaseMigrator() - migrator.registerMigration("v1") { db in - try db.create(table: "users", { t in - t.primaryKey("userId", .text).NotNull() - t.column("publicKey", .text).NotNull() - t.column("isSpammer", .bool) - }) - return migrator - } + migrator.registerMigration("v1") { db in + try db.create(table: "users") { t in + t.primaryKey("userId", .text).notNull() + t.column("publicKey", .text).notNull() + t.column("isSpammer", .boolean) + } + } + + return migrator } } extension Database { - static func makeConfiguration(_ base: Configuration = Configuration()) -> Configuration { + static func makeConfiguration(_ base: Configuration = Configuration()) -> Configuration { var config = base return config }