CRDatabase: Check-in [f0abf3b697]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:	f0abf3b6970fff64901489fcc7b140cc03c91717
Date:	2009-10-18 20:56:38
User:	dmitry
Comment:	Reformat code to 80 characters per line

Tags And Properties

branch=trunk inherited from [8f3b80c49a]
sym-trunk inherited from [8f3b80c49a]

Changes

hide diffs unified diffs patch

Changes to CRDatabase.m

--- Old (890aaf6f1d6d4ab2)
+++ New (a99057cad97ea56f)
 //
 //  CRDatabase.m
 //  CRDatabase
 //
     if (SQLITE_BUSY == returnCode) {
       NSLog(@"[EGODatabase] Query Failed, Database Busy:\n%@\n\n", sql);
     } else if (SQLITE_DONE == returnCode || SQLITE_ROW == returnCode) {
       // nothing?
     } else if (SQLITE_ERROR == returnCode) {
-      NSLog(@"sqlite3_step Failed: (%d: %s) SQLITE_ERROR\n%@\n\n", returnCode, [self lastErrorMessage], sql);
+      NSLog(@"sqlite3_step Failed: (%d: %s) SQLITE_ERROR\n%@\n\n", returnCode,
@@ | / 143 / [self lastErrorMessage], sql); @@
     } else if (SQLITE_MISUSE == returnCode) {
-      NSLog(@"sqlite3_step Failed: (%d: %s) SQLITE_MISUSE\n%@\n\n", returnCode, [self lastErrorMessage], sql);
+      NSLog(@"sqlite3_step Failed: (%d: %s) SQLITE_MISUSE\n%@\n\n", returnCode,
@@ | / 146 / [self lastErrorMessage], sql); @@
     } else {
-      NSLog(@"sqlite3_step Failed: (%d: %s) UNKNOWN_ERROR\n%@\n\n", returnCode, [self lastErrorMessage], sql);
+      NSLog(@"sqlite3_step Failed: (%d: %s) UNKNOWN_ERROR\n%@\n\n", returnCode,
@@ | / 149 / [self lastErrorMessage], sql); @@
+    }
     returnCode = sqlite3_finalize(statement);
     result = (returnCode == SQLITE_OK);
   });
 - (void)asyncExecuteQuery:(NSString *)sql withArguments:(NSArray *)args
              doWithResult:(void (^)(CRDatabaseResult *))block;
+{
-  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
@@ | / 165 / ^{ @@
     block([self executeQuery:sql withArguments:args]);
   });
+}
 - (CRDatabaseResult *)executeQuery:(NSString *)sql withArgument:(id)arg
           case SQLITE_TEXT: {
             int dataSize = sqlite3_column_bytes(statement, col);
             const unsigned char *value = sqlite3_column_text(statement, col);
             if (dataSize > 0 && value != NULL)
-              [row.columnData addObject:[NSString stringWithUTF8String:(char *)value]];
+              [row.columnData addObject:
@@ | / 236 / [NSString stringWithUTF8String:(char *)value]]; @@
             else
               [row.columnData addObject:@""];
             break;
+          }
           case SQLITE_BLOB: // same as default
           default: {
             int dataSize = sqlite3_column_bytes(statement, col);
             const void *blob = sqlite3_column_blob(statement, col);
             if (dataSize > 0 && blob != NULL) {
-              NSMutableData *data = [NSMutableData dataWithBytes:blob length:dataSize];
+              NSMutableData *data = [NSMutableData dataWithBytes:blob
@@ | / 253 / length:dataSize]; @@
               [row.columnData addObject:data];
+            }
             else
               [row.columnData addObject:[NSNull null]];
+          }
   return YES;
+}
 - (void)bindObject:(id)obj toColumn:(int)idx inStatement:(sqlite3_stmt*)pStmt
