Add key in ModelProperty errors, add details to log

Author: joshuawright11

Sources/Alchemy/SQL/Rune/Model/ModelProperty.swift

@@ -6,7 +6,7 @@ public protocol ModelProperty {
 
 extension String: ModelProperty {
     public init(key: String, on row: SQLRowReader) throws {
-        self =  try row.require(key).string()
+        self =  try row.require(key).string(key)
     }
 
     public func store(key: String, on row: inout SQLRowWriter) throws {
@@ -16,7 +16,7 @@ extension String: ModelProperty {
 
 extension Bool: ModelProperty {
     public init(key: String, on row: SQLRowReader) throws {
-        self = try row.require(key).bool()
+        self = try row.require(key).bool(key)
     }
 
     public func store(key: String, on row: inout SQLRowWriter) throws {
@@ -26,7 +26,7 @@ extension Bool: ModelProperty {
 
 extension Float: ModelProperty {
     public init(key: String, on row: SQLRowReader) throws {
-        self = Float(try row.require(key).double())
+        self = Float(try row.require(key).double(key))
     }
 
     public func store(key: String, on row: inout SQLRowWriter) throws {
@@ -36,7 +36,7 @@ extension Float: ModelProperty {
 
 extension Double: ModelProperty {
     public init(key: String, on row: SQLRowReader) throws {
-        self =  try row.require(key).double()
+        self =  try row.require(key).double(key)
     }
 
     public func store(key: String, on row: inout SQLRowWriter) throws {
@@ -46,7 +46,7 @@ extension Double: ModelProperty {
 
 extension FixedWidthInteger {
     public init(key: String, on row: SQLRowReader) throws {
-        self = try .init(row.require(key).int())
+        self = try .init(row.require(key).int(key))
     }
 
     public func store(key: String, on row: inout SQLRowWriter) throws {
@@ -67,7 +67,7 @@ extension UInt64: ModelProperty {}
 
 extension Date: ModelProperty {
     public init(key: String, on row: SQLRowReader) throws {
-        self = try row.require(key).date()
+        self = try row.require(key).date(key)
     }
 
     public func store(key: String, on row: inout SQLRowWriter) throws {
@@ -77,7 +77,7 @@ extension Date: ModelProperty {
 
 extension UUID: ModelProperty {
     public init(key: String, on row: SQLRowReader) throws {
-        self = try row.require(key).uuid()
+        self = try row.require(key).uuid(key)
     }
 
     public func store(key: String, on row: inout SQLRowWriter) throws {

Sources/Alchemy/Utilities/Log.swift

@@ -23,7 +23,7 @@ public struct Log {
     ///   - message: the message to log.
     ///   - metadata: any metadata (a typealias of
     ///     `[String: Logger.MetadataType]`) to log.
-    public static func trace(_ message: String, metadata: Logger.Metadata? = nil) {
+    public static func trace(_ message: String, metadata: Logger.Metadata? = nil, file: String = #file, function: String = #function, line: UInt = #line) {
         Log.logger.trace(.init(stringLiteral: message), metadata: metadata)
     }
 
@@ -33,8 +33,8 @@ public struct Log {
     ///   - message: the message to log.
     ///   - metadata: any metadata (a typealias of
     ///     `[String: Logger.MetadataType]`) to log.
-    public static func debug(_ message: String, metadata: Logger.Metadata? = nil) {
-        Log.logger.debug(.init(stringLiteral: message), metadata: metadata)
+    public static func debug(_ message: String, metadata: Logger.Metadata? = nil, file: String = #file, function: String = #function, line: UInt = #line) {
+        Log.logger.debug(.init(stringLiteral: message), metadata: metadata, file: file, function: function, line: line)
     }
 
     /// Log a message with the `Logger.Level.info` log level.
@@ -43,8 +43,8 @@ public struct Log {
     ///   - message: the message to log.
     ///   - metadata: any metadata (a typealias of
     ///     `[String: Logger.MetadataType]`) to log.
-    public static func info(_ message: String, metadata: Logger.Metadata? = nil) {
-        Log.logger.info(.init(stringLiteral: message), metadata: metadata)
+    public static func info(_ message: String, metadata: Logger.Metadata? = nil, file: String = #file, function: String = #function, line: UInt = #line) {
+        Log.logger.info(.init(stringLiteral: message), metadata: metadata, file: file, function: function, line: line)
     }
 
     /// Log a message with the `Logger.Level.notice` log level.
@@ -53,8 +53,8 @@ public struct Log {
     ///   - message: the message to log.
     ///   - metadata: any metadata (a typealias of
     ///     `[String: Logger.MetadataType]`) to log.
-    public static func notice(_ message: String, metadata: Logger.Metadata? = nil) {
-        Log.logger.notice(.init(stringLiteral: message), metadata: metadata)
+    public static func notice(_ message: String, metadata: Logger.Metadata? = nil, file: String = #file, function: String = #function, line: UInt = #line) {
+        Log.logger.notice(.init(stringLiteral: message), metadata: metadata, file: file, function: function, line: line)
     }
 
     /// Log a message with the `Logger.Level.warning` log level.
@@ -63,8 +63,8 @@ public struct Log {
     ///   - message: the message to log.
     ///   - metadata: any metadata (a typealias of
     ///     `[String: Logger.MetadataType]`) to log.
-    public static func warning(_ message: String, metadata: Logger.Metadata? = nil) {
-        Log.logger.warning(.init(stringLiteral: message), metadata: metadata)
+    public static func warning(_ message: String, metadata: Logger.Metadata? = nil, file: String = #file, function: String = #function, line: UInt = #line) {
+        Log.logger.warning(.init(stringLiteral: message), metadata: metadata, file: file, function: function, line: line)
     }
 
     /// Log a message with the `Logger.Level.error` log level.
@@ -73,8 +73,8 @@ public struct Log {
     ///   - message: the message to log.
     ///   - metadata: any metadata (a typealias of
     ///     `[String: Logger.MetadataType]`) to log.
-    public static func error(_ message: String, metadata: Logger.Metadata? = nil) {
-        Log.logger.error(.init(stringLiteral: message), metadata: metadata)
+    public static func error(_ message: String, metadata: Logger.Metadata? = nil, file: String = #file, function: String = #function, line: UInt = #line) {
+        Log.logger.error(.init(stringLiteral: message), metadata: metadata, file: file, function: function, line: line)
     }
 
     /// Log a message with the `Logger.Level.critical` log level.
@@ -83,7 +83,7 @@ public struct Log {
     ///   - message: the message to log.
     ///   - metadata: any metadata (a typealias of
     ///     `[String: Logger.MetadataType]`) to log.
-    public static func critical(_ message: String, metadata: Logger.Metadata? = nil) {
-        Log.logger.critical(.init(stringLiteral: message), metadata: metadata)
+    public static func critical(_ message: String, metadata: Logger.Metadata? = nil, file: String = #file, function: String = #function, line: UInt = #line) {
+        Log.logger.critical(.init(stringLiteral: message), metadata: metadata, file: file, function: function, line: line)
     }
 }