Skip to content

Commit bd1fc80

Browse files
jberkeljberkel
committed
Row.get should throw, not crash
#649, #413
1 parent b8d6a9c commit bd1fc80

File tree

4 files changed

+52
-9
lines changed

4 files changed

+52
-9
lines changed

‎SQLite.xcodeproj/project.pbxproj

+10
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,26 @@
5151
19A171F12AB8B07F2FD7201A /* Cipher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A178A39ACA9667A62663CC /* Cipher.swift */; };
5252
19A17254FBA7894891F7297B /* FTS5Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1721B8984686B9963B45D /* FTS5Tests.swift */; };
5353
19A17408007B182F884E3A53 /* Fixtures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A17B93B48B5560E6E51791 /* Fixtures.swift */; };
54+
19A17490543609FCED53CACC /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1710E73A46D5AC721CDA9 /* Errors.swift */; };
5455
19A174D78559CD30679BCCCB /* FTS5Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1721B8984686B9963B45D /* FTS5Tests.swift */; };
5556
19A1750CEE9B05267995CF3D /* FTS5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1730E4390C775C25677D1 /* FTS5.swift */; };
5657
19A175DFF47B84757E547C62 /* fixtures in Resources */ = {isa = PBXBuildFile; fileRef = 19A17E2695737FAB5D6086E3 /* fixtures */; };
5758
19A177CC33F2E6A24AF90B02 /* CipherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A17399EA9E61235D5D77BF /* CipherTests.swift */; };
5859
19A178072B371489E6A1E839 /* FoundationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1794CC4D7827E997E32A7 /* FoundationTests.swift */; };
5960
19A17835FD5886FDC5A3228F /* Cipher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A178A39ACA9667A62663CC /* Cipher.swift */; };
61+
19A1792C0520D4E83C2EB075 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1710E73A46D5AC721CDA9 /* Errors.swift */; };
6062
19A179A0C45377CB09BB358C /* CipherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A17399EA9E61235D5D77BF /* CipherTests.swift */; };
6163
19A179CCF9671E345E5A9811 /* Cipher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A178A39ACA9667A62663CC /* Cipher.swift */; };
6264
19A179E76EA6207669B60C1B /* Cipher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A178A39ACA9667A62663CC /* Cipher.swift */; };
6365
19A17C4B951CB054EE48AB1C /* CipherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A17399EA9E61235D5D77BF /* CipherTests.swift */; };
66+
19A17DC282E36C4F41AA440B /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1710E73A46D5AC721CDA9 /* Errors.swift */; };
6467
19A17E04C4C0956715C5676A /* FoundationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1794CC4D7827E997E32A7 /* FoundationTests.swift */; };
6568
19A17EC0D68BA8C03288ADF7 /* FTS5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1730E4390C775C25677D1 /* FTS5.swift */; };
6669
19A17F3E1F7ACA33BD43E138 /* fixtures in Resources */ = {isa = PBXBuildFile; fileRef = 19A17E2695737FAB5D6086E3 /* fixtures */; };
6770
19A17F60B685636D1F83C2DD /* Fixtures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A17B93B48B5560E6E51791 /* Fixtures.swift */; };
6871
19A17FB80B94E882050AA908 /* FoundationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1794CC4D7827E997E32A7 /* FoundationTests.swift */; };
6972
19A17FDA323BAFDEC627E76F /* fixtures in Resources */ = {isa = PBXBuildFile; fileRef = 19A17E2695737FAB5D6086E3 /* fixtures */; };
73+
19A17FF4A10B44D3937C8CAC /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1710E73A46D5AC721CDA9 /* Errors.swift */; };
7074
3D67B3E61DB2469200A4F4C6 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D67B3E51DB2469200A4F4C6 /* libsqlite3.tbd */; };
7175
3D67B3E71DB246BA00A4F4C6 /* Blob.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEE1C3F06E900AE3E12 /* Blob.swift */; };
7276
3D67B3E81DB246BA00A4F4C6 /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEF1C3F06E900AE3E12 /* Connection.swift */; };
@@ -196,6 +200,7 @@
196200
03A65E5A1C6BB0F50062603F /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
197201
03A65E631C6BB0F60062603F /* SQLiteTests tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SQLiteTests tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
198202
03A65E961C6BB3210062603F /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; };
203+
19A1710E73A46D5AC721CDA9 /* Errors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = "<group>"; };
199204
19A1721B8984686B9963B45D /* FTS5Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS5Tests.swift; sourceTree = "<group>"; };
200205
19A1730E4390C775C25677D1 /* FTS5.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS5.swift; sourceTree = "<group>"; };
201206
19A17399EA9E61235D5D77BF /* CipherTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CipherTests.swift; sourceTree = "<group>"; };
@@ -408,6 +413,7 @@
408413
EE247AF11C3F06E900AE3E12 /* SQLite-Bridging.m */,
409414
EE247AF21C3F06E900AE3E12 /* Statement.swift */,
410415
EE247AF31C3F06E900AE3E12 /* Value.swift */,
416+
19A1710E73A46D5AC721CDA9 /* Errors.swift */,
411417
);
412418
path = Core;
413419
sourceTree = "<group>";
@@ -787,6 +793,7 @@
787793
03A65E7E1C6BB2FB0062603F /* AggregateFunctions.swift in Sources */,
788794
19A17EC0D68BA8C03288ADF7 /* FTS5.swift in Sources */,
789795
19A179E76EA6207669B60C1B /* Cipher.swift in Sources */,
796+
19A17FF4A10B44D3937C8CAC /* Errors.swift in Sources */,
790797
);
791798
runOnlyForDeploymentPostprocessing = 0;
792799
};
@@ -840,6 +847,7 @@
840847
3D67B3E71DB246BA00A4F4C6 /* Blob.swift in Sources */,
841848
3D67B3E81DB246BA00A4F4C6 /* Connection.swift in Sources */,
842849
19A179CCF9671E345E5A9811 /* Cipher.swift in Sources */,
850+
19A17DC282E36C4F41AA440B /* Errors.swift in Sources */,
843851
);
844852
runOnlyForDeploymentPostprocessing = 0;
845853
};
@@ -867,6 +875,7 @@
867875
EE247B0D1C3F06E900AE3E12 /* AggregateFunctions.swift in Sources */,
868876
19A1717B10CC941ACB5533D6 /* FTS5.swift in Sources */,
869877
19A171F12AB8B07F2FD7201A /* Cipher.swift in Sources */,
878+
19A1792C0520D4E83C2EB075 /* Errors.swift in Sources */,
870879
);
871880
runOnlyForDeploymentPostprocessing = 0;
872881
};
@@ -920,6 +929,7 @@
920929
EE247B6D1C3F3FEC00AE3E12 /* AggregateFunctions.swift in Sources */,
921930
19A1750CEE9B05267995CF3D /* FTS5.swift in Sources */,
922931
19A17835FD5886FDC5A3228F /* Cipher.swift in Sources */,
932+
19A17490543609FCED53CACC /* Errors.swift in Sources */,
923933
);
924934
runOnlyForDeploymentPostprocessing = 0;
925935
};

