mirror of
https://github.com/groue/GRDB.swift
synced 2026-11-22 04:00:39 +00:00
BREAKING: throwing EncodableRecord.encode(to:)
This commit is contained in:
1 parent
d2dd18b3e5
commit
37f0a0bb9a
32 files changed
+306
-229
No files matched your search
@@ -109,6 +109,10 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
|
||||
- **Breaking**: The `statement` property of database cursors was replaced with read-only properties such as `sql` or `columnNames`.
|
||||
- **Breaking**: The `Database.afterNextTransactionCommit(_:)` method was renamed `Database.afterNextTransaction(onCommit:onRollback:)`, and is now able to report rollbacks as well as commits.
|
||||
- **Breaking**: Record types can no longer override persistence methods. You use persistence callbacks instead.
|
||||
- **Breaking**: The `EncodableRecord.encode(tp:)` method can now throw errors, with various consequences:
|
||||
- `EncodableRecord.databaseDictionary` can throw
|
||||
- `EncodableRecord.databaseChanges(from:)` can throw
|
||||
- `Record.databaseChanges` can throw
|
||||
- **New**: Request protocols and cursors now define primary associated types, enabled by [SE-0346](https://github.com/apple/swift-evolution/blob/main/proposals/0346-light-weight-same-type-syntax.md).
|
||||
- **New**: You can append the contents of a cursor to a collection with `RangeReplaceableCollection.append(contentsOf:)`.
|
||||
- **New**: `ValueObservation.map` now accepts a throwing closure argument.
|
||||
|
||||
@@ -110,6 +110,33 @@ The record protocols have been refactored. We tried to keep the amount of modifi
|
||||
|
||||
</details>
|
||||
|
||||
- **The `EncodableRecord.encode(to:)` method can now throw errors.**
|
||||
|
||||
Encodable records that derive their `EncodableRecord` implementation from the standard `Encodable` protocol now throw errors when they can't be encoded into database values (they used to crash in GRDB 5).
|
||||
|
||||
If you subclass the `Record` type, you have to update your override of `encode(to:)`:
|
||||
|
||||
```diff
|
||||
class Player: Record {
|
||||
- override func encode(to container: inout PersistenceContainer) {
|
||||
+ override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["id"] = id
|
||||
container["name"] = name
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
This change has an impact on a few other apis, that can now throw errors as well:
|
||||
|
||||
```diff
|
||||
-let dictionary = player.databaseDictionary
|
||||
-let changes = newPlayer.databaseChanges(from: oldPlayer)
|
||||
-let changes = player.databaseChanges // Record class only
|
||||
+let dictionary = try player.databaseDictionary
|
||||
+let changes = try newPlayer.databaseChanges(from: oldPlayer)
|
||||
+let changes = try player.databaseChanges // Record class only
|
||||
```
|
||||
|
||||
- **The signature of the `didInsert` method has changed**.
|
||||
|
||||
You have to update all the `didInsert` methods in your application:
|
||||
|
||||
@@ -92,7 +92,7 @@ extension Place : TableRecord {
|
||||
|
||||
// Adopt MutablePersistableRecord
|
||||
extension Place : MutablePersistableRecord {
|
||||
func encode(to container: inout PersistenceContainer) {
|
||||
func encode(to container: inout PersistenceContainer) throws {
|
||||
container["id"] = id
|
||||
container["title"] = title
|
||||
container["favorite"] = favorite
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import Foundation
|
||||
|
||||
extension EncodableRecord where Self: Encodable {
|
||||
public func encode(to container: inout PersistenceContainer) {
|
||||
public func encode(to container: inout PersistenceContainer) throws {
|
||||
let encoder = RecordEncoder<Self>(persistenceContainer: container)
|
||||
try! encode(to: encoder)
|
||||
try encode(to: encoder)
|
||||
container = encoder.persistenceContainer
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,10 @@ public protocol EncodableRecord {
|
||||
/// It is undefined behavior to set different values for the same column.
|
||||
/// Column names are case insensitive, so defining both "name" and "NAME"
|
||||
/// is considered undefined behavior.
|
||||
func encode(to container: inout PersistenceContainer)
|
||||
///
|
||||
/// - throws: An error is thrown if the record can't be encoded to its
|
||||
/// database representation.
|
||||
func encode(to container: inout PersistenceContainer) throws
|
||||
|
||||
// MARK: - Customizing the Format of Database Columns
|
||||
|
||||
@@ -165,8 +168,13 @@ extension EncodableRecord {
|
||||
|
||||
extension EncodableRecord {
|
||||
/// A dictionary whose keys are the columns encoded in the `encode(to:)` method.
|
||||
///
|
||||
/// - throws: An error is thrown if the record can't be encoded to its
|
||||
/// database representation.
|
||||
public var databaseDictionary: [String: DatabaseValue] {
|
||||
Dictionary(PersistenceContainer(self).storage).mapValues { $0?.databaseValue ?? .null }
|
||||
get throws {
|
||||
try Dictionary(PersistenceContainer(self).storage).mapValues { $0?.databaseValue ?? .null }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -177,7 +185,12 @@ extension EncodableRecord {
|
||||
/// Returns a boolean indicating whether this record and the other record
|
||||
/// have the same database representation.
|
||||
public func databaseEquals(_ record: Self) -> Bool {
|
||||
PersistenceContainer(self).changesIterator(from: PersistenceContainer(record)).next() == nil
|
||||
do {
|
||||
return try PersistenceContainer(self).changesIterator(from: PersistenceContainer(record)).next() == nil
|
||||
} catch {
|
||||
// one record can't be encoded: they can't be identical in the database
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
/// A dictionary of values changed from the other record.
|
||||
@@ -188,8 +201,13 @@ extension EncodableRecord {
|
||||
/// but also in terms of columns. When the two records don't define the
|
||||
/// same set of columns in their `encode(to:)` method, only the columns
|
||||
/// defined by the receiver record are considered.
|
||||
public func databaseChanges<Record: EncodableRecord>(from record: Record) -> [String: DatabaseValue] {
|
||||
let changes = PersistenceContainer(self).changesIterator(from: PersistenceContainer(record))
|
||||
///
|
||||
/// - throws: An error is thrown if one record can't be encoded to its
|
||||
/// database representation.
|
||||
public func databaseChanges<Record: EncodableRecord>(from record: Record)
|
||||
throws -> [String: DatabaseValue]
|
||||
{
|
||||
let changes = try PersistenceContainer(self).changesIterator(from: PersistenceContainer(record))
|
||||
return Dictionary(uniqueKeysWithValues: changes)
|
||||
}
|
||||
}
|
||||
@@ -243,9 +261,9 @@ public struct PersistenceContainer {
|
||||
}
|
||||
|
||||
/// Convenience initializer from a record
|
||||
init<Record: EncodableRecord>(_ record: Record) {
|
||||
init<Record: EncodableRecord>(_ record: Record) throws {
|
||||
self.init()
|
||||
record.encode(to: &self)
|
||||
try record.encode(to: &self)
|
||||
}
|
||||
|
||||
/// Convenience initializer from a database connection and a record
|
||||
@@ -254,7 +272,7 @@ public struct PersistenceContainer {
|
||||
let databaseTableName = type(of: record).databaseTableName
|
||||
let columnCount = try db.columns(in: databaseTableName).count
|
||||
self.init(minimumCapacity: columnCount) // Optimization
|
||||
record.encode(to: &self)
|
||||
try record.encode(to: &self)
|
||||
}
|
||||
|
||||
/// Columns stored in the container, ordered like values.
|
||||
@@ -328,8 +346,8 @@ public struct PersistenceContainer {
|
||||
}
|
||||
|
||||
extension Row {
|
||||
convenience init<Record: EncodableRecord>(_ record: Record) {
|
||||
self.init(PersistenceContainer(record))
|
||||
convenience init<Record: EncodableRecord>(_ record: Record) throws {
|
||||
try self.init(PersistenceContainer(record))
|
||||
}
|
||||
|
||||
convenience init(_ container: PersistenceContainer) {
|
||||
|
||||
+35
-15
@@ -100,7 +100,7 @@ open class Record: FetchableRecord, TableRecord, PersistableRecord {
|
||||
/// var id: Int64?
|
||||
/// var name: String?
|
||||
///
|
||||
/// override func encode(to container: inout PersistenceContainer) {
|
||||
/// override func encode(to container: inout PersistenceContainer) throws {
|
||||
/// container["id"] = id
|
||||
/// container["name"] = name
|
||||
/// }
|
||||
@@ -108,7 +108,7 @@ open class Record: FetchableRecord, TableRecord, PersistableRecord {
|
||||
///
|
||||
/// The implementation of the base class Record does not store any value in
|
||||
/// the container.
|
||||
open func encode(to container: inout PersistenceContainer) { }
|
||||
open func encode(to container: inout PersistenceContainer) throws { }
|
||||
|
||||
// MARK: - Compare with Previous Versions
|
||||
|
||||
@@ -129,8 +129,12 @@ open class Record: FetchableRecord, TableRecord, PersistableRecord {
|
||||
/// false does not prevent it from turning true on subsequent modifications
|
||||
/// of the record.
|
||||
public var hasDatabaseChanges: Bool {
|
||||
get { databaseChangesIterator().next() != nil }
|
||||
set { referenceRow = newValue ? nil : Row(self) }
|
||||
do {
|
||||
return try databaseChangesIterator().next() != nil
|
||||
} catch {
|
||||
// Can't encode the record: surely it can't be saved.
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
/// A dictionary of changes that have not been saved.
|
||||
@@ -142,15 +146,35 @@ open class Record: FetchableRecord, TableRecord, PersistableRecord {
|
||||
/// are nil.
|
||||
///
|
||||
/// See `hasDatabaseChanges` for more information.
|
||||
///
|
||||
/// - throws: An error is thrown if the record can't be encoded to its
|
||||
/// database representation.
|
||||
public var databaseChanges: [String: DatabaseValue?] {
|
||||
Dictionary(uniqueKeysWithValues: databaseChangesIterator())
|
||||
get throws {
|
||||
try Dictionary(uniqueKeysWithValues: databaseChangesIterator())
|
||||
}
|
||||
}
|
||||
|
||||
/// Sets hasDatabaseChanges to true
|
||||
private func setHasDatabaseChanges() {
|
||||
referenceRow = nil
|
||||
}
|
||||
|
||||
/// Sets hasDatabaseChanges to false
|
||||
private func resetDatabaseChanges() throws {
|
||||
referenceRow = try Row(self)
|
||||
}
|
||||
|
||||
/// Sets hasDatabaseChanges to false
|
||||
private func resetDatabaseChanges(with persistenceContainer: PersistenceContainer) {
|
||||
referenceRow = Row(persistenceContainer)
|
||||
}
|
||||
|
||||
// A change iterator that is used by both hasDatabaseChanges and
|
||||
// persistentChangedValues properties.
|
||||
private func databaseChangesIterator() -> AnyIterator<(String, DatabaseValue?)> {
|
||||
private func databaseChangesIterator() throws -> AnyIterator<(String, DatabaseValue?)> {
|
||||
let oldRow = referenceRow
|
||||
var newValueIterator = PersistenceContainer(self).makeIterator()
|
||||
var newValueIterator = try PersistenceContainer(self).makeIterator()
|
||||
return AnyIterator {
|
||||
// Loop until we find a change, or exhaust columns:
|
||||
while let (column, newValue) = newValueIterator.next() {
|
||||
@@ -200,9 +224,7 @@ open class Record: FetchableRecord, TableRecord, PersistableRecord {
|
||||
/// information about the inserted row.
|
||||
open func aroundInsert(_ db: Database, insert: () throws -> InsertionSuccess) throws {
|
||||
let inserted = try insert()
|
||||
|
||||
// Set hasDatabaseChanges to false
|
||||
referenceRow = Row(inserted.persistenceContainer)
|
||||
resetDatabaseChanges(with: inserted.persistenceContainer)
|
||||
}
|
||||
|
||||
/// Called upon successful insertion.
|
||||
@@ -255,9 +277,7 @@ open class Record: FetchableRecord, TableRecord, PersistableRecord {
|
||||
/// reserved for GRDB usage.
|
||||
open func aroundUpdate(_ db: Database, columns: Set<String>, update: () throws -> PersistenceSuccess) throws {
|
||||
let updated = try update()
|
||||
|
||||
// Set hasDatabaseChanges to false
|
||||
referenceRow = Row(updated.persistenceContainer)
|
||||
resetDatabaseChanges(with: updated.persistenceContainer)
|
||||
}
|
||||
// swiftlint:enable line_length
|
||||
|
||||
@@ -335,7 +355,7 @@ open class Record: FetchableRecord, TableRecord, PersistableRecord {
|
||||
/// whether a row was deleted in the database.
|
||||
open func aroundDelete(_ db: Database, delete: () throws -> Bool) throws {
|
||||
_ = try delete()
|
||||
hasDatabaseChanges = true
|
||||
setHasDatabaseChanges()
|
||||
}
|
||||
|
||||
/// Called upon successful deletion.
|
||||
@@ -364,7 +384,7 @@ open class Record: FetchableRecord, TableRecord, PersistableRecord {
|
||||
/// match any row in the database and record could not be updated.
|
||||
@discardableResult
|
||||
public final func updateChanges(_ db: Database) throws -> Bool {
|
||||
let changedColumns = Set(databaseChanges.keys)
|
||||
let changedColumns = try Set(databaseChanges.keys)
|
||||
if changedColumns.isEmpty {
|
||||
return false
|
||||
} else {
|
||||
|
||||
@@ -2801,7 +2801,7 @@ Those abilities are granted by three protocols:
|
||||
// Defines how a record encodes itself into the database
|
||||
protocol EncodableRecord {
|
||||
/// Defines the values persisted in the database
|
||||
func encode(to container: inout PersistenceContainer)
|
||||
func encode(to container: inout PersistenceContainer) throws
|
||||
}
|
||||
|
||||
// Adds persistence methods
|
||||
@@ -3514,7 +3514,7 @@ class Place: Record {
|
||||
}
|
||||
|
||||
/// The values persisted in the database
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container[Columns.id] = id
|
||||
container[Columns.title] = title
|
||||
container[Columns.favorite] = isFavorite
|
||||
@@ -3618,7 +3618,7 @@ if newPlayer.databaseEquals(oldPlayer) == false {
|
||||
```swift
|
||||
let oldPlayer = Player(id: 1, name: "Arthur", score: 100)
|
||||
let newPlayer = Player(id: 1, name: "Arthur", score: 1000)
|
||||
for (column, oldValue) in newPlayer.databaseChanges(from: oldPlayer) {
|
||||
for (column, oldValue) in try newPlayer.databaseChanges(from: oldPlayer) {
|
||||
print("\(column) was \(oldValue)")
|
||||
}
|
||||
// prints "score was 100"
|
||||
@@ -3631,7 +3631,7 @@ The [Record](#record-class) class is able to compare against itself:
|
||||
let player = Player(id: 1, name: "Arthur", score: 100)
|
||||
try player.insert(db)
|
||||
player.score = 1000
|
||||
for (column, oldValue) in player.databaseChanges {
|
||||
for (column, oldValue) in try player.databaseChanges {
|
||||
print("\(column) was \(oldValue)")
|
||||
}
|
||||
// prints "score was 100"
|
||||
@@ -3651,17 +3651,17 @@ if player.hasDatabaseChanges {
|
||||
|
||||
```swift
|
||||
let player = Player(name: "Barbara", score: 750)
|
||||
player.hasDatabaseChanges // true
|
||||
player.hasDatabaseChanges // true
|
||||
|
||||
try player.insert(db)
|
||||
player.hasDatabaseChanges // false
|
||||
player.hasDatabaseChanges // false
|
||||
|
||||
player.name = "Barbara"
|
||||
player.hasDatabaseChanges // false
|
||||
player.hasDatabaseChanges // false
|
||||
|
||||
player.score = 1000
|
||||
player.hasDatabaseChanges // true
|
||||
player.databaseChanges // ["score": 750]
|
||||
player.hasDatabaseChanges // true
|
||||
try player.databaseChanges // ["score": 750]
|
||||
```
|
||||
|
||||
For an efficient algorithm which synchronizes the content of a database table with a JSON payload, check [groue/SortedDifference](https://github.com/groue/SortedDifference).
|
||||
@@ -4137,7 +4137,7 @@ class Place: Record {
|
||||
}
|
||||
|
||||
/// The values persisted in the database
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container[Columns.id] = id
|
||||
container[Columns.title] = title
|
||||
container[Columns.isFavorite] = isFavorite
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
- [ ] GRDB 6: INSERT or UPDATE columns to their default value
|
||||
- [X] GRDB 6: afterNextTransactionCommit -> afterNextTransaction(onCommit:onRollback:)
|
||||
- [ ] GRDB 6: encoding errors for record (`EncodableRecord.encode(to:)`)
|
||||
- [ ] throwing EncodableRecord.encode FIRST
|
||||
- [X] throwing EncodableRecord.encode FIRST
|
||||
- [?] GRDB 6: protocol-based record container? This could avoid computing & encoding values we do not need.
|
||||
- [ ] GRDB 6: encoding & statement binding errors for database values (conversion to DatabaseValue, statement binding, etc)
|
||||
- [ ] Prevent Date > 9999 from being encoded
|
||||
|
||||
@@ -20,7 +20,7 @@ private class RecordWithNilPrimaryKey : Record {
|
||||
"records"
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["id"] = nil
|
||||
}
|
||||
}
|
||||
@@ -30,7 +30,7 @@ private class RecordForTableWithoutPrimaryKey : Record {
|
||||
"records"
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["name"] = "foo"
|
||||
}
|
||||
}
|
||||
@@ -40,7 +40,7 @@ private class RecordForTableWithMultipleColumnsPrimaryKey : Record {
|
||||
"records"
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["name"] = "foo"
|
||||
}
|
||||
}
|
||||
@@ -50,7 +50,7 @@ private class RecordWithRowIDPrimaryKeyNotExposedInPersistentDictionary : Record
|
||||
"records"
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["name"] = "foo"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ private class UserRecord : Record {
|
||||
override class var databaseTableName: String { super.databaseTableName }
|
||||
override class var persistenceConflictPolicy: PersistenceConflictPolicy { super.persistenceConflictPolicy }
|
||||
override class var databaseSelection: [any SQLSelectable] { super.databaseSelection }
|
||||
override func encode(to container: inout PersistenceContainer) { super.encode(to: &container) }
|
||||
override func encode(to container: inout PersistenceContainer) throws { try super.encode(to: &container) }
|
||||
|
||||
override func willInsert(_ db: Database) throws {
|
||||
try super.willInsert(db)
|
||||
|
||||
@@ -13,20 +13,20 @@ private struct ConvertToSnakeCaseRecord: PersistableRecord, Encodable {
|
||||
}
|
||||
|
||||
class DatabaseColumnEncodingStrategyTests: GRDBTestCase {
|
||||
func testUseDefaultKeys() {
|
||||
func testUseDefaultKeys() throws {
|
||||
let record = UseDefaultKeysRecord(recordID: "test")
|
||||
|
||||
var container = PersistenceContainer()
|
||||
record.encode(to: &container)
|
||||
try record.encode(to: &container)
|
||||
XCTAssertNil(container["record_id"]?.databaseValue.storage)
|
||||
XCTAssertEqual(container["recordID"]?.databaseValue.storage, "test".databaseValue.storage)
|
||||
}
|
||||
|
||||
func testConvertToSnakeCase() {
|
||||
func testConvertToSnakeCase() throws {
|
||||
let record = ConvertToSnakeCaseRecord(recordID: "test")
|
||||
|
||||
var container = PersistenceContainer()
|
||||
record.encode(to: &container)
|
||||
try record.encode(to: &container)
|
||||
XCTAssertNil(container["recordID"]?.databaseValue.storage)
|
||||
XCTAssertEqual(container["record_id"]?.databaseValue.storage, "test".databaseValue.storage)
|
||||
}
|
||||
|
||||
@@ -76,9 +76,10 @@ class DatabaseDateEncodingStrategyTests: GRDBTestCase {
|
||||
private func test<T: EncodableRecord>(
|
||||
record: T,
|
||||
expectedStorage: DatabaseValue.Storage)
|
||||
throws
|
||||
{
|
||||
var container = PersistenceContainer()
|
||||
record.encode(to: &container)
|
||||
try record.encode(to: &container)
|
||||
if let dbValue = container["date"]?.databaseValue {
|
||||
XCTAssertEqual(dbValue.storage, expectedStorage)
|
||||
} else {
|
||||
@@ -86,88 +87,88 @@ class DatabaseDateEncodingStrategyTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
private func test<Strategy: StrategyProvider>(strategy: Strategy.Type, encodesDate date: Date, as value: DatabaseValueConvertible) {
|
||||
test(record: RecordWithDate<Strategy>(date: date), expectedStorage: value.databaseValue.storage)
|
||||
test(record: RecordWithOptionalDate<Strategy>(date: date), expectedStorage: value.databaseValue.storage)
|
||||
private func test<Strategy: StrategyProvider>(strategy: Strategy.Type, encodesDate date: Date, as value: DatabaseValueConvertible) throws {
|
||||
try test(record: RecordWithDate<Strategy>(date: date), expectedStorage: value.databaseValue.storage)
|
||||
try test(record: RecordWithOptionalDate<Strategy>(date: date), expectedStorage: value.databaseValue.storage)
|
||||
}
|
||||
|
||||
private func testNullEncoding<Strategy: StrategyProvider>(strategy: Strategy.Type) {
|
||||
test(record: RecordWithOptionalDate<Strategy>(date: nil), expectedStorage: .null)
|
||||
private func testNullEncoding<Strategy: StrategyProvider>(strategy: Strategy.Type) throws {
|
||||
try test(record: RecordWithOptionalDate<Strategy>(date: nil), expectedStorage: .null)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - deferredToDate
|
||||
|
||||
extension DatabaseDateEncodingStrategyTests {
|
||||
func testDeferredToDate() {
|
||||
testNullEncoding(strategy: StrategyDeferredToDate.self)
|
||||
func testDeferredToDate() throws {
|
||||
try testNullEncoding(strategy: StrategyDeferredToDate.self)
|
||||
|
||||
for (date, value) in zip(testedDates, [
|
||||
"1969-12-20 13:39:05.679",
|
||||
"1970-01-02 10:17:36.789",
|
||||
"2001-01-01 00:00:00.000",
|
||||
"2001-01-02 10:17:36.789",
|
||||
]) { test(strategy: StrategyDeferredToDate.self, encodesDate: date, as: value) }
|
||||
]) { try test(strategy: StrategyDeferredToDate.self, encodesDate: date, as: value) }
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - timeIntervalSinceReferenceDate
|
||||
|
||||
extension DatabaseDateEncodingStrategyTests {
|
||||
func testTimeIntervalSinceReferenceDate() {
|
||||
testNullEncoding(strategy: StrategyTimeIntervalSinceReferenceDate.self)
|
||||
func testTimeIntervalSinceReferenceDate() throws {
|
||||
try testNullEncoding(strategy: StrategyTimeIntervalSinceReferenceDate.self)
|
||||
|
||||
for (date, value) in zip(testedDates, [
|
||||
-979294854.321,
|
||||
-978183743.211,
|
||||
0.0,
|
||||
123456.789,
|
||||
]) { test(strategy: StrategyTimeIntervalSinceReferenceDate.self, encodesDate: date, as: value) }
|
||||
]) { try test(strategy: StrategyTimeIntervalSinceReferenceDate.self, encodesDate: date, as: value) }
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - timeIntervalSince1970
|
||||
|
||||
extension DatabaseDateEncodingStrategyTests {
|
||||
func testTimeIntervalSince1970() {
|
||||
testNullEncoding(strategy: StrategyTimeIntervalSince1970.self)
|
||||
func testTimeIntervalSince1970() throws {
|
||||
try testNullEncoding(strategy: StrategyTimeIntervalSince1970.self)
|
||||
|
||||
for (date, value) in zip(testedDates, [
|
||||
-987654.32099997997,
|
||||
123456.78900003433,
|
||||
978307200.0,
|
||||
978430656.789,
|
||||
]) { test(strategy: StrategyTimeIntervalSince1970.self, encodesDate: date, as: value) }
|
||||
]) { try test(strategy: StrategyTimeIntervalSince1970.self, encodesDate: date, as: value) }
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - secondsSince1970
|
||||
|
||||
extension DatabaseDateEncodingStrategyTests {
|
||||
func testSecondsSince1970() {
|
||||
testNullEncoding(strategy: StrategySecondsSince1970.self)
|
||||
func testSecondsSince1970() throws {
|
||||
try testNullEncoding(strategy: StrategySecondsSince1970.self)
|
||||
|
||||
for (date, value) in zip(testedDates, [
|
||||
-987655,
|
||||
123456,
|
||||
978307200,
|
||||
978430656,
|
||||
]) { test(strategy: StrategySecondsSince1970.self, encodesDate: date, as: value) }
|
||||
]) { try test(strategy: StrategySecondsSince1970.self, encodesDate: date, as: value) }
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - millisecondsSince1970
|
||||
|
||||
extension DatabaseDateEncodingStrategyTests {
|
||||
func testMillisecondsSince1970() {
|
||||
testNullEncoding(strategy: StrategyMillisecondsSince1970.self)
|
||||
func testMillisecondsSince1970() throws {
|
||||
try testNullEncoding(strategy: StrategyMillisecondsSince1970.self)
|
||||
|
||||
for (date, value) in zip(testedDates, [
|
||||
-987654321,
|
||||
123456789,
|
||||
978307200000,
|
||||
978430656789,
|
||||
] as [Int64]) { test(strategy: StrategyMillisecondsSince1970.self, encodesDate: date, as: value) }
|
||||
] as [Int64]) { try test(strategy: StrategyMillisecondsSince1970.self, encodesDate: date, as: value) }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -175,44 +176,44 @@ extension DatabaseDateEncodingStrategyTests {
|
||||
|
||||
extension DatabaseDateEncodingStrategyTests {
|
||||
func testIso8601() throws {
|
||||
testNullEncoding(strategy: StrategyIso8601.self)
|
||||
try testNullEncoding(strategy: StrategyIso8601.self)
|
||||
|
||||
for (date, value) in zip(testedDates, [
|
||||
"1969-12-20T13:39:05Z",
|
||||
"1970-01-02T10:17:36Z",
|
||||
"2001-01-01T00:00:00Z",
|
||||
"2001-01-02T10:17:36Z",
|
||||
]) { test(strategy: StrategyIso8601.self, encodesDate: date, as: value) }
|
||||
]) { try test(strategy: StrategyIso8601.self, encodesDate: date, as: value) }
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - formatted(DateFormatter)
|
||||
|
||||
extension DatabaseDateEncodingStrategyTests {
|
||||
func testFormatted() {
|
||||
testNullEncoding(strategy: StrategyFormatted.self)
|
||||
func testFormatted() throws {
|
||||
try testNullEncoding(strategy: StrategyFormatted.self)
|
||||
|
||||
for (date, value) in zip(testedDates, [
|
||||
"Saturday, December 20, 1969 at 1:39:05 PM",
|
||||
"Friday, January 2, 1970 at 10:17:36 AM",
|
||||
"Monday, January 1, 2001 at 12:00:00 AM",
|
||||
"Tuesday, January 2, 2001 at 10:17:36 AM",
|
||||
]) { test(strategy: StrategyFormatted.self, encodesDate: date, as: value) }
|
||||
]) { try test(strategy: StrategyFormatted.self, encodesDate: date, as: value) }
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - custom((Date) -> DatabaseValueConvertible?)
|
||||
|
||||
extension DatabaseDateEncodingStrategyTests {
|
||||
func testCustom() {
|
||||
testNullEncoding(strategy: StrategyCustom.self)
|
||||
func testCustom() throws {
|
||||
try testNullEncoding(strategy: StrategyCustom.self)
|
||||
|
||||
for (date, value) in zip(testedDates, [
|
||||
"custom",
|
||||
"custom",
|
||||
"custom",
|
||||
"custom",
|
||||
]) { test(strategy: StrategyCustom.self, encodesDate: date, as: value) }
|
||||
]) { try test(strategy: StrategyCustom.self, encodesDate: date, as: value) }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -42,9 +42,10 @@ class DatabaseUUIDEncodingStrategyTests: GRDBTestCase {
|
||||
private func test<T: EncodableRecord>(
|
||||
record: T,
|
||||
expectedStorage: DatabaseValue.Storage)
|
||||
throws
|
||||
{
|
||||
var container = PersistenceContainer()
|
||||
record.encode(to: &container)
|
||||
try record.encode(to: &container)
|
||||
if let dbValue = container["uuid"]?.databaseValue {
|
||||
XCTAssertEqual(dbValue.storage, expectedStorage)
|
||||
} else {
|
||||
@@ -52,23 +53,23 @@ class DatabaseUUIDEncodingStrategyTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
private func test<Strategy: StrategyProvider>(strategy: Strategy.Type, encodesUUID uuid: UUID, as value: DatabaseValueConvertible) {
|
||||
test(record: RecordWithUUID<Strategy>(uuid: uuid), expectedStorage: value.databaseValue.storage)
|
||||
test(record: RecordWithOptionalUUID<Strategy>(uuid: uuid), expectedStorage: value.databaseValue.storage)
|
||||
private func test<Strategy: StrategyProvider>(strategy: Strategy.Type, encodesUUID uuid: UUID, as value: DatabaseValueConvertible) throws {
|
||||
try test(record: RecordWithUUID<Strategy>(uuid: uuid), expectedStorage: value.databaseValue.storage)
|
||||
try test(record: RecordWithOptionalUUID<Strategy>(uuid: uuid), expectedStorage: value.databaseValue.storage)
|
||||
}
|
||||
|
||||
private func testNullEncoding<Strategy: StrategyProvider>(strategy: Strategy.Type) {
|
||||
test(record: RecordWithOptionalUUID<Strategy>(uuid: nil), expectedStorage: .null)
|
||||
private func testNullEncoding<Strategy: StrategyProvider>(strategy: Strategy.Type) throws {
|
||||
try test(record: RecordWithOptionalUUID<Strategy>(uuid: nil), expectedStorage: .null)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - deferredToUUID
|
||||
|
||||
extension DatabaseUUIDEncodingStrategyTests {
|
||||
func testDeferredToUUID() {
|
||||
testNullEncoding(strategy: StrategyDeferredToUUID.self)
|
||||
func testDeferredToUUID() throws {
|
||||
try testNullEncoding(strategy: StrategyDeferredToUUID.self)
|
||||
|
||||
test(
|
||||
try test(
|
||||
strategy: StrategyDeferredToUUID.self,
|
||||
encodesUUID: UUID(uuidString: "61626364-6566-6768-696A-6B6C6D6E6F70")!,
|
||||
as: "abcdefghijklmnop".data(using: .utf8)!)
|
||||
@@ -78,21 +79,21 @@ extension DatabaseUUIDEncodingStrategyTests {
|
||||
// MARK: - UppercaseString
|
||||
|
||||
extension DatabaseUUIDEncodingStrategyTests {
|
||||
func testUppercaseString() {
|
||||
testNullEncoding(strategy: StrategyUppercaseString.self)
|
||||
func testUppercaseString() throws {
|
||||
try testNullEncoding(strategy: StrategyUppercaseString.self)
|
||||
|
||||
test(
|
||||
try test(
|
||||
strategy: StrategyUppercaseString.self,
|
||||
encodesUUID: UUID(uuidString: "61626364-6566-6768-696A-6B6C6D6E6F70")!,
|
||||
as: "61626364-6566-6768-696A-6B6C6D6E6F70")
|
||||
|
||||
test(
|
||||
try test(
|
||||
strategy: StrategyUppercaseString.self,
|
||||
encodesUUID: UUID(uuidString: "56e7d8d3-e9e4-48b6-968e-8d102833af00")!,
|
||||
as: "56E7D8D3-E9E4-48B6-968E-8D102833AF00")
|
||||
|
||||
let uuid = UUID()
|
||||
test(
|
||||
try test(
|
||||
strategy: StrategyUppercaseString.self,
|
||||
encodesUUID: uuid,
|
||||
as: uuid.uuidString.uppercased()) // Assert stable casing
|
||||
@@ -102,21 +103,21 @@ extension DatabaseUUIDEncodingStrategyTests {
|
||||
// MARK: - LowercaseString
|
||||
|
||||
extension DatabaseUUIDEncodingStrategyTests {
|
||||
func testLowercaseString() {
|
||||
testNullEncoding(strategy: StrategyLowercaseString.self)
|
||||
func testLowercaseString() throws {
|
||||
try testNullEncoding(strategy: StrategyLowercaseString.self)
|
||||
|
||||
test(
|
||||
try test(
|
||||
strategy: StrategyLowercaseString.self,
|
||||
encodesUUID: UUID(uuidString: "61626364-6566-6768-696A-6B6C6D6E6F70")!,
|
||||
as: "61626364-6566-6768-696a-6b6c6d6e6f70")
|
||||
|
||||
test(
|
||||
try test(
|
||||
strategy: StrategyLowercaseString.self,
|
||||
encodesUUID: UUID(uuidString: "56e7d8d3-e9e4-48b6-968e-8d102833af00")!,
|
||||
as: "56e7d8d3-e9e4-48b6-968e-8d102833af00")
|
||||
|
||||
let uuid = UUID()
|
||||
test(
|
||||
try test(
|
||||
strategy: StrategyLowercaseString.self,
|
||||
encodesUUID: uuid,
|
||||
as: uuid.uuidString.lowercased()) // Assert stable casing
|
||||
|
||||
@@ -133,8 +133,8 @@ class GRDBTestCase: XCTestCase {
|
||||
XCTAssertTrue(sqlQueries.contains(sql), "Did not execute \(sql)", file: file, line: line)
|
||||
}
|
||||
|
||||
func assert(_ record: some EncodableRecord, isEncodedIn row: Row, file: StaticString = #file, line: UInt = #line) {
|
||||
let recordDict = record.databaseDictionary
|
||||
func assert(_ record: some EncodableRecord, isEncodedIn row: Row, file: StaticString = #file, line: UInt = #line) throws {
|
||||
let recordDict = try record.databaseDictionary
|
||||
let rowDict = Dictionary(row, uniquingKeysWith: { (left, _) in left })
|
||||
XCTAssertEqual(recordDict, rowDict, file: file, line: line)
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
}
|
||||
let record = DegenerateRecord()
|
||||
XCTAssertTrue(record.databaseEquals(record))
|
||||
XCTAssertTrue(record.databaseChanges(from: record).isEmpty)
|
||||
try XCTAssertTrue(record.databaseChanges(from: record).isEmpty)
|
||||
|
||||
let dbQueue = try makeDatabaseQueue()
|
||||
try dbQueue.inDatabase { db in
|
||||
@@ -65,7 +65,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
do {
|
||||
let player = Player(id: nil, name: nil, score: nil, creationDate: nil)
|
||||
XCTAssertTrue(player.databaseEquals(player))
|
||||
XCTAssertTrue(player.databaseChanges(from: player).isEmpty)
|
||||
try XCTAssertTrue(player.databaseChanges(from: player).isEmpty)
|
||||
|
||||
let dbQueue = try makeDatabaseQueue()
|
||||
try dbQueue.inDatabase { db in
|
||||
@@ -77,7 +77,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
do {
|
||||
let player = Player(id: 1, name: "foo", score: 42, creationDate: Date())
|
||||
XCTAssertTrue(player.databaseEquals(player))
|
||||
XCTAssertTrue(player.databaseChanges(from: player).isEmpty)
|
||||
try XCTAssertTrue(player.databaseChanges(from: player).isEmpty)
|
||||
|
||||
let dbQueue = try makeDatabaseQueue()
|
||||
try dbQueue.inDatabase { db in
|
||||
@@ -101,7 +101,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
newPlayer.name = "Bobby"
|
||||
|
||||
XCTAssertFalse(newPlayer.databaseEquals(player))
|
||||
let changes = newPlayer.databaseChanges(from: player)
|
||||
let changes = try newPlayer.databaseChanges(from: player)
|
||||
XCTAssertEqual(changes.count, 1)
|
||||
XCTAssertEqual(changes["name"]!, "Arthur".databaseValue)
|
||||
|
||||
@@ -118,7 +118,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
newPlayer.name = nil
|
||||
|
||||
XCTAssertFalse(newPlayer.databaseEquals(player))
|
||||
let changes = newPlayer.databaseChanges(from: player)
|
||||
let changes = try newPlayer.databaseChanges(from: player)
|
||||
XCTAssertEqual(changes.count, 1)
|
||||
XCTAssertEqual(changes["name"]!, "Arthur".databaseValue)
|
||||
|
||||
@@ -135,7 +135,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
newPlayer.score = 41
|
||||
|
||||
XCTAssertFalse(newPlayer.databaseEquals(player))
|
||||
let changes = newPlayer.databaseChanges(from: player)
|
||||
let changes = try newPlayer.databaseChanges(from: player)
|
||||
XCTAssertEqual(changes.count, 1)
|
||||
XCTAssertEqual(changes["score"]!, .null)
|
||||
|
||||
@@ -153,7 +153,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
newPlayer.score = 41
|
||||
|
||||
XCTAssertFalse(newPlayer.databaseEquals(player))
|
||||
let changes = newPlayer.databaseChanges(from: player)
|
||||
let changes = try newPlayer.databaseChanges(from: player)
|
||||
XCTAssertEqual(changes.count, 2)
|
||||
XCTAssertEqual(changes["name"]!, "Arthur".databaseValue)
|
||||
XCTAssertEqual(changes["score"]!, .null)
|
||||
@@ -183,7 +183,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
var oldPlayer = NarrowPlayer(ID: 1, NAME: "Arthur")
|
||||
let newPlayer = Player(id: 1, name: "Arthur", score: 41, creationDate: nil)
|
||||
|
||||
let changes = newPlayer.databaseChanges(from: oldPlayer)
|
||||
let changes = try newPlayer.databaseChanges(from: oldPlayer)
|
||||
XCTAssertEqual(changes.count, 1)
|
||||
XCTAssertEqual(changes["score"]!, .null)
|
||||
|
||||
@@ -201,7 +201,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
var oldPlayer = NarrowPlayer(ID: 1, NAME: "Bobby")
|
||||
let newPlayer = Player(id: 1, name: "Arthur", score: 42, creationDate: nil)
|
||||
|
||||
let changes = newPlayer.databaseChanges(from: oldPlayer)
|
||||
let changes = try newPlayer.databaseChanges(from: oldPlayer)
|
||||
XCTAssertEqual(changes.count, 2)
|
||||
XCTAssertEqual(changes["name"]!, "Bobby".databaseValue)
|
||||
XCTAssertEqual(changes["score"]!, .null)
|
||||
@@ -222,7 +222,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
let oldPlayer = Player(id: 1, name: "Arthur", score: 42, creationDate: nil)
|
||||
let newPlayer = NarrowPlayer(ID: 1, NAME: "Arthur")
|
||||
|
||||
let changes = newPlayer.databaseChanges(from: oldPlayer)
|
||||
let changes = try newPlayer.databaseChanges(from: oldPlayer)
|
||||
XCTAssertTrue(changes.isEmpty)
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
@@ -237,7 +237,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
let oldPlayer = Player(id: 1, name: "Arthur", score: nil, creationDate: nil)
|
||||
let newPlayer = NarrowPlayer(ID: 1, NAME: "Arthur")
|
||||
|
||||
let changes = newPlayer.databaseChanges(from: oldPlayer)
|
||||
let changes = try newPlayer.databaseChanges(from: oldPlayer)
|
||||
XCTAssertTrue(changes.isEmpty)
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
@@ -252,7 +252,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
var oldPlayer = Player(id: 1, name: "Arthur", score: nil, creationDate: nil)
|
||||
let newPlayer = NarrowPlayer(ID: 1, NAME: "Bobby")
|
||||
|
||||
let changes = newPlayer.databaseChanges(from: oldPlayer)
|
||||
let changes = try newPlayer.databaseChanges(from: oldPlayer)
|
||||
XCTAssertEqual(changes.count, 1)
|
||||
XCTAssertEqual(changes["NAME"]!, "Arthur".databaseValue)
|
||||
|
||||
@@ -295,7 +295,7 @@ class MutablePersistableRecordChangesTests: GRDBTestCase {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container[Columns.id] = id
|
||||
container[Columns.firstName] = firstName
|
||||
container[Columns.lastName] = lastName
|
||||
|
||||
@@ -21,7 +21,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
}
|
||||
|
||||
var value = Struct(value: "foo")
|
||||
assert(value, isEncodedIn: ["value": "foo"])
|
||||
try assert(value, isEncodedIn: ["value": "foo"])
|
||||
|
||||
try value.insert(db)
|
||||
let string = try String.fetchOne(db, sql: "SELECT value FROM t1")!
|
||||
@@ -51,7 +51,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
}
|
||||
|
||||
var value = Struct(value: "foo")
|
||||
assert(value, isEncodedIn: ["someColumn": "foo (Encodable)"])
|
||||
try assert(value, isEncodedIn: ["someColumn": "foo (Encodable)"])
|
||||
|
||||
try value.insert(db)
|
||||
let string = try String.fetchOne(db, sql: "SELECT someColumn FROM t1")!
|
||||
@@ -76,7 +76,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
}
|
||||
|
||||
var value = Struct(value: "foo")
|
||||
assert(value, isEncodedIn: ["value": "foo (MutablePersistableRecord)"])
|
||||
try assert(value, isEncodedIn: ["value": "foo (MutablePersistableRecord)"])
|
||||
|
||||
try value.insert(db)
|
||||
let string = try String.fetchOne(db, sql: "SELECT value FROM t1")!
|
||||
@@ -106,7 +106,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
var value = Struct(int64: 123, optionalInt64: 456)
|
||||
assert(value, isEncodedIn: ["int64": 123, "optionalInt64": 456])
|
||||
try assert(value, isEncodedIn: ["int64": 123, "optionalInt64": 456])
|
||||
|
||||
try value.insert(db)
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM t1")!
|
||||
@@ -116,7 +116,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
var value = Struct(int64: 123, optionalInt64: nil)
|
||||
assert(value, isEncodedIn: ["int64": 123, "optionalInt64": nil])
|
||||
try assert(value, isEncodedIn: ["int64": 123, "optionalInt64": nil])
|
||||
|
||||
try value.insert(db)
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM t1")!
|
||||
@@ -151,7 +151,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
var value = Struct(value: Value(string: "foo"), optionalValue: Value(string: "bar"))
|
||||
assert(value, isEncodedIn: ["value": "foo", "optionalValue": "bar"])
|
||||
try assert(value, isEncodedIn: ["value": "foo", "optionalValue": "bar"])
|
||||
|
||||
try value.insert(db)
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM t1")!
|
||||
@@ -161,7 +161,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
var value = Struct(value: Value(string: "foo"), optionalValue: nil)
|
||||
assert(value, isEncodedIn: ["value": "foo", "optionalValue": nil])
|
||||
try assert(value, isEncodedIn: ["value": "foo", "optionalValue": nil])
|
||||
|
||||
try value.insert(db)
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM t1")!
|
||||
@@ -205,7 +205,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
var value = Struct(value: Value(nestedValue: NestedValue(string: "foo")), optionalValue: Value(nestedValue: NestedValue(string: "bar")))
|
||||
assert(value, isEncodedIn: ["value": "foo", "optionalValue": "bar"])
|
||||
try assert(value, isEncodedIn: ["value": "foo", "optionalValue": "bar"])
|
||||
|
||||
try value.insert(db)
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM t1")!
|
||||
@@ -215,7 +215,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
var value = Struct(value: Value(nestedValue: NestedValue(string: "foo")), optionalValue: nil)
|
||||
assert(value, isEncodedIn: ["value": "foo", "optionalValue": nil])
|
||||
try assert(value, isEncodedIn: ["value": "foo", "optionalValue": nil])
|
||||
|
||||
try value.insert(db)
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM t1")!
|
||||
@@ -250,7 +250,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
var value = Struct(value: .foo, optionalValue: .bar)
|
||||
assert(value, isEncodedIn: ["value": "foo", "optionalValue": "bar"])
|
||||
try assert(value, isEncodedIn: ["value": "foo", "optionalValue": "bar"])
|
||||
|
||||
try value.insert(db)
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM t1")!
|
||||
@@ -260,7 +260,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
var value = Struct(value: .foo, optionalValue: nil)
|
||||
assert(value, isEncodedIn: ["value": "foo", "optionalValue": nil])
|
||||
try assert(value, isEncodedIn: ["value": "foo", "optionalValue": nil])
|
||||
|
||||
try value.insert(db)
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM t1")!
|
||||
@@ -313,7 +313,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
var value = Struct(value: Value(string: "foo"), optionalValue: Value(string: "bar"))
|
||||
assert(value, isEncodedIn: ["value": "foo (DatabaseValueConvertible)", "optionalValue": "bar (DatabaseValueConvertible)"])
|
||||
try assert(value, isEncodedIn: ["value": "foo (DatabaseValueConvertible)", "optionalValue": "bar (DatabaseValueConvertible)"])
|
||||
|
||||
try value.insert(db)
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM t1")!
|
||||
@@ -323,7 +323,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
|
||||
try dbQueue.inTransaction { db in
|
||||
var value = Struct(value: Value(string: "foo"), optionalValue: nil)
|
||||
assert(value, isEncodedIn: ["value": "foo (DatabaseValueConvertible)", "optionalValue": nil])
|
||||
try assert(value, isEncodedIn: ["value": "foo (DatabaseValueConvertible)", "optionalValue": nil])
|
||||
|
||||
try value.insert(db)
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM t1")!
|
||||
@@ -377,7 +377,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
}
|
||||
|
||||
let value = StructWithURL(url: URL(string: "https://github.com")!)
|
||||
assert(value, isEncodedIn: ["url": value.url])
|
||||
try assert(value, isEncodedIn: ["url": value.url])
|
||||
|
||||
try value.insert(db)
|
||||
let dbValue = try DatabaseValue.fetchOne(db, sql: "SELECT url FROM t1")!
|
||||
@@ -400,7 +400,7 @@ extension MutablePersistableRecordEncodableTests {
|
||||
}
|
||||
|
||||
let value = StructWithUUID(uuid: UUID())
|
||||
assert(value, isEncodedIn: ["uuid": value.uuid])
|
||||
try assert(value, isEncodedIn: ["uuid": value.uuid])
|
||||
|
||||
try value.insert(db)
|
||||
let dbValue = try DatabaseValue.fetchOne(db, sql: "SELECT uuid FROM t1")!
|
||||
|
||||
@@ -533,9 +533,9 @@ class MutablePersistableRecordTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
func testMutablePersistableRecordPersonDatabaseDictionary() {
|
||||
func testMutablePersistableRecordPersonDatabaseDictionary() throws {
|
||||
let person = MutablePersistableRecordPerson(id: nil, name: "Arthur", age: 24)
|
||||
let dict = person.databaseDictionary
|
||||
let dict = try person.databaseDictionary
|
||||
XCTAssertEqual(dict, ["iD": DatabaseValue.null, "NAme": "Arthur".databaseValue, "aGe": 24.databaseValue])
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ private class Reader : Record {
|
||||
"readers"
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["id"] = id
|
||||
container["name"] = name
|
||||
container["age"] = age
|
||||
|
||||
@@ -39,7 +39,7 @@ private class Person : Record {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["id"] = id
|
||||
container["name"] = name
|
||||
container["age"] = age
|
||||
@@ -74,7 +74,7 @@ private class IntegerPropertyOnRealAffinityColumn : Record {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["value"] = value
|
||||
}
|
||||
}
|
||||
@@ -107,7 +107,7 @@ private class PersonWithModifiedCaseColumns: Record {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["ID"] = id
|
||||
container["NAME"] = name
|
||||
container["AGE"] = age
|
||||
@@ -376,9 +376,9 @@ class RecordEditedTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
func testChangesAfterInit() {
|
||||
func testChangesAfterInit() throws {
|
||||
let person = Person(name: "Arthur", age: 41)
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 4)
|
||||
for (column, old) in changes {
|
||||
switch column {
|
||||
@@ -398,7 +398,7 @@ class RecordEditedTests: GRDBTestCase {
|
||||
|
||||
func testChangesAfterInitFromRow() throws {
|
||||
let person = try Person(row: Row(["name": "Arthur", "age": 41]))
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 4)
|
||||
for (column, old) in changes {
|
||||
switch column {
|
||||
@@ -426,12 +426,12 @@ class RecordEditedTests: GRDBTestCase {
|
||||
try Person(name: "Arthur", age: 41).insert(db)
|
||||
do {
|
||||
let person = try Person.fetchOne(db, sql: "SELECT * FROM persons")!
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 0)
|
||||
}
|
||||
do {
|
||||
let persons = try Person.fetchAll(db, sql: "SELECT * FROM persons")
|
||||
let changes = persons[0].databaseChanges
|
||||
let changes = try persons[0].databaseChanges
|
||||
XCTAssertEqual(changes.count, 0)
|
||||
}
|
||||
do {
|
||||
@@ -441,14 +441,14 @@ class RecordEditedTests: GRDBTestCase {
|
||||
}
|
||||
do {
|
||||
let person = try Person.fetchOne(db, sql: "SELECT * FROM persons", adapter: SuffixRowAdapter(fromIndex: 0))!
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 0)
|
||||
}
|
||||
}
|
||||
try dbQueue.inDatabase { db in
|
||||
try PersonWithModifiedCaseColumns(name: "Arthur", age: 41).insert(db)
|
||||
let person = try PersonWithModifiedCaseColumns.fetchOne(db, sql: "SELECT * FROM persons")!
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 0)
|
||||
}
|
||||
}
|
||||
@@ -462,7 +462,7 @@ class RecordEditedTests: GRDBTestCase {
|
||||
try dbQueue.inDatabase { db in
|
||||
try Person(name: "Arthur", age: 41).insert(db)
|
||||
let person = try Person.fetchOne(db, sql: "SELECT name FROM persons")!
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 3)
|
||||
for (column, old) in changes {
|
||||
switch column {
|
||||
@@ -480,7 +480,7 @@ class RecordEditedTests: GRDBTestCase {
|
||||
try dbQueue.inDatabase { db in
|
||||
try PersonWithModifiedCaseColumns(name: "Arthur", age: 41).insert(db)
|
||||
let person = try PersonWithModifiedCaseColumns.fetchOne(db, sql: "SELECT name FROM persons")!
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 3)
|
||||
for (column, old) in changes {
|
||||
switch column {
|
||||
@@ -503,13 +503,13 @@ class RecordEditedTests: GRDBTestCase {
|
||||
try dbQueue.inDatabase { db in
|
||||
let person = Person(name: "Arthur", age: 41)
|
||||
try person.insert(db)
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 0)
|
||||
}
|
||||
try dbQueue.inDatabase { db in
|
||||
let person = PersonWithModifiedCaseColumns(name: "Arthur", age: 41)
|
||||
try person.insert(db)
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 0)
|
||||
}
|
||||
}
|
||||
@@ -525,7 +525,7 @@ class RecordEditedTests: GRDBTestCase {
|
||||
person.name = "Bobby" // non-nil -> non-nil
|
||||
person.age = 41 // nil -> non-nil
|
||||
person.creationDate = nil // non-nil -> nil
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 3)
|
||||
for (column, old) in changes {
|
||||
switch column {
|
||||
@@ -547,7 +547,7 @@ class RecordEditedTests: GRDBTestCase {
|
||||
person.name = "Bobby" // non-nil -> non-nil
|
||||
person.age = 41 // nil -> non-nil
|
||||
person.creationDate = nil // non-nil -> nil
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 3)
|
||||
for (column, old) in changes {
|
||||
switch column {
|
||||
@@ -572,14 +572,16 @@ class RecordEditedTests: GRDBTestCase {
|
||||
try person.insert(db)
|
||||
person.name = "Bobby"
|
||||
try person.update(db)
|
||||
XCTAssertEqual(person.databaseChanges.count, 0)
|
||||
XCTAssertFalse(person.hasDatabaseChanges)
|
||||
try XCTAssert(person.databaseChanges.isEmpty)
|
||||
}
|
||||
try dbQueue.inDatabase { db in
|
||||
let person = PersonWithModifiedCaseColumns(name: "Arthur", age: 41)
|
||||
try person.insert(db)
|
||||
person.name = "Bobby"
|
||||
try person.update(db)
|
||||
XCTAssertEqual(person.databaseChanges.count, 0)
|
||||
XCTAssertFalse(person.hasDatabaseChanges)
|
||||
try XCTAssert(person.databaseChanges.isEmpty)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -589,10 +591,11 @@ class RecordEditedTests: GRDBTestCase {
|
||||
try dbQueue.inDatabase { db in
|
||||
let person = Person(name: "Arthur", age: 41)
|
||||
try person.save(db)
|
||||
XCTAssertEqual(person.databaseChanges.count, 0)
|
||||
|
||||
XCTAssertFalse(person.hasDatabaseChanges)
|
||||
try XCTAssert(person.databaseChanges.isEmpty)
|
||||
|
||||
person.name = "Bobby"
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 1)
|
||||
for (column, old) in changes {
|
||||
switch column {
|
||||
@@ -603,15 +606,17 @@ class RecordEditedTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
try person.save(db)
|
||||
XCTAssertEqual(person.databaseChanges.count, 0)
|
||||
XCTAssertFalse(person.hasDatabaseChanges)
|
||||
try XCTAssert(person.databaseChanges.isEmpty)
|
||||
}
|
||||
try dbQueue.inDatabase { db in
|
||||
let person = PersonWithModifiedCaseColumns(name: "Arthur", age: 41)
|
||||
try person.save(db)
|
||||
XCTAssertEqual(person.databaseChanges.count, 0)
|
||||
|
||||
XCTAssertFalse(person.hasDatabaseChanges)
|
||||
try XCTAssert(person.databaseChanges.isEmpty)
|
||||
|
||||
person.name = "Bobby"
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 1)
|
||||
for (column, old) in changes {
|
||||
switch column {
|
||||
@@ -622,7 +627,8 @@ class RecordEditedTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
try person.save(db)
|
||||
XCTAssertEqual(person.databaseChanges.count, 0)
|
||||
XCTAssertFalse(person.hasDatabaseChanges)
|
||||
try XCTAssert(person.databaseChanges.isEmpty)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -633,7 +639,7 @@ class RecordEditedTests: GRDBTestCase {
|
||||
let person = Person(name: "Arthur", age: 41)
|
||||
try person.insert(db)
|
||||
person.id = person.id + 1
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 1)
|
||||
for (column, old) in changes {
|
||||
switch column {
|
||||
@@ -648,7 +654,7 @@ class RecordEditedTests: GRDBTestCase {
|
||||
let person = PersonWithModifiedCaseColumns(name: "Arthur", age: 41)
|
||||
try person.insert(db)
|
||||
person.id = person.id + 1
|
||||
let changes = person.databaseChanges
|
||||
let changes = try person.databaseChanges
|
||||
XCTAssertEqual(changes.count, 1)
|
||||
for (column, old) in changes {
|
||||
switch column {
|
||||
@@ -688,7 +694,7 @@ class RecordEditedTests: GRDBTestCase {
|
||||
|
||||
// Update single column
|
||||
person.age = 42
|
||||
XCTAssertEqual(Set(person.databaseChanges.keys), ["age"])
|
||||
try XCTAssertEqual(Set(person.databaseChanges.keys), ["age"])
|
||||
try XCTAssertTrue(person.updateChanges(db))
|
||||
XCTAssertEqual(db.totalChangesCount, initialChangesCount + 1)
|
||||
XCTAssertEqual(lastSQLQuery, "UPDATE \"persons\" SET \"age\"=42 WHERE \"id\"=1")
|
||||
@@ -696,7 +702,7 @@ class RecordEditedTests: GRDBTestCase {
|
||||
// Update two columns
|
||||
person.name = "Barbara"
|
||||
person.age = 43
|
||||
XCTAssertEqual(Set(person.databaseChanges.keys), ["age", "name"])
|
||||
try XCTAssertEqual(Set(person.databaseChanges.keys), ["age", "name"])
|
||||
try XCTAssertTrue(person.updateChanges(db))
|
||||
XCTAssertEqual(db.totalChangesCount, initialChangesCount + 2)
|
||||
let fetchedPerson = try Person.fetchOne(db, key: person.id)
|
||||
|
||||
@@ -28,7 +28,7 @@ private class MinimalNonOptionalPrimaryKeySingle: Record, Hashable {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["id"] = id
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ class RecordMinimalNonOptionalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ class RecordMinimalNonOptionalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -119,7 +119,7 @@ class RecordMinimalNonOptionalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.update(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ class RecordMinimalNonOptionalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,7 +162,7 @@ class RecordMinimalNonOptionalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -175,7 +175,7 @@ class RecordMinimalNonOptionalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ class MinimalRowID : Record, Hashable {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["id"] = id
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ class RecordMinimalPrimaryKeyRowIDTests : GRDBTestCase {
|
||||
XCTAssertTrue(record.id != nil)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalRowIDs WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ class RecordMinimalPrimaryKeyRowIDTests : GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalRowIDs WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ class RecordMinimalPrimaryKeyRowIDTests : GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalRowIDs WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -138,7 +138,7 @@ class RecordMinimalPrimaryKeyRowIDTests : GRDBTestCase {
|
||||
try record.update(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalRowIDs WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -171,7 +171,7 @@ class RecordMinimalPrimaryKeyRowIDTests : GRDBTestCase {
|
||||
XCTAssertTrue(record.id != nil)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalRowIDs WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -183,7 +183,7 @@ class RecordMinimalPrimaryKeyRowIDTests : GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalRowIDs WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -195,7 +195,7 @@ class RecordMinimalPrimaryKeyRowIDTests : GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalRowIDs WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -208,7 +208,7 @@ class RecordMinimalPrimaryKeyRowIDTests : GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalRowIDs WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ class MinimalSingle: Record, Hashable {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["UUID"] = UUID
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ class RecordMinimalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ class RecordMinimalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -139,7 +139,7 @@ class RecordMinimalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.update(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -186,7 +186,7 @@ class RecordMinimalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -199,7 +199,7 @@ class RecordMinimalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -213,7 +213,7 @@ class RecordMinimalPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM minimalSingles WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ private class Person : Record, Hashable {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container[.rowID] = id
|
||||
container["name"] = name
|
||||
container["age"] = age
|
||||
@@ -100,7 +100,7 @@ class RecordPrimaryKeyHiddenRowIDTests : GRDBTestCase {
|
||||
XCTAssertTrue(record.id != nil)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT *, rowid FROM persons WHERE rowid = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ class RecordPrimaryKeyHiddenRowIDTests : GRDBTestCase {
|
||||
XCTAssertTrue(record.id != nil)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT *, rowid FROM persons WHERE rowid = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
return .rollback
|
||||
}
|
||||
// This is debatable, actually.
|
||||
@@ -127,7 +127,7 @@ class RecordPrimaryKeyHiddenRowIDTests : GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT *, rowid FROM persons WHERE rowid = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -165,7 +165,7 @@ class RecordPrimaryKeyHiddenRowIDTests : GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT *, rowid FROM persons WHERE rowid = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,7 +211,7 @@ class RecordPrimaryKeyHiddenRowIDTests : GRDBTestCase {
|
||||
try record.update(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT *, rowid FROM persons WHERE rowid = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -244,7 +244,7 @@ class RecordPrimaryKeyHiddenRowIDTests : GRDBTestCase {
|
||||
XCTAssertTrue(record.id != nil)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT *, rowid FROM persons WHERE rowid = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,7 +255,7 @@ class RecordPrimaryKeyHiddenRowIDTests : GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT *, rowid FROM persons WHERE rowid = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -270,7 +270,7 @@ class RecordPrimaryKeyHiddenRowIDTests : GRDBTestCase {
|
||||
try record.save(db) // Actual update
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT *, rowid FROM persons WHERE rowid = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -283,7 +283,7 @@ class RecordPrimaryKeyHiddenRowIDTests : GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT *, rowid FROM persons WHERE rowid = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ private class Citizenship : Record, Hashable {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["personName"] = personName
|
||||
container["countryName"] = countryName
|
||||
container["native"] = native
|
||||
@@ -89,7 +89,7 @@ class RecordPrimaryKeyMultipleTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM citizenships WHERE personName = ? AND countryName = ?", arguments: [record.personName, record.countryName])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@ class RecordPrimaryKeyMultipleTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM citizenships WHERE personName = ? AND countryName = ?", arguments: [record.personName, record.countryName])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,7 +162,7 @@ class RecordPrimaryKeyMultipleTests: GRDBTestCase {
|
||||
try record.update(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM citizenships WHERE personName = ? AND countryName = ?", arguments: [record.personName, record.countryName])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -207,7 +207,7 @@ class RecordPrimaryKeyMultipleTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM citizenships WHERE personName = ? AND countryName = ?", arguments: [record.personName, record.countryName])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -221,7 +221,7 @@ class RecordPrimaryKeyMultipleTests: GRDBTestCase {
|
||||
try record.save(db) // Actual update
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM citizenships WHERE personName = ? AND countryName = ?", arguments: [record.personName, record.countryName])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -234,7 +234,7 @@ class RecordPrimaryKeyMultipleTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM citizenships WHERE personName = ? AND countryName = ?", arguments: [record.personName, record.countryName])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ private class Item : Record, Hashable {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["name"] = name
|
||||
container["email"] = email
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ private class Person : Record, Hashable {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["id"] = id
|
||||
container["name"] = name
|
||||
container["age"] = age
|
||||
@@ -94,7 +94,7 @@ class RecordPrimaryKeyRowIDTests: GRDBTestCase {
|
||||
XCTAssertTrue(record.id != nil)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM persons WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ class RecordPrimaryKeyRowIDTests: GRDBTestCase {
|
||||
XCTAssertTrue(record.id != nil)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM persons WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
return .rollback
|
||||
}
|
||||
// This is debatable, actually.
|
||||
@@ -121,7 +121,7 @@ class RecordPrimaryKeyRowIDTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM persons WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -159,7 +159,7 @@ class RecordPrimaryKeyRowIDTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM persons WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -205,7 +205,7 @@ class RecordPrimaryKeyRowIDTests: GRDBTestCase {
|
||||
try record.update(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM persons WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -238,7 +238,7 @@ class RecordPrimaryKeyRowIDTests: GRDBTestCase {
|
||||
XCTAssertTrue(record.id != nil)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM persons WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -249,7 +249,7 @@ class RecordPrimaryKeyRowIDTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM persons WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -263,7 +263,7 @@ class RecordPrimaryKeyRowIDTests: GRDBTestCase {
|
||||
try record.save(db) // Actual update
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM persons WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -276,7 +276,7 @@ class RecordPrimaryKeyRowIDTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM persons WHERE id = ?", arguments: [record.id])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ class Pet : Record, Hashable {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["UUID"] = UUID
|
||||
container["name"] = name
|
||||
}
|
||||
@@ -79,7 +79,7 @@ class RecordPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM pets WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ class RecordPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM pets WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ class RecordPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.update(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM pets WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@ class RecordPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM pets WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,7 +211,7 @@ class RecordPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.save(db) // Actual update
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM pets WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -224,7 +224,7 @@ class RecordPrimaryKeySingleTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM pets WHERE UUID = ?", arguments: [record.UUID])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ class Email : Record, Hashable {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["email"] = email
|
||||
container["label"] = label
|
||||
}
|
||||
@@ -80,7 +80,7 @@ class RecordPrimaryKeySingleWithReplaceConflictResolutionTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM emails WHERE email = ?", arguments: [record.email])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ class RecordPrimaryKeySingleWithReplaceConflictResolutionTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM emails WHERE email = ?", arguments: [record.email])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ class RecordPrimaryKeySingleWithReplaceConflictResolutionTests: GRDBTestCase {
|
||||
try record.insert(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM emails WHERE email = ?", arguments: [record.email])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ class RecordPrimaryKeySingleWithReplaceConflictResolutionTests: GRDBTestCase {
|
||||
try record.update(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM emails WHERE email = ?", arguments: [record.email])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -188,7 +188,7 @@ class RecordPrimaryKeySingleWithReplaceConflictResolutionTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM emails WHERE email = ?", arguments: [record.email])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,7 +201,7 @@ class RecordPrimaryKeySingleWithReplaceConflictResolutionTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM emails WHERE email = ?", arguments: [record.email])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -215,7 +215,7 @@ class RecordPrimaryKeySingleWithReplaceConflictResolutionTests: GRDBTestCase {
|
||||
try record.save(db)
|
||||
|
||||
let row = try Row.fetchOne(db, sql: "SELECT * FROM emails WHERE email = ?", arguments: [record.email])!
|
||||
assert(record, isEncodedIn: row)
|
||||
try assert(record, isEncodedIn: row)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ private class Person : Record {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["id"] = id
|
||||
container["name"] = name
|
||||
container["age"] = age
|
||||
|
||||
@@ -31,7 +31,7 @@ class BadlyMangledStuff : Record {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
// User won't peek fancy column names because he will notice that the
|
||||
// generated INSERT query needs actual column names.
|
||||
container["id"] = id
|
||||
|
||||
@@ -45,7 +45,7 @@ class InsertRecordClassTests: XCTestCase {
|
||||
fatalError("init(row:) has not been implemented")
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["i0"] = i0
|
||||
container["i1"] = i1
|
||||
container["i2"] = i2
|
||||
|
||||
@@ -375,7 +375,7 @@ class ItemRecord : Record {
|
||||
try super.init(row: row)
|
||||
}
|
||||
|
||||
override func encode(to container: inout PersistenceContainer) {
|
||||
override func encode(to container: inout PersistenceContainer) throws {
|
||||
container["i0"] = i0
|
||||
container["i1"] = i1
|
||||
container["i2"] = i2
|
||||
|
||||
Reference in new issue
Block a user