Skip to content

Commit f35a863

Browse files
authored
Use structured logging (metadata) when logging queries (vapor#110)
* Don't log double `[]`s when logging queries. * Use logging metadata for logging queries
1 parent 8d3abe7 commit f35a863

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Sources/SQLiteKit/SQLiteConnection+SQLKit.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ struct SQLiteDatabaseVersion: SQLDatabaseReportedVersion {
218218
let (sql, rawBinds) = self.serialize(query)
219219

220220
if let queryLogLevel = self.queryLogLevel {
221-
self.logger.log(level: queryLogLevel, "\(sql) [\(rawBinds)]")
221+
self.logger.log(level: queryLogLevel, "Executing query", metadata: ["sql": .string(sql), "binds": .array(rawBinds.map { .string("\($0)") })])
222222
}
223223

224224
let binds: [SQLiteData]
@@ -244,7 +244,7 @@ struct SQLiteDatabaseVersion: SQLDatabaseReportedVersion {
244244
let (sql, rawBinds) = self.serialize(query)
245245

246246
if let queryLogLevel = self.queryLogLevel {
247-
self.logger.log(level: queryLogLevel, "\(sql) [\(rawBinds)]")
247+
self.logger.log(level: queryLogLevel, "Executing query", metadata: ["sql": .string(sql), "binds": .array(rawBinds.map { .string("\($0)") })])
248248
}
249249

250250
try await self.database.query(

Sources/SQLiteKit/SQLiteConnectionSource.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ public struct SQLiteConnectionSource: ConnectionPoolSource, Sendable {
4949
on: eventLoop
5050
).flatMap { conn in
5151
if self.configuration.enableForeignKeys {
52-
return conn.query("PRAGMA foreign_keys = ON")
53-
.map { _ in conn }
52+
return conn.query("PRAGMA foreign_keys = ON").map { _ in conn }
5453
} else {
5554
return eventLoop.makeSucceededFuture(conn)
5655
}

0 commit comments

Comments
 (0)