‎Sources/SQLite/Core/Errors.swift

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import Foundation
2+
3+
public enum QueryError: Error, CustomStringConvertible {
4+
case noSuchTable(name: String)
5+
case noSuchColumn(name: String, columns: [String])
6+
case ambiguousColumn(name: String, similar: [String])
7+
8+
public var description: String {
9+
switch self {
10+
case .noSuchTable(let name):
11+
return "No such table: \(name)"
12+
case .noSuchColumn(let name, let columns):
13+
return "No such column `\(name)` in columns \(columns)"
14+
case .ambiguousColumn(let name, let similar):
15+
return "Ambiguous column `\(name)` (please disambiguate: \(similar))"
16+
}
17+
}
18+
}

‎Sources/SQLite/Typed/Query.swift

+10-9
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ extension Connection {
929929
continue column
930930
}
931931
}
932-
fatalError("no such table: \(namespace)")
932+
throw QueryError.noSuchTable(name: namespace)
933933
}
934934
for q in queries {
935935
try expandGlob(query.clauses.join.count > 0)(q)
@@ -1041,37 +1041,38 @@ public struct Row {
10411041
/// - Parameter column: An expression representing a column selected in a Query.
10421042
///
10431043
/// - Returns: The value for the given column.
1044-
public func get<V: Value>(_ column: Expression<V>) -> V {
1045-
return get(Expression<V?>(column))!
1044+
public func get<V: Value>(_ column: Expression<V>) throws -> V {
1045+
return try get(Expression<V?>(column))!
10461046
}
1047-
public func get<V: Value>(_ column: Expression<V?>) -> V? {
1047+
1048+
public func get<V: Value>(_ column: Expression<V?>) throws -> V? {
10481049
func valueAtIndex(_ idx: Int) -> V? {
10491050
guard let value = values[idx] as? V.Datatype else { return nil }
1050-
return (V.fromDatatypeValue(value) as? V)!
1051+
return V.fromDatatypeValue(value) as? V
10511052
}
10521053

10531054
guard let idx = columnNames[column.template] else {
10541055
let similar = Array(columnNames.keys).filter { $0.hasSuffix(".\(column.template)") }
10551056

10561057
switch similar.count {
10571058
case 0:
1058-
fatalError("no such column '\(column.template)' in columns: \(columnNames.keys.sorted())")
1059+
throw QueryError.noSuchColumn(name: column.template, columns: columnNames.keys.sorted())
10591060
case 1:
10601061
return valueAtIndex(columnNames[similar[0]]!)
10611062
default:
1062-
fatalError("ambiguous column '\(column.template)' (please disambiguate: \(similar))")
1063+
throw QueryError.ambiguousColumn(name: column.template, similar: similar)
10631064
}
10641065
}
10651066

10661067
return valueAtIndex(idx)
10671068
}
10681069

10691070
public subscript<T : Value>(column: Expression<T>) -> T {
1070-
return get(column)
1071+
return try! get(column)
10711072
}
10721073

10731074
public subscript<T : Value>(column: Expression<T?>) -> T? {
1074-
return get(column)
1075+
return try! get(column)
10751076
}
10761077
}
10771078

‎Tests/SQLiteTests/QueryTests.swift

+14
Original file line numberDiff line numberDiff line change
@@ -412,4 +412,18 @@ class QueryIntegrationTests : SQLiteTestCase {
412412
let orderedIDs = try db.prepare(query3.union(query4).order(Expression<Int>(literal: "weight"), email)).map { $0[id] }
413413
XCTAssertEqual(Array(expectedIDs.reversed()), orderedIDs)
414414
}
415+
416+
func test_no_such_column() throws {
417+
let doesNotExist = Expression<String>("doesNotExist")
418+
try! InsertUser("alice")
419+
let row = try! db.pluck(users.filter(email == "[email protected]"))!
420+
421+
XCTAssertThrowsError(try row.get(doesNotExist)) { error in
422+
if case QueryError.noSuchColumn(let name, _) = error {
423+
XCTAssertEqual("\"doesNotExist\"", name)
424+
} else {
425+
XCTFail("unexpected error: \(error)")
426+
}
427+
}
428+
}
415429
}

0 commit comments

Comments
 (0)