From 506d35ef85d046d056ec85241358886910dec0e9 Mon Sep 17 00:00:00 2001 From: Josef Zoller Date: Tue, 9 Oct 2018 23:28:00 +0200 Subject: [PATCH] Changed debug message file locations to StORMDebug.location --- Sources/Convenience.swift | 12 ++++++------ Sources/Delete.swift | 6 +++--- Sources/Insert.swift | 4 ++-- Sources/SQL.swift | 8 ++++---- Sources/SQLiteConnect.swift | 2 +- Sources/SQLiteStORM.swift | 14 +++++++------- Sources/Select.swift | 2 +- Sources/Update.swift | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Sources/Convenience.swift b/Sources/Convenience.swift index 1d7b535..44467b1 100644 --- a/Sources/Convenience.swift +++ b/Sources/Convenience.swift @@ -19,7 +19,7 @@ extension SQLiteStORM { do { try exec(deleteSQL(self.table(), idName: idname), params: [String(describing: idval)]) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -31,7 +31,7 @@ extension SQLiteStORM { do { try exec(deleteSQL(self.table(), idName: idname), params: [String(describing: id)]) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -43,7 +43,7 @@ extension SQLiteStORM { do { try select(whereclause: "\(idname) = :1", params: [String(describing: id)], orderby: []) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -55,7 +55,7 @@ extension SQLiteStORM { do { try select(whereclause: "\(idname) = :1", params: [String(describing: idval)], orderby: []) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -76,7 +76,7 @@ extension SQLiteStORM { do { try select(whereclause: set.joined(separator: " AND "), params: paramsString, orderby: [idname]) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -99,7 +99,7 @@ extension SQLiteStORM { do { try select(whereclause: set.joined(separator: " AND "), params: paramsString, orderby: [idname]) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } diff --git a/Sources/Delete.swift b/Sources/Delete.swift index 033984a..329be0b 100644 --- a/Sources/Delete.swift +++ b/Sources/Delete.swift @@ -23,7 +23,7 @@ extension SQLiteStORM { do { try exec(deleteSQL(self.table(), idName: idName), params: [String(id)]) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -36,7 +36,7 @@ extension SQLiteStORM { do { try exec(deleteSQL(self.table(), idName: idName), params: [id]) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -49,7 +49,7 @@ extension SQLiteStORM { do { try exec(deleteSQL(self.table(), idName: idName), params: [id.string]) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } diff --git a/Sources/Insert.swift b/Sources/Insert.swift index 9e64411..d187b13 100644 --- a/Sources/Insert.swift +++ b/Sources/Insert.swift @@ -25,7 +25,7 @@ extension SQLiteStORM { do { return try insert(cols: keys, params: vals) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } @@ -44,7 +44,7 @@ extension SQLiteStORM { let x = try execReturnID(str, params: paramString) return x } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } diff --git a/Sources/SQL.swift b/Sources/SQL.swift index 815c485..480fa0b 100644 --- a/Sources/SQL.swift +++ b/Sources/SQL.swift @@ -19,7 +19,7 @@ extension SQLiteStORM { do { try execStatement(statement) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -32,7 +32,7 @@ extension SQLiteStORM { do { return try exec(statement, params: params) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -45,7 +45,7 @@ extension SQLiteStORM { do { return try execReturnID(statement, params: params) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -58,7 +58,7 @@ extension SQLiteStORM { do { return try execRows(statement, params: params) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } diff --git a/Sources/SQLiteConnect.swift b/Sources/SQLiteConnect.swift index 65eed66..a43e171 100644 --- a/Sources/SQLiteConnect.swift +++ b/Sources/SQLiteConnect.swift @@ -34,7 +34,7 @@ open class SQLiteConnect: StORMConnect { let db = try SQLite(self.database) return db } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } diff --git a/Sources/SQLiteStORM.swift b/Sources/SQLiteStORM.swift index dabae83..e013097 100644 --- a/Sources/SQLiteStORM.swift +++ b/Sources/SQLiteStORM.swift @@ -47,7 +47,7 @@ open class SQLiteStORM: StORM { } private func printDebug(_ statement: String, _ params: [String]) { - if StORMdebug { LogFile.debug("StORM Debug: \(statement) : \(params.joined(separator: ", "))", logFile: "./StORMlog.txt") } + if StORMDebug.active { LogFile.debug("StORM Debug: \(statement) : \(params.joined(separator: ", "))", logFile: StORMDebug.location) } } // Internal function which executes statements @@ -218,7 +218,7 @@ open class SQLiteStORM: StORM { try update(data: asData(1), idName: idname, idValue: idval) } } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } return 0 @@ -239,7 +239,7 @@ open class SQLiteStORM: StORM { try update(data: asData(1), idName: idname, idValue: idval) } } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } @@ -249,7 +249,7 @@ open class SQLiteStORM: StORM { do { try insert(asData()) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } @@ -263,7 +263,7 @@ open class SQLiteStORM: StORM { /// Requires the connection to be configured, as well as a valid "table" property to have been set in the class /// Creates the table by inspecting the object. Columns will be created that relate to the assigned type of the property. Properties beginning with an underscore or "internal_" will be ignored. open func setup() throws { - LogFile.info("Running setup: \(table())", logFile: "./StORMlog.txt") + LogFile.info("Running setup: \(table())", logFile: StORMDebug.location) var opt = [String]() for child in Mirror(reflecting: self).children { guard let key = child.label else { @@ -292,12 +292,12 @@ open class SQLiteStORM: StORM { } } let createStatement = "CREATE TABLE IF NOT EXISTS \(table()) (\(opt.joined(separator: ", ")))" - if StORMdebug { LogFile.info("createStatement: \(createStatement)", logFile: "./StORMlog.txt") } + if StORMDebug.active { LogFile.info("createStatement: \(createStatement)", logFile: StORMDebug.location) } do { try sqlExec(createStatement) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } diff --git a/Sources/Select.swift b/Sources/Select.swift index aa8cee5..0499820 100644 --- a/Sources/Select.swift +++ b/Sources/Select.swift @@ -133,7 +133,7 @@ extension SQLiteStORM { if results.cursorData.totalRecords == 1 { makeRow() } } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.errorMsg = "\(error)" throw error } diff --git a/Sources/Update.swift b/Sources/Update.swift index 44de09b..23c1fc7 100644 --- a/Sources/Update.swift +++ b/Sources/Update.swift @@ -32,7 +32,7 @@ extension SQLiteStORM { do { try exec(str, params: paramsString) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -54,7 +54,7 @@ extension SQLiteStORM { do { return try update(cols: keys, params: vals, idName: idName, idValue: idValue) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } }