为了64位的项目里去除编译警告，int 统一转成NSInteger

Author: li6185377

LKDBHelper/FMDB/src/FMDatabase.h

@@ -7,6 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "FMDatabase.h"
+
 
 /** Category of additions for `<FMDatabase>` class.
  
@@ -217,13 +219,15 @@
 
 - (void)setApplicationID:(uint32_t)appID;
 
+#if TARGET_OS_MAC && !TARGET_OS_IPHONE
 /** Retrieve application ID string
 
  @return The `NSString` value of the application ID.
 
  @see setApplicationIDString:
  */
 
+
 - (NSString*)applicationIDString;
 
 /** Set the application ID string
@@ -236,5 +240,28 @@
 - (void)setApplicationIDString:(NSString*)string;
 #endif
 
+#endif
+
+///-----------------------------------
+/// @name user version identifier tasks
+///-----------------------------------
+
+/** Retrieve user version
+ 
+ @return The `uint32_t` numeric value of the user version.
+ 
+ @see setUserVersion:
+ */
+
+- (uint32_t)userVersion;
+
+/** Set the user-version
+ 
+ @param version The `uint32_t` numeric value of the user version.
+ 
+ @see userVersion
+ */
+
+- (void)setUserVersion:(uint32_t)version;
 
 @end

LKDBHelper/FMDB/src/FMDatabase.m

