Merge branch 'block-assertions' of https://github.com/theory/fmdb into theory-block-assertions

src/FMDatabase.m

@@ -174,9 +174,11 @@ - (BOOL)goodConnection {
 - (void)compainAboutInUse {
     NSLog(@"The FMDatabase %@ is currently in use.", self);
     
+# if !NS_BLOCK_ASSERTIONS
     if (crashOnErrors) {
         NSAssert1(false, @"The FMDatabase %@ is currently in use.", self);
     }
+#endif
 }
 
 - (NSString*)lastErrorMessage {
@@ -300,12 +302,14 @@ - (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arr
                 if (logsErrors) {
                     NSLog(@"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
                     NSLog(@"DB Query: %@", sql);
+# if !NS_BLOCK_ASSERTIONS
                     if (crashOnErrors) {
 //#if defined(__BIG_ENDIAN__) && !TARGET_IPHONE_SIMULATOR
 //                        asm{ trap };
 //#endif
                         NSAssert2(false, @"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
                     }
+#endif
                 }
                 
                 sqlite3_finalize(pStmt);
@@ -432,12 +436,14 @@ - (BOOL)executeUpdate:(NSString*)sql error:(NSError**)outErr withArgumentsInArra
                 if (logsErrors) {
                     NSLog(@"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
                     NSLog(@"DB Query: %@", sql);
+# if !NS_BLOCK_ASSERTIONS
                     if (crashOnErrors) {
 //#if defined(__BIG_ENDIAN__) && !TARGET_IPHONE_SIMULATOR
 //                        asm{ trap };
 //#endif
                         NSAssert2(false, @"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
                     }
+#endif
                 }
                 
                 sqlite3_finalize(pStmt);