|
@@ -661,16 +661,16 @@ - (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arr
|
|
|
rc = sqlite3_prepare_v2(_db, [sql UTF8String], -1, &pStmt, 0);
|
|
rc = sqlite3_prepare_v2(_db, [sql UTF8String], -1, &pStmt, 0);
|
|
|
|
|
|
|
|
if (SQLITE_OK != rc) {
|
|
if (SQLITE_OK != rc) {
|
|
|
- if (_logsErrors) {
|
|
|
|
|
- NSLog(@"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
|
|
|
|
|
- NSLog(@"DB Query: %@", sql);
|
|
|
|
|
- NSLog(@"DB Path: %@", _databasePath);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- if (_crashOnErrors) {
|
|
|
|
|
- NSAssert(false, @"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
|
|
|
|
|
- abort();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (_logsErrors) {
|
|
|
|
|
+ NSLog(@"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
|
|
|
|
|
+ NSLog(@"DB Query: %@", sql);
|
|
|
|
|
+ NSLog(@"DB Path: %@", _databasePath);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (_crashOnErrors) {
|
|
|
|
|
+ NSAssert(false, @"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
|
|
|
|
|
+ abort();
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
sqlite3_finalize(pStmt);
|
|
sqlite3_finalize(pStmt);
|
|
|
_isExecutingStatement = NO;
|
|
_isExecutingStatement = NO;
|
|
@@ -716,10 +716,10 @@ - (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arr
|
|
|
else if (args) {
|
|
else if (args) {
|
|
|
obj = va_arg(args, id);
|
|
obj = va_arg(args, id);
|
|
|
}
|
|
}
|
|
|
- else {
|
|
|
|
|
- //We ran out of arguments
|
|
|
|
|
- break;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ else {
|
|
|
|
|
+ //We ran out of arguments
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (_traceExecution) {
|
|
if (_traceExecution) {
|
|
|
if ([obj isKindOfClass:[NSData class]]) {
|
|
if ([obj isKindOfClass:[NSData class]]) {
|
|
@@ -836,12 +836,12 @@ - (BOOL)executeUpdate:(NSString*)sql error:(NSError**)outErr withArgumentsInArra
|
|
|
NSLog(@"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
|
|
NSLog(@"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
|
|
|
NSLog(@"DB Query: %@", sql);
|
|
NSLog(@"DB Query: %@", sql);
|
|
|
NSLog(@"DB Path: %@", _databasePath);
|
|
NSLog(@"DB Path: %@", _databasePath);
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- if (_crashOnErrors) {
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (_crashOnErrors) {
|
|
|
NSAssert(false, @"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
|
|
NSAssert(false, @"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
|
|
|
abort();
|
|
abort();
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
sqlite3_finalize(pStmt);
|
|
sqlite3_finalize(pStmt);
|
|
|
|
|
|
|
@@ -893,10 +893,10 @@ - (BOOL)executeUpdate:(NSString*)sql error:(NSError**)outErr withArgumentsInArra
|
|
|
else if (args) {
|
|
else if (args) {
|
|
|
obj = va_arg(args, id);
|
|
obj = va_arg(args, id);
|
|
|
}
|
|
}
|
|
|
- else {
|
|
|
|
|
- //We ran out of arguments
|
|
|
|
|
- break;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ else {
|
|
|
|
|
+ //We ran out of arguments
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (_traceExecution) {
|
|
if (_traceExecution) {
|
|
|
if ([obj isKindOfClass:[NSData class]]) {
|
|
if ([obj isKindOfClass:[NSData class]]) {
|