darlinghq/fmdb
1
0
Fork 0
mirror of https://github.com/darlinghq/fmdb.git synced 2024-11-30 07:50:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'rob2468-master'

Browse Source
This commit is contained in:
August Mueller 2018-06-01 12:19:07 -07:00
commit 114ca97f5e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tests/FMDatabaseTests.m
View File

@ -1151,12 +1151,24 @@
XCTAssertEqual(count, 1, @"expected one record for dictionary %@", dictionary);
return 0;
}];
XCTAssertTrue(success, @"bulk select");
// select blob type records
[self.db executeUpdate:@"create table bulktest4 (id integer primary key autoincrement, b blob);"];
NSData *blobData = [[NSData alloc] initWithContentsOfFile:@"/bin/bash"];
[self.db executeUpdate:@"insert into bulktest4 (b) values (?)" values:@[blobData] error:nil];
sql = @"select * from bulktest4";
success = [self.db executeStatements:sql withResultBlock:^int(NSDictionary * _Nonnull resultsDictionary) {
return 0;
}];
XCTAssertTrue(success, @"bulk select");
sql = @"drop table bulktest1;"
"drop table bulktest2;"
"drop table bulktest3;";
"drop table bulktest3;"
"drop table bulktest4";
success = [self.db executeStatements:sql];

1
src/fmdb/FMDatabase.m
View File

@ -1261,6 +1261,7 @@ int FMDBExecuteBulkSQLCallback(void *theBlockAsVoid, int columns, char **values,
for (NSInteger i = 0; i < columns; i++) {
NSString *key = [NSString stringWithUTF8String:names[i]];
id value = values[i] ? [NSString stringWithUTF8String:values[i]] : [NSNull null];
value = value ? value : [NSNull null];
[dictionary setObject:value forKey:key];
}