Adjust to ObjFW changes

FossilOrigin-Name: 74061183c3d3a89e28df2eb665b75ff11df6acd629ffce6f0f11ecd52915651d
This commit is contained in:
Jonathan Schleifer 2021-04-28 22:54:37 +00:00
parent c8f0fee24c
commit 75f88beebf
2 changed files with 11 additions and 11 deletions

View file

@ -195,7 +195,7 @@ bindObject(SL3PreparedStatement *statement, int column, id object)
case SQLITE_NULL: case SQLITE_NULL:
return [OFNull null]; return [OFNull null];
default: default:
OF_ENSURE(0); OFEnsure(0);
} }
} }

View file

@ -70,10 +70,10 @@ OF_APPLICATION_DELEGATE(Tests)
OFString *b; OFString *b;
OFData *c; OFData *c;
OF_ENSURE([stmt columnCount] == 3); OFEnsure([stmt columnCount] == 3);
OF_ENSURE([[stmt nameForColumn: 0] isEqual: @"a"]); OFEnsure([[stmt nameForColumn: 0] isEqual: @"a"]);
OF_ENSURE([[stmt nameForColumn: 1] isEqual: @"b"]); OFEnsure([[stmt nameForColumn: 1] isEqual: @"b"]);
OF_ENSURE([[stmt nameForColumn: 2] isEqual: @"c"]); OFEnsure([[stmt nameForColumn: 2] isEqual: @"c"]);
switch (i) { switch (i) {
case 0: case 0:
@ -89,16 +89,16 @@ OF_APPLICATION_DELEGATE(Tests)
count: 3]; count: 3];
break; break;
default: default:
OF_ENSURE(0); OFEnsure(0);
} }
OF_ENSURE([[stmt objectForColumn: 0] isEqual: a]); OFEnsure([[stmt objectForColumn: 0] isEqual: a]);
OF_ENSURE([[stmt objectForColumn: 1] isEqual: b]); OFEnsure([[stmt objectForColumn: 1] isEqual: b]);
OF_ENSURE([[stmt objectForColumn: 2] isEqual: c]); OFEnsure([[stmt objectForColumn: 2] isEqual: c]);
OF_ENSURE([[stmt rowArray] isEqual: ([OFArray arrayWithObjects: OFEnsure([[stmt rowArray] isEqual: ([OFArray arrayWithObjects:
a, b, c, nil])]); a, b, c, nil])]);
OF_ENSURE([[stmt rowDictionary] isEqual: OFEnsure([[stmt rowDictionary] isEqual:
([OFDictionary dictionaryWithKeysAndObjects: ([OFDictionary dictionaryWithKeysAndObjects:
@"a", a, @"b", b, @"c", c, nil])]); @"a", a, @"b", b, @"c", c, nil])]);
} }