Skip to content

Improved error handling #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Improved error handling #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
914202b
Avoid crash unwrapping optional date fields
roisg Oct 16, 2018
6cec421
Merge branch 'optional_dates'
roisg Oct 16, 2018
d147f94
Do not log error messages if no error occurred
roisg Oct 18, 2018
60b73bb
Merge branch 'error_log'
roisg Oct 18, 2018
bf64f69
Read error message before checking if there's an error
roisg Nov 20, 2018
b8dd7b4
Just show the error message if there's really an error
roisg Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/PostgresStORM.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ open class PostgresStORM: StORM, StORMProtocol {
let result = thisConnection.server.exec(statement: statement, params: params)

// set exec message
errorMsg = thisConnection.server.errorMessage().trimmingCharacters(in: .whitespacesAndNewlines)
if StORMdebug { LogFile.info("Error msg: \(errorMsg)", logFile: "./StORMlog.txt") }
errorMsg = thisConnection.server.errorMessage().trimmingCharacters(in: .whitespacesAndNewlines)
if isError() {
if StORMdebug { LogFile.info("Error msg: \(errorMsg)", logFile: "./StORMlog.txt") }
thisConnection.server.close()
throw StORMError.error(errorMsg)
}
Expand Down Expand Up @@ -107,8 +107,8 @@ open class PostgresStORM: StORM, StORMProtocol {

// set exec message
errorMsg = thisConnection.server.errorMessage().trimmingCharacters(in: .whitespacesAndNewlines)
if StORMdebug { LogFile.info("Error msg: \(errorMsg)", logFile: "./StORMlog.txt") }
if isError() {
if StORMdebug { LogFile.info("Error msg: \(errorMsg)", logFile: "./StORMlog.txt") }
thisConnection.server.close()
throw StORMError.error(errorMsg)
}
Expand Down
4 changes: 3 additions & 1 deletion Sources/parseRows.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ extension PostgresStORM {
let output = result.getFieldString(tupleIndex: x, fieldIndex: f)
let formatter = DateFormatter()
formatter.dateFormat = "yyyy/MM/dd hh:mm Z"
params[result.fieldName(index: f)!] = formatter.date(from: output!)
if let output = output {
params[result.fieldName(index: f)!] = formatter.date(from: output)
}

// time
// timestamp
Expand Down