@@ -90,7 +90,7 @@ - (FMResultSet*)getSchema {
 - (FMResultSet*)getTableSchema:(NSString*)tableName {
 
     //result colums: cid[INTEGER], name,type [STRING], notnull[INTEGER], dflt_value[],pk[INTEGER]
-    FMResultSet *rs = [self executeQuery:[NSString stringWithFormat: @"PRAGMA table_info('%@')", tableName]];
+    FMResultSet *rs = [self executeQuery:[NSString stringWithFormat: @"pragma table_info('%@')", tableName]];
 
     return rs;
 }
@@ -137,7 +137,7 @@ - (uint32_t)applicationID {
 }
 
 - (void)setApplicationID:(uint32_t)appID {
-    NSString *query = [NSString stringWithFormat:@"PRAGMA application_id=%d", appID];
+    NSString *query = [NSString stringWithFormat:@"pragma application_id=%d", appID];
     FMResultSet *rs = [self executeQuery:query];
     [rs next];
     [rs close];
@@ -171,6 +171,26 @@ - (void)setApplicationIDString:(NSString*)s {
 
 #endif
 
+- (uint32_t)userVersion {
+    uint32_t r = 0;
+    
+    FMResultSet *rs = [self executeQuery:@"pragma user_version"];
+    
+    if ([rs next]) {
+        r = (uint32_t)[rs longLongIntForColumnIndex:0];
+    }
+    
+    [rs close];
+    return r;
+}
+
+- (void)setUserVersion:(uint32_t)version {
+    NSString *query = [NSString stringWithFormat:@"pragma user_version = %d", version];
+    FMResultSet *rs = [self executeQuery:query];
+    [rs next];
+    [rs close];
+}
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-implementations"
 
@@ -180,32 +200,19 @@ - (BOOL)columnExists:(NSString*)tableName columnName:(NSString*)columnName __att
 
 #pragma clang diagnostic pop
 
+
 - (BOOL)validateSQL:(NSString*)sql error:(NSError**)error {
     sqlite3_stmt *pStmt = NULL;
     BOOL validationSucceeded = YES;
-    BOOL keepTrying = YES;
-    int numberOfRetries = 0;
-    
-    while (keepTrying == YES) {
-        keepTrying = NO;
-        int rc = sqlite3_prepare_v2(_db, [sql UTF8String], -1, &pStmt, 0);
-        if (rc == SQLITE_BUSY || rc == SQLITE_LOCKED) {
-            keepTrying = YES;
-            usleep(FMDatabaseSQLiteBusyMicrosecondsTimeout);
-            
-            if (_busyRetryTimeout && (numberOfRetries++ > _busyRetryTimeout)) {
-                NSLog(@"%s:%d Database busy (%@)", __FUNCTION__, __LINE__, [self databasePath]);
-                NSLog(@"Database busy");
-            }          
-        } 
-        else if (rc != SQLITE_OK) {
-            validationSucceeded = NO;
-            if (error) {
-                *error = [NSError errorWithDomain:NSCocoaErrorDomain 
-                                             code:[self lastErrorCode]
-                                         userInfo:[NSDictionary dictionaryWithObject:[self lastErrorMessage] 
-                                                                              forKey:NSLocalizedDescriptionKey]];
-            }
+    
+    int rc = sqlite3_prepare_v2(_db, [sql UTF8String], -1, &pStmt, 0);
+    if (rc != SQLITE_OK) {
+        validationSucceeded = NO;
+        if (error) {
+            *error = [NSError errorWithDomain:NSCocoaErrorDomain
+                                         code:[self lastErrorCode]
+                                     userInfo:[NSDictionary dictionaryWithObject:[self lastErrorMessage]
+                                                                          forKey:NSLocalizedDescriptionKey]];
         }
     }
 

LKDBHelper/FMDB/src/FMDatabaseAdditions.h

@@ -40,12 +40,26 @@
     __unsafe_unretained id _delegate;
 
     NSUInteger          _maximumNumberOfDatabasesToCreate;
+    int                 _openFlags;
 }
 
+/** Database path */
+
 @property (atomic, retain) NSString *path;
+
+/** Delegate object */
+
 @property (atomic, assign) id delegate;
+
+/** Maximum number of databases to create */
+
 @property (atomic, assign) NSUInteger maximumNumberOfDatabasesToCreate;
 
+/** Open flags */
+
+@property (atomic, readonly) int openFlags;
+
+
 ///---------------------
 /// @name Initialization
 ///---------------------
@@ -59,6 +73,16 @@
 
 + (instancetype)databasePoolWithPath:(NSString*)aPath;
 
+/** Create pool using path and specified flags
+
+ @param aPath The file path of the database.
+ @param openFlags Flags passed to the openWithFlags method of the database
+
+ @return The `FMDatabasePool` object. `nil` on error.
+ */
+
++ (instancetype)databasePoolWithPath:(NSString*)aPath flags:(int)openFlags;
+
 /** Create pool using path.
 
  @param aPath The file path of the database.
@@ -68,6 +92,16 @@
 
 - (instancetype)initWithPath:(NSString*)aPath;
 
+/** Create pool using path and specified flags.
+
+ @param aPath The file path of the database.
+ @param openFlags Flags passed to the openWithFlags method of the database
+
+ @return The `FMDatabasePool` object. `nil` on error.
+ */
+
+- (instancetype)initWithPath:(NSString*)aPath flags:(int)openFlags;
+
 ///------------------------------------------------
 /// @name Keeping track of checked in/out databases
 ///------------------------------------------------
@@ -127,6 +161,8 @@
 /** Synchronously perform database operations in pool using save point.
 
  @param block The code to be run on the `FMDatabasePool` pool.
+ 
+ @return `NSError` object if error; `nil` if successful.
 
  @warning You can not nest these, since calling it will pull another database out of the pool and you'll get a deadlock. If you need to nest, use `<[FMDatabase startSavePointWithName:error:]>` instead.
 */
@@ -137,9 +173,32 @@
 @end
 
 
+/** FMDatabasePool delegate category
+ 
+ This is a category that defines the protocol for the FMDatabasePool delegate
+ */
+
 @interface NSObject (FMDatabasePoolDelegate)
 
+/** Asks the delegate whether database should be added to the pool. 
+ 
+ @param pool     The `FMDatabasePool` object.
+ @param database The `FMDatabase` object.
+ 
+ @return `YES` if it should add database to pool; `NO` if not.
+ 
+ */
+
 - (BOOL)databasePool:(FMDatabasePool*)pool shouldAddDatabaseToPool:(FMDatabase*)database;
 
+/** Tells the delegate that database was added to the pool.
+ 
+ @param pool     The `FMDatabasePool` object.
+ @param database The `FMDatabase` object.
+
+ */
+
+- (void)databasePool:(FMDatabasePool*)pool didAddDatabase:(FMDatabase*)database;
+
 @end