فهرست منبع

NSAssert fixes for building on older sdks.

ccgus 14 سال پیش
والد
کامیت
c18eac424c
2فایلهای تغییر یافته به همراه5 افزوده شده و 5 حذف شده
  1. 4 4
      src/FMDatabase.m
  2. 1 1
      src/fmdb.m

+ 4 - 4
src/FMDatabase.m

@@ -856,7 +856,7 @@ - (BOOL)executeUpdate:(NSString*)sql error:(NSError**)outErr withArgumentsInArra
     } while (retry);
     
     if (rc == SQLITE_ROW) {
-        NSAssert(NO, @"A executeUpdate is being called with a query string", 0x00);
+        NSAssert1(NO, @"A executeUpdate is being called with a query string '%@'", sql);
     }
     
     if (_shouldCacheStatements && !cachedStmt) {
@@ -997,7 +997,7 @@ - (BOOL)startSavePointWithName:(NSString*)name error:(NSError**)outErr {
     
     // FIXME: make sure the savepoint name doesn't have a ' in it.
     
-    NSAssert(name, @"Missing name for a savepoint", nil);
+    NSAssert1(name, @"Missing name for a savepoint", nil);
     
     if ([self pool]) {
         [self popFromPool];
@@ -1017,7 +1017,7 @@ - (BOOL)startSavePointWithName:(NSString*)name error:(NSError**)outErr {
 
 - (BOOL)releaseSavePointWithName:(NSString*)name error:(NSError**)outErr {
     
-    NSAssert(name, @"Missing name for a savepoint", nil);
+    NSAssert1(name, @"Missing name for a savepoint", nil);
     
     BOOL worked = [self executeUpdate:[NSString stringWithFormat:@"release savepoint '%@';", name]];
     
@@ -1034,7 +1034,7 @@ - (BOOL)releaseSavePointWithName:(NSString*)name error:(NSError**)outErr {
 
 - (BOOL)rollbackToSavePointWithName:(NSString*)name error:(NSError**)outErr {
     
-    NSAssert(name, @"Missing name for a savepoint", nil);
+    NSAssert1(name, @"Missing name for a savepoint", nil);
     
     BOOL worked = [self executeUpdate:[NSString stringWithFormat:@"rollback transaction to savepoint '%@';", name]];
     

+ 1 - 1
src/fmdb.m

@@ -163,7 +163,7 @@ int main (int argc, const char * argv[]) {
     
     // test the busy rety timeout schtuff.
     
-    [db setBusyRetryTimeout:50000];
+    [db setBusyRetryTimeout:500];
     
     FMDatabase *newDb = [FMDatabase databaseWithPath:dbPath];
     [newDb open];