+{
-  if ((!obj) || ((NSNull *)obj == [NSNull null])) {
+  if ((!obj) || ((NSNull *)obj == [NSNull null]))
     sqlite3_bind_null(pStmt, idx);
-  } else if ([obj isKindOfClass:[NSData class]]) {
+  else if ([obj isKindOfClass:[NSData class]])
     sqlite3_bind_blob(pStmt, idx, [obj bytes], [obj length], SQLITE_STATIC);
-  } else if ([obj isKindOfClass:[NSDate class]]) {
+  else if ([obj isKindOfClass:[NSDate class]])
     sqlite3_bind_double(pStmt, idx, [obj timeIntervalSince1970]);
-  } else if ([obj isKindOfClass:[NSNumber class]]) {
+  else if ([obj isKindOfClass:[NSNumber class]]) {
-    if (strcmp([obj objCType], @encode(BOOL)) == 0) {
+    if (strcmp([obj objCType], @encode(BOOL)) == 0)
       sqlite3_bind_int(pStmt, idx, ([obj boolValue] ? 1 : 0));
-    } else if (strcmp([obj objCType], @encode(int)) == 0) {
+    else if (strcmp([obj objCType], @encode(int)) == 0)
       sqlite3_bind_int64(pStmt, idx, [obj longValue]);
-    } else if (strcmp([obj objCType], @encode(long)) == 0) {
+    else if (strcmp([obj objCType], @encode(long)) == 0)
       sqlite3_bind_int64(pStmt, idx, [obj longValue]);
-    } else if (strcmp([obj objCType], @encode(float)) == 0) {
+    else if (strcmp([obj objCType], @encode(float)) == 0)
       sqlite3_bind_double(pStmt, idx, [obj floatValue]);
-    } else if (strcmp([obj objCType], @encode(double)) == 0) {
+    else if (strcmp([obj objCType], @encode(double)) == 0)
       sqlite3_bind_double(pStmt, idx, [obj doubleValue]);
-    } else {
+    else
-      sqlite3_bind_text(pStmt, idx, [[obj description] UTF8String], -1, SQLITE_STATIC);
+      sqlite3_bind_text(pStmt, idx, [[obj description] UTF8String],
                         -1, SQLITE_STATIC);
@@ 354 / } else { / | @@
@@ 355 / | @@
+  }
+  else
+    sqlite3_bind_text(pStmt, idx, [[obj description] UTF8String],
+                      -1, SQLITE_STATIC);
+}
 - (void)dealloc
+{
   [self close];
+{
   id value = [columnData_ objectAtIndex:columnIndex];
   if ([value isKindOfClass:[NSString class]]) // convert other values
     return value;
   else if ([value isKindOfClass:[NSData class]])
-    return [[NSString alloc] initWithData:[columnData_ objectAtIndex:columnIndex]
+    return [[NSString alloc]
-                                 encoding:NSUTF8StringEncoding];
+              initWithData:[columnData_ objectAtIndex:columnIndex]
@@ | / 548 / encoding:NSUTF8StringEncoding]; @@
   else if ([value isKindOfClass:[NSNumber class]])
     return [value stringValue];
   else
     return nil; // unknown type of value, shouldn't happen
+}
 - (NSDate *)dateForColumn:(NSString*)columnName
+{
   NSUInteger columnIndex = [self columnIndexForName:columnName];
   if (columnIndex == NSNotFound)
     return nil;
-  return [NSDate dateWithTimeIntervalSince1970:[self doubleForColumnIndex:columnIndex]];
+  return [NSDate dateWithTimeIntervalSince1970:
@@ | / 561 / [self doubleForColumnIndex:columnIndex]]; @@
+}
 - (NSDate *)dateForColumnIndex:(NSUInteger)columnIndex
+{
-  return [NSDate dateWithTimeIntervalSince1970:[self doubleForColumnIndex:columnIndex]];
+  return [NSDate dateWithTimeIntervalSince1970:
@@ | / 567 / [self doubleForColumnIndex:columnIndex]]; @@
+}
 - (NSData *)dataForColumn:(NSString *)columnName;
+{
   NSUInteger columnIndex = [self columnIndexForName:columnName];
   [columnData_ release];
   [super dealloc];
+}
 @end