Skip to content

Commit e4bdb28

Browse files
atdrendelatdrendel
committed
Rename Error to SQLiteError
1 parent f016a5e commit e4bdb28

File tree

9 files changed

+27
-27
lines changed

9 files changed

+27
-27
lines changed

‎Sources/SQLite/Database.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public final class Database {
8888

8989
let result = try _execute(sql, statement: statement, arguments: arguments)
9090
if result.isEmpty == false {
91-
throw Error.onWrite(result)
91+
throw SQLiteError.onWrite(result)
9292
}
9393
}
9494
}
@@ -289,7 +289,7 @@ extension Database {
289289
private func _observe(_ sql: SQL, arguments: SQLiteArguments = [:], queue: DispatchQueue = .main,
290290
block: @escaping (Array<SQLiteRow>) -> Void) throws -> (AnyObject, Array<SQLiteRow>) {
291291
assert(isOnDatabaseQueue)
292-
guard self.canObserveDatabase else { throw Error.onObserveWithoutColumnMetadata }
292+
guard self.canObserveDatabase else { throw SQLiteError.onObserveWithoutColumnMetadata }
293293
let statement = try prepare(sql)
294294
try statement.bind(arguments: arguments)
295295
let observer = try _monitor.observe(statement: statement, queue: queue, block: block)
@@ -299,7 +299,7 @@ extension Database {
299299
do {
300300
let (result, output) = try statement.evaluate()
301301
if result != SQLITE_DONE && result != SQLITE_INTERRUPT {
302-
throw Error.onStep(result, sql)
302+
throw SQLiteError.onStep(result, sql)
303303
}
304304
return (observer, output)
305305
} catch {
@@ -319,7 +319,7 @@ extension Database {
319319
let (result, output) = try statement.evaluate()
320320

321321
if result != SQLITE_DONE && result != SQLITE_INTERRUPT {
322-
throw Error.onStep(result, sql)
322+
throw SQLiteError.onStep(result, sql)
323323
}
324324

325325
return output
@@ -340,7 +340,7 @@ extension Database {
340340
let result = sqlite3_prepare_v2(_connection, sql, -1, &optionalStatement, nil)
341341
guard SQLITE_OK == result, let statement = optionalStatement else {
342342
sqlite3_finalize(optionalStatement)
343-
throw Error.onPrepareStatement(result, sql)
343+
throw SQLiteError.onPrepareStatement(result, sql)
344344
}
345345
return statement
346346
}
@@ -367,13 +367,13 @@ extension Database {
367367

368368
guard SQLITE_OK == result else {
369369
Database.close(optionalConnection)
370-
let error = Error.onOpen(result, path)
370+
let error = SQLiteError.onOpen(result, path)
371371
assertionFailure(error.description)
372372
throw error
373373
}
374374

375375
guard let connection = optionalConnection else {
376-
let error = Error.onOpen(SQLITE_INTERNAL, path)
376+
let error = SQLiteError.onOpen(SQLITE_INTERNAL, path)
377377
assertionFailure(error.description)
378378
throw error
379379
}
@@ -389,7 +389,7 @@ extension Database {
389389
// clean up the SQLite database connection when the transactions that
390390
// were preventing the close are finalized.
391391
// https://sqlite.org/c3ref/close.html
392-
let error = Error.onClose(result)
392+
let error = SQLiteError.onClose(result)
393393
assertionFailure(error.description)
394394
}
395395
}

‎Sources/SQLite/Monitor.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Monitor {
2828
func observe(statement: Statement, queue: DispatchQueue = .main,
2929
block: @escaping (Array<SQLiteRow>) -> Void) throws -> AnyObject {
3030
guard let database = _database else {
31-
throw Error.onInternalError("Database is missing")
31+
throw SQLiteError.onInternalError("Database is missing")
3232
}
3333

3434
let tables = try tablesToObserve(for: statement, in: database)
@@ -93,7 +93,7 @@ extension Monitor {
9393
extension Monitor {
9494
private func tablesToObserve(for statement: OpaquePointer,
9595
in database: Database) throws -> Set<String> {
96-
guard let sql = sqlite3_sql(statement) else { throw Error.onGetSQL }
96+
guard let sql = sqlite3_sql(statement) else { throw SQLiteError.onGetSQL }
9797
let explain = "EXPLAIN QUERY PLAN \(String(cString: sql));"
9898
let queryPlan = try database.execute(raw: explain)
9999
return QueryPlanParser.tables(in: queryPlan, matching: try database.tables())

‎Sources/SQLite/OpaquePointer+SQLite.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ extension Statement {
66
for (key, value) in arguments {
77
let name = ":\(key)"
88
let index = sqlite3_bind_parameter_index(self, name)
9-
guard index != 0 else { throw Error.onGetParameterIndex(key) }
9+
guard index != 0 else { throw SQLiteError.onGetParameterIndex(key) }
1010
try bind(value: value, to: index)
1111
}
1212
}
@@ -29,7 +29,7 @@ extension Statement {
2929
}
3030

3131
if SQLITE_OK != result {
32-
throw Error.onBindParameter(result, index, value)
32+
throw SQLiteError.onBindParameter(result, index, value)
3333
}
3434
}
3535

@@ -78,7 +78,7 @@ extension Statement {
7878
guard let cString = sqlite3_column_text(self, column) else { return .null }
7979
return .text(String(cString: cString))
8080
default:
81-
throw Error.onGetColumnType(type)
81+
throw SQLiteError.onGetColumnType(type)
8282
}
8383
}
8484

‎Sources/SQLite/Publisher.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct Publisher: Combine.Publisher {
2020

2121
public func receive<S: Subscriber>(subscriber: S) where Failure == S.Failure, Output == S.Input {
2222
guard let database = _database else {
23-
return subscriber.receive(completion: .failure(Error.onSubscribeWithoutDatabase))
23+
return subscriber.receive(completion: .failure(SQLiteError.onSubscribeWithoutDatabase))
2424
}
2525

2626
do {

Sources/SQLite/Error.swift renamed to Sources/SQLite/SQLiteError.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Foundation
22
import SQLite3
33

4-
public enum Error: Swift.Error {
4+
public enum SQLiteError: Error {
55
case onInternalError(String)
66
case onOpen(Int32, String)
77
case onClose(Int32)
@@ -24,7 +24,7 @@ public enum Error: Swift.Error {
2424
case onSubscribeWithoutDatabase
2525
}
2626

27-
extension Error: CustomStringConvertible {
27+
extension SQLiteError: CustomStringConvertible {
2828
public var description: String {
2929
func string(for code: Int32) -> String {
3030
return String(cString: sqlite3_errstr(code))

‎Sources/SQLite/SQLiteRow+Extensions.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ extension Dictionary where Dictionary.Key == String, Dictionary.Value == SQLiteV
1515

1616
public func value<V>(for key: String) throws -> V {
1717
if String.self == V.self {
18-
guard let value = self[key]?.stringValue else { throw Error.onDecodingRow(key) }
18+
guard let value = self[key]?.stringValue else { throw SQLiteError.onDecodingRow(key) }
1919
return value as! V
2020
} else if Int.self == V.self {
21-
guard let value = self[key]?.intValue else { throw Error.onDecodingRow(key) }
21+
guard let value = self[key]?.intValue else { throw SQLiteError.onDecodingRow(key) }
2222
return value as! V
2323
} else if Bool.self == V.self {
24-
guard let value = self[key]?.boolValue else { throw Error.onDecodingRow(key) }
24+
guard let value = self[key]?.boolValue else { throw SQLiteError.onDecodingRow(key) }
2525
return value as! V
2626
} else if Double.self == V.self {
27-
guard let value = self[key]?.doubleValue else { throw Error.onDecodingRow(key) }
27+
guard let value = self[key]?.doubleValue else { throw SQLiteError.onDecodingRow(key) }
2828
return value as! V
2929
} else if Data.self == V.self {
30-
guard let value = self[key]?.dataValue else { throw Error.onDecodingRow(key) }
30+
guard let value = self[key]?.dataValue else { throw SQLiteError.onDecodingRow(key) }
3131
return value as! V
3232
} else if Int64.self == V.self {
33-
guard let value = self[key]?.int64Value else { throw Error.onDecodingRow(key) }
33+
guard let value = self[key]?.int64Value else { throw SQLiteError.onDecodingRow(key) }
3434
return value as! V
3535
} else if Optional<String>.self == V.self {
3636
return self[key]?.stringValue as! V
@@ -45,7 +45,7 @@ extension Dictionary where Dictionary.Key == String, Dictionary.Value == SQLiteV
4545
} else if Optional<Int64>.self == V.self {
4646
return self[key]?.int64Value as! V
4747
} else {
48-
throw Error.onInvalidDecodingType(String(describing: V.self))
48+
throw SQLiteError.onInvalidDecodingType(String(describing: V.self))
4949
}
5050
}
5151
}

‎Tests/SQLiteTests/DatabaseTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class DatabaseTests: XCTestCase {
134134
XCTAssertNoThrow(try database.execute(raw: _createTableWithTypesafeBlob))
135135
XCTAssertNoThrow(try database.write(_insertIDAndData, arguments: one))
136136
XCTAssertThrowsError(try database.write(_insertIDAndData, arguments: two)) { (error) in
137-
if case Error.onStep(let code, _) = error {
137+
if case SQLiteError.onStep(let code, _) = error {
138138
XCTAssertEqual(SQLITE_CONSTRAINT, code)
139139
} else {
140140
XCTFail("'\(error)' should be 'Error.onStep'")
@@ -147,7 +147,7 @@ class DatabaseTests: XCTestCase {
147147

148148
XCTAssertNoThrow(try database.execute(raw: _createTableWithBlob))
149149
XCTAssertThrowsError(try database.write(_insertIDAndData, arguments: one)) { (error) in
150-
if case Error.onStep(let code, _) = error {
150+
if case SQLiteError.onStep(let code, _) = error {
151151
XCTAssertEqual(SQLITE_CONSTRAINT, code)
152152
} else {
153153
XCTFail("'\(error)' should be 'Error.onStep'")

‎Tests/SQLiteTests/ObserveTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ObserveTests: XCTestCase {
5555
do {
5656
token = try database.observe("NOPE;", block: onUpdatePeople)
5757
XCTFail()
58-
} catch Error.onPrepareStatement {
58+
} catch SQLiteError.onPrepareStatement {
5959
} catch {
6060
XCTFail()
6161
}

‎Tests/SQLiteTests/PublisherTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class PublisherTests: XCTestCase {
2929
case .finished:
3030
XCTFail("Should have completed with error")
3131
case .failure(let error):
32-
guard case Error.onPrepareStatement = error else {
32+
guard case SQLiteError.onPrepareStatement = error else {
3333
return XCTFail("Incorrect error: \(error)")
3434
}
3535
}

0 commit comments

Comments
 (0)