增加修改数据库密码的API

Author: li6185377

LKDBHelper.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "LKDBHelper",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "summary": "全自动的插入,查询,更新,删除， an automatic database operation thread-safe and not afraid of recursive deadlock",
   "description": "全面支持 NSArray,NSDictionary, ModelClass, NSNumber, NSString, NSDate, NSData, UIColor, UIImage, CGRect, CGPoint, CGSize, NSRange, int,char,float, double, long.. 等属性的自动化操作(插入和查询)",
   "homepage": "https://github.com/li6185377/LKDBHelper-SQLite-ORM",
@@ -10,7 +10,7 @@
   },
   "source": {
     "git": "https://github.com/li6185377/LKDBHelper-SQLite-ORM.git",
-    "tag": "2.1.6"
+    "tag": "2.1.7"
   },
   "platforms": {
     "ios": "4.3",

LKDBHelper/Helper/LKDBHelper.h

@@ -6,18 +6,24 @@
 //  Copyright (c) 2012年 LJH. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import "FMDatabaseQueue.h"
 #import "FMDatabase.h"
+#import "FMDatabaseQueue.h"
+#import <Foundation/Foundation.h>
 
 #import "LKDBUtils.h"
 
 #import "LKDB+Mapping.h"
 
-#import "NSObject+LKModel.h"
 #import "NSObject+LKDBHelper.h"
+#import "NSObject+LKModel.h"
 
 @interface LKDBHelper : NSObject
+
+/**
+ *  @brief 是否打印数据库出错日志 默认 NO
+ */
++ (void)setLogError:(BOOL)logError;
+
 /**
  *	@brief  filepath the use of : "documents/db/" + fileName + ".db"
  *  refer:  FMDatabase.h  + (instancetype)databaseWithPath:(NSString*)inPath;
@@ -32,11 +38,19 @@
 - (instancetype)initWithDBPath:(NSString*)filePath;
 - (void)setDBPath:(NSString*)filePath;
 
-/** 
- *  @brief set and save encryption key.
- *  refer: FMDatabase.h  - (BOOL)setKey:(NSString*)key;
+/**
+ *  @brief current encryption key.
+ */
+@property (copy, readonly, nonatomic) NSString* encryptionKey;
+
+/**
+ *  @brief Set encryption key
+ refer: FMDatabase.h  - (BOOL)setKey:(NSString*)key;
+ *  invoking after the `LKDBHelper initialize` in YourModelClass.m `getUsingLKDBHelper` function
  */
-@property (strong, nonatomic) NSString* encryptionKey;
+- (BOOL)setKey:(NSString*)key;
+/// Reset encryption key
+- (BOOL)rekey:(NSString*)key;
 
 /**
  *	@brief  execute database operations synchronously,not afraid of recursive deadlock  
@@ -133,7 +147,7 @@
  NSMutableArray* array = [[LKDBHelper getUsingLKDBHelper] searc:[ModelClass class] withSQL:@"select rowid from name_table where name = ?", @"Swift"];
  *
  */
--(NSMutableArray *)search:(Class)modelClass withSQL:(NSString *)sql,...;
+- (NSMutableArray*)search:(Class)modelClass withSQL:(NSString*)sql, ...;
 
 /**
     columns may NSArray or NSString   if query column count == 1  return single column string array
@@ -242,5 +256,6 @@
 #pragma mark - deprecated
 + (LKDBHelper*)sharedDBHelper __deprecated_msg("Method deprecated. Use `[Model getUsingLKDBHelper]`");
 - (BOOL)createTableWithModelClass:(Class)modelClass __deprecated_msg("Now you can not call it. Will automatically determine whether you need to create");
+- (void)setEncryptionKey:(NSString*)encryptionKey __deprecated_msg("Method deprecated. Use `setKey: OR resetKey:` invoking after the `LKDBHelper initialize` in YourModelClass.m `getUsingLKDBHelper` function");
 #pragma mark -
 @end

LKDBHelper/Helper/LKDBHelper.m

@@ -58,11 +58,32 @@ @interface LKDBHelper ()
 @end
 
 @implementation LKDBHelper
+@synthesize encryptionKey = _encryptionKey;
+
+static BOOL LKDBLogErrorEnable = NO;
++(void)setLogError:(BOOL)logError
+{
+    if (LKDBLogErrorEnable == logError) {
+        return;
+    }
+#ifdef DEBUG
+    LKDBLogErrorEnable = logError;
+    NSMutableArray* dbArray = [self dbHelperSingleArray];
+    @synchronized(dbArray)
+    {
+        [dbArray enumerateObjectsUsingBlock:^(LKDBWeakObject* weakObj, NSUInteger idx, BOOL *stop) {
+            [weakObj.obj executeDB:^(FMDatabase *db) {
+                db.logsErrors = LKDBLogErrorEnable;
+            }];
+        }];
+    }
+#endif
+}
+
 + (NSMutableArray*)dbHelperSingleArray
 {
     static __strong NSMutableArray* dbArray;
     static dispatch_once_t onceToken;
-
     dispatch_once(&onceToken, ^{
         dbArray = [NSMutableArray array];
     });
@@ -83,7 +104,6 @@ + (LKDBHelper*)dbHelperWithPath:(NSString*)dbFilePath save:(LKDBHelper*)helper
         else if (dbFilePath) {
             for (NSInteger i = 0; i < dbArray.count;) {
                 LKDBWeakObject* weakObj = [dbArray objectAtIndex:i];
-
                 if (weakObj.obj == nil) {
                     [dbArray removeObjectAtIndex:i];
                     continue;
@@ -92,7 +112,6 @@ + (LKDBHelper*)dbHelperWithPath:(NSString*)dbFilePath save:(LKDBHelper*)helper
                     instance = weakObj.obj;
                     break;
                 }
-
                 i++;
             }
         }
@@ -217,11 +236,11 @@ - (void)setDBPath:(NSString*)filePath
     }
 #endif
 
+    ///reset encryptionKey
     _encryptionKey = nil;
-
-    // 不打印错误日志
+    
     [_bindingQueue inDatabase:^(FMDatabase* db) {
-        db.logsErrors = NO;
+        db.logsErrors = LKDBLogErrorEnable;
     }];
 }
 
@@ -237,14 +256,12 @@ - (void)executeDB:(void (^)(FMDatabase* db))block
         if (_bindingQueue == nil) {
             self.bindingQueue = [[FMDatabaseQueue alloc] initWithPath:_dbPath];
             [_bindingQueue inDatabase:^(FMDatabase* db) {
-                // 不打印错误日志
-                db.logsErrors = NO;
+                db.logsErrors = LKDBLogErrorEnable;
                 if (_encryptionKey.length > 0) {
                     [db setKey:_encryptionKey];
                 }
             }];
         }
-
         [_bindingQueue inDatabase:^(FMDatabase* db) {
             self.usingdb = db;
             block(db);
@@ -353,55 +370,42 @@ - (NSMutableArray*)extractQuery:(NSMutableString*)query where:(id)where
 // dic where parse
 - (NSString*)dictionaryToSqlWhere:(NSDictionary*)dic andValues:(NSMutableArray*)values
 {
-    NSMutableString* wherekey = [NSMutableString stringWithCapacity:0];
-
-    if ((dic != nil) && (dic.count > 0)) {
-        NSArray* keys = dic.allKeys;
-
-        for (NSInteger i = 0; i < keys.count; i++) {
-            NSString* key = [keys objectAtIndex:i];
-            id va = [dic objectForKey:key];
-
-            if ([va isKindOfClass:[NSArray class]]) {
-                NSArray* vlist = va;
-
-                if (vlist.count == 0) {
-                    continue;
-                }
-
-                if (wherekey.length > 0) {
-                    [wherekey appendString:@" and"];
-                }
-
-                [wherekey appendFormat:@" %@ in(", key];
-
-                for (NSInteger j = 0; j < vlist.count; j++) {
-                    [wherekey appendString:@"?"];
-
-                    if (j == vlist.count - 1) {
-                        [wherekey appendString:@")"];
-                    }
-                    else {
-                        [wherekey appendString:@","];
-                    }
+    if (dic.count == 0) {
+        return @"";
+    }
+    
 
-                    [values addObject:[vlist objectAtIndex:j]];
+    NSMutableString* wherekey = [NSMutableString stringWithCapacity:0];
+    [dic enumerateKeysAndObjectsUsingBlock:^(NSString* key, id obj, BOOL *stop) {
+        if ([obj isKindOfClass:[NSArray class]]) {
+            NSArray* vlist = obj;
+            if (vlist.count == 0) {
+                return;
+            }
+            if (wherekey.length > 0) {
+                [wherekey appendString:@" and"];
+            }
+            [wherekey appendFormat:@" %@ in(", key];
+            [vlist enumerateObjectsUsingBlock:^(id vlist_obj, NSUInteger idx, BOOL *stop) {
+                [wherekey appendString:@"?"];
+                if (idx > 0) {
+                    [wherekey appendString:@","];
                 }
+                [values addObject:vlist_obj];
+            }];
+            [wherekey appendString:@")"];
+        }
+        else {
+            if (wherekey.length > 0) {
+                [wherekey appendFormat:@" and %@=?", key];
             }
             else {
-                if (wherekey.length > 0) {
-                    [wherekey appendFormat:@" and %@=?", key];
-                }
-                else {
-                    [wherekey appendFormat:@" %@=?", key];
-                }
-
-                [values addObject:va];
+                [wherekey appendFormat:@" %@=?", key];
             }
+            [values addObject:obj];
         }
-    }
-
-    return wherekey;
+    }];
+    return [wherekey copy];
 }
 
 // where sql statements about model primary keys
@@ -447,17 +451,32 @@ - (NSMutableString*)primaryKeyWhereSQLWithModel:(NSObject*)model addPValues:(NSM
 }
 
 #pragma mark - set key
-- (void)setEncryptionKey:(NSString*)encryptionKey
+-(BOOL)setKey:(NSString *)key
 {
-    _encryptionKey = encryptionKey;
-
-    if (_bindingQueue && (encryptionKey.length > 0)) {
-        [self executeDB:^(FMDatabase* db) {
-            [db setKey:_encryptionKey];
+    _encryptionKey = [key copy];
+    __block BOOL success = NO;
+    if (_bindingQueue && (_encryptionKey.length > 0)) {
+        [self executeDB:^(FMDatabase *db) {
+           success = [db setKey:_encryptionKey];
         }];
     }
+    return success;
+}
+-(BOOL)rekey:(NSString *)key
+{
+    _encryptionKey = [key copy];
+    __block BOOL success = NO;
+    if (_bindingQueue && (_encryptionKey.length > 0)) {
+        [self executeDB:^(FMDatabase *db) {
+            success = [db rekey:_encryptionKey];
+        }];
+    }
+    return success;
+}
+-(NSString *)encryptionKey
+{
+    return _encryptionKey;
 }
-
 #pragma mark - dealloc
 - (void)dealloc
 {
@@ -749,7 +768,7 @@ - (void)rowCount:(Class)modelClass where:(id)where callback:(void (^)(NSInteger)
 {
     if (callback) {
         LKDBCode_Async_Begin
-            NSInteger result = [sself rowCountWithTableName:[modelClass getTableName] where:where];
+        NSInteger result = [sself rowCountWithTableName:[modelClass getTableName] where:where];
         callback(result);
         LKDBCode_Async_End
     }
@@ -793,7 +812,7 @@ - (void)search:(Class)modelClass where:(id)where orderBy:(NSString*)orderBy offs
 {
     if (block) {
         LKDBCode_Async_Begin
-            LKDBQueryParams* params = [[LKDBQueryParams alloc] init];
+        LKDBQueryParams* params = [[LKDBQueryParams alloc] init];
         params.toClass = modelClass;
 
         if ([where isKindOfClass:[NSDictionary class]]) {
@@ -897,7 +916,7 @@ - (NSMutableArray*)searchWithParams:(LKDBQueryParams*)params
 {
     if (params.callback) {
         LKDBCode_Async_Begin
-            NSMutableArray* array = [sself searchBaseWithParams:params];
+        NSMutableArray* array = [sself searchBaseWithParams:params];
         params.callback(array);
         LKDBCode_Async_End return nil;
     }
@@ -1094,7 +1113,7 @@ - (BOOL)insertToDB:(NSObject*)model
 - (void)insertToDB:(NSObject*)model callback:(void (^)(BOOL))block
 {
     LKDBCode_Async_Begin
-        BOOL result = [sself insertBase:model];
+    BOOL result = [sself insertBase:model];
 
     if (block) {
         block(result);
@@ -1115,7 +1134,7 @@ - (BOOL)insertWhenNotExists:(NSObject*)model
 - (void)insertWhenNotExists:(NSObject*)model callback:(void (^)(BOOL))block
 {
     LKDBCode_Async_Begin
-        BOOL result = [sself insertWhenNotExists:model];
+    BOOL result = [sself insertWhenNotExists:model];
 
     if (block) {
         block(result);
@@ -1220,7 +1239,7 @@ - (BOOL)updateToDB:(NSObject*)model where:(id)where
 - (void)updateToDB:(NSObject*)model where:(id)where callback:(void (^)(BOOL))block
 {
     LKDBCode_Async_Begin
-        BOOL result = [sself updateToDBBase:model where:where];
+    BOOL result = [sself updateToDBBase:model where:where];
 
     if (block) {
         block(result);
@@ -1352,7 +1371,7 @@ - (BOOL)deleteToDB:(NSObject*)model
 - (void)deleteToDB:(NSObject*)model callback:(void (^)(BOOL))block
 {
     LKDBCode_Async_Begin
-        BOOL isDeleted = [sself deleteToDBBase:model];
+    BOOL isDeleted = [sself deleteToDBBase:model];
 
     if (block) {
         block(isDeleted);
@@ -1412,7 +1431,7 @@ - (BOOL)deleteWithClass:(Class)modelClass where:(id)where
 - (void)deleteWithClass:(Class)modelClass where:(id)where callback:(void (^)(BOOL))block
 {
     LKDBCode_Async_Begin
-        BOOL isDeleted = [sself deleteWithTableName:[modelClass getTableName] where:where];
+    BOOL isDeleted = [sself deleteWithTableName:[modelClass getTableName] where:where];
 
     if (block) {
         block(isDeleted);
@@ -1552,6 +1571,15 @@ + (void)clearFileWithTable:(Class)modelClass columns:(NSArray*)columns type:(NSI
 @end
 
 @implementation LKDBHelper (Deprecated_Nonfunctional)
+-(void)setEncryptionKey:(NSString *)encryptionKey
+{
+    _encryptionKey = [encryptionKey copy];
+    if (_bindingQueue && (_encryptionKey.length > 0)) {
+        [self executeDB:^(FMDatabase* db) {
+            [db setKey:_encryptionKey];
+        }];
+    }
+}
 + (LKDBHelper*)sharedDBHelper
 {
     return [LKDBHelper getUsingLKDBHelper];

LKDBHelper/Helper/LKDBUtils.h

@@ -32,6 +32,9 @@
 + (NSString*)stringWithDate:(NSDate*)date;
 ///把String 转换成Date
 + (NSDate*)dateWithString:(NSString*)str;
+///单例formatter
++ (NSNumberFormatter*)numberFormatter;
+
 @end
 
 #ifdef DEBUG