ccc

Classes/Database/HDBMgr.h

@@ -53,6 +53,15 @@
 //name: name of db, config in HDBMgrDatasource
 + (FMDatabaseQueue *)queueWithKey:(NSString *)key;
 
+//close queue
++ (void)closeQueue:(NSString *)key;
++ (void)closeAllQueue;
+
+
+
+//reload queue
++ (void)reloadQueue:(NSString *)key;
++ (void)reloadAllQueue;
 
 @end
 

Classes/Database/HDBMgr.m

@@ -66,18 +66,36 @@ - (FMDatabaseQueue *)queueWithKey:(NSString *)key
     });
     return res;
 }
-//- (FMDatabaseQueue *)defaultQueue
-//{
-//    dispatch_sync(self.operateQueue, ^{
-//        if (!_defaultQueue)
-//        {
-//            _defaultQueue = [self queueInitWithKey:[self defaultDatabaseKey]];
-//        }
-//    });
-//    return _defaultQueue;
-//}
-
 
+//close queue
++ (void)closeQueue:(NSString *)key
+{
+    dispatch_sync([HDBMgr shared].operateQueue, ^{
+        FMDatabaseQueue *queue = [HDBMgr shared].queuesDict[key];
+        [queue close];
+        [[HDBMgr shared].queuesDict removeObjectForKey:key];
+    });
+}
++ (void)closeAllQueue
+{
+    dispatch_sync([HDBMgr shared].operateQueue, ^{
+        for (NSString *key in [HDBMgr shared].queuesDict)
+        {
+            FMDatabaseQueue *queue = [HDBMgr shared].queuesDict[key];
+            [queue close];
+        }
+        [[HDBMgr shared].queuesDict removeAllObjects];
+    });
+}
+//reload queue
++ (void)reloadQueue:(NSString *)key
+{
+    [self closeQueue:key];
+}
++ (void)reloadAllQueue
+{
+    [self closeAllQueue];
+}
 #pragma mark - db connect
 - (id<HDBMgrDatasource>)getDBSourceWithKey:(NSString *)key
 {

Classes/Database/HDatabaseDAO.m

@@ -9,7 +9,7 @@
 #import "HDatabaseDAO.h"
 #import "HPropertyMgr.h"
 #import <objc/runtime.h>
-#import <Hodor/HCommon.h>
+#import <Hodor/NSString+ext.h>
 
 
 /**
@@ -56,7 +56,7 @@ - (void)setWithResultSet:(FMResultSet*)result
     self.ID = [result stringForColumn:@"id"];
     self.created = [result longForColumn:@"created"];
     self.modified = [result longForColumn:@"modified"];
-    NSArray *pplist = [[HPropertyMgr shared] entityPropertylist:NSStringFromClass(self.class) isDepSearch:YES];
+    NSArray *pplist = [[HPropertyMgr shared] entityPropertylist:NSStringFromClass(self.class) deepTo:[HEntity class]];
     for (NSString *p in pplist)
     {
         NSArray *exts = [[self class] annotations:p];
@@ -207,8 +207,7 @@ - (BOOL)save:(HEntity *)entity
 - (BOOL)save:(HEntity *)entity keypp:(NSString *)keypp
 {
     if (keypp.length == 0) return NO;
-    NSString *IDValue = [HDatabaseDAO cleanValue:entity.ID];
-    if (![keypp isEqualToString:@"id"]) IDValue = [entity hValueForKey:keypp];
+    NSString *IDValue = [HDatabaseDAO cleanValue:[entity hValueForKey:keypp]];
     if(nil == [self get:IDValue])
     {
         return [self add:entity];
@@ -227,8 +226,8 @@ - (BOOL)add:(HEntity *)entity
 
     [self inDatabase:^(FMDatabase* db)
      {
-         NSArray *pplist = [self entityPropertylist:[entity class] isDepSearch:NO];
-         NSString *fields = [self entityPropertylistString:[entity class] isDepSearch:NO];
+         NSArray *pplist = [self entityPropertylist:[entity class]];
+         NSString *fields = [self entityPropertylistString:[entity class]];
          NSMutableString *values = [[NSMutableString alloc] init];
          int index = 0;
          for (NSString *p in pplist)
@@ -299,7 +298,7 @@ - (BOOL)update:(HEntity *)entity keypp:(NSString *)keypp
     [self inDatabase:^(FMDatabase* db)
      {
          NSMutableString *settes =[[NSMutableString alloc] init];
-         NSArray *pplist = [self entityPropertylist:[entity class] isDepSearch:NO];
+         NSArray *pplist = [self entityPropertylist:[entity class]];
          int index = 0;
          for (NSString *p in pplist)
          {
@@ -313,8 +312,7 @@ - (BOOL)update:(HEntity *)entity keypp:(NSString *)keypp
 
          long nowtime = time(NULL);
          [settes appendFormat:@", modified = '%li'", nowtime];
-         NSString *IDValue = [HDatabaseDAO cleanValue:entity.ID];
-         if (![keypp isEqualToString:@"id"]) IDValue = [entity hValueForKey:keypp];
+         NSString *IDValue = [HDatabaseDAO cleanValue:[entity hValueForKey:keypp]];
          NSString *sql = [NSString stringWithFormat:@"UPDATE %@ SET %@ WHERE %@ = '%@'", [self tableName], settes, keypp, IDValue];
          res = [db executeUpdate:sql];
          if (res)
@@ -331,7 +329,7 @@ - (BOOL)update:(HEntity *)entity keyppList:(NSArray *)keyppList
     [self inDatabase:^(FMDatabase* db)
      {
          NSMutableString *settes =[[NSMutableString alloc] init];
-         NSArray *pplist = [self entityPropertylist:[entity class] isDepSearch:NO];
+         NSArray *pplist = [self entityPropertylist:[entity class]];
          int index = 0;
          for (NSString *p in pplist)
          {
@@ -350,8 +348,7 @@ - (BOOL)update:(HEntity *)entity keyppList:(NSArray *)keyppList
          NSMutableString *whereStatment = [[NSMutableString alloc] init];
          for (NSString *pp in keyppList)
          {
-             id value = [HDatabaseDAO cleanValue:entity.ID];
-             if (![pp isEqualToString:@"id"]) value = [entity hValueForKey:pp];
+             id value = [HDatabaseDAO cleanValue:[entity hValueForKey:pp]];
              [whereStatment appendFormat:@" and %@ = '%@'",pp,[HDatabaseDAO cleanValue:[value stringValue]]];
          }
          NSString *sql = [NSString stringWithFormat:@"UPDATE %@ SET %@ WHERE 1 %@", [self tableName], settes, whereStatment];
@@ -459,8 +456,8 @@ - (BOOL)adds:(NSArray *)entities
     if (![self tableName]) return NO;
     if ([entities count] == 0) return NO;
     Class entityClass = [entities.lastObject class];
-    NSArray *pplist = [self entityPropertylist:entityClass isDepSearch:NO];
-    NSString *fields = [self entityPropertylistString:entityClass isDepSearch:NO];
+    NSArray *pplist = [self entityPropertylist:entityClass];
+    NSString *fields = [self entityPropertylistString:entityClass];
     fields = [fields stringByAppendingString:@",created,modified"];
 
     __block BOOL res = YES;
@@ -725,9 +722,9 @@ - (NSString *)conditonsStringFromDict:(NSDictionary *)dict
 
 
 
-- (NSArray *)entityPropertylist:(Class)entityClass isDepSearch:(BOOL)deepSearch
+- (NSArray *)entityPropertylist:(Class)entityClass
 {
-    NSArray *pplist = [[HPropertyMgr shared] entityPropertylist:NSStringFromClass(entityClass) isDepSearch:deepSearch];
+    NSArray *pplist = [[HPropertyMgr shared] entityPropertylist:NSStringFromClass(entityClass) deepTo:nil];
     NSMutableArray *newPPlist = [NSMutableArray new];
     for (NSString *p in pplist)
     {
@@ -738,9 +735,9 @@ - (NSArray *)entityPropertylist:(Class)entityClass isDepSearch:(BOOL)deepSearch
     }
     return newPPlist;
 }
-- (NSArray<HPropertyDetail *> *)entityPropertyDetailList:(Class)entityClass isDepSearch:(BOOL)deepSearch
+- (NSArray<HPropertyDetail *> *)entityPropertyDetailList:(Class)entityClass
 {
-    NSArray<HPropertyDetail *> *pplist = [[HPropertyMgr shared] entityPropertyDetailList:NSStringFromClass(entityClass) isDepSearch:deepSearch];
+    NSArray<HPropertyDetail *> *pplist = [[HPropertyMgr shared] entityPropertyDetailList:NSStringFromClass(entityClass) deepTo:nil];
     NSMutableArray<HPropertyDetail *> *newPPDetaillist = [NSMutableArray new];
     for (HPropertyDetail *p in pplist)
     {
@@ -754,11 +751,7 @@ - (NSArray *)entityPropertylist:(Class)entityClass isDepSearch:(BOOL)deepSearch
 
 - (NSString *)entityPropertylistString:(Class)entityClass
 {
-    return [self entityPropertylistString:entityClass isDepSearch:YES];
-}
-- (NSString *)entityPropertylistString:(Class)entityClass isDepSearch:(BOOL)deepSearch;
-{
-    NSArray *pplist = [self entityPropertylist:entityClass isDepSearch:deepSearch];
+    NSArray *pplist = [self entityPropertylist:entityClass];
     NSMutableString *fields = [[NSMutableString alloc] init];
     int index = 0;
     for (NSString *p in pplist)

Classes/Database/HEntity+Persistence.m

@@ -57,7 +57,7 @@ + (BOOL)adds:(NSArray *)entities
 - (BOOL)remove
 {
     NSString *keyPP = [self keyProperty];
-    id value = [self hValueForKey:keyPP];
+    id value = [HDatabaseDAO cleanValue:[self hValueForKey:keyPP]];
     return [[self.class dao] remove:[HDatabaseDAO cleanValue:value]];
 }
 - (BOOL)remove:(NSString *)keyppValue

Classes/Entity/HDeserializableObject.h

@@ -9,77 +9,55 @@
 #import <Foundation/Foundation.h>
 #import "HPropertyMgr.h"
 #import <Hodor/NSObject+annotation.h>
+#import "NSObject+HDeserializable.h"
 #pragma mark - defines
 
-//safe get property name
-#define pp_name(k) (self.k?@#k:@#k)
 
 
-#define HPTest(condition, errorInfo) if (!(condition))\
-{\
-self.format_error = [NSString stringWithFormat:@"%@:%@", NSStringFromClass(self.class), errorInfo];\
-NSAssert(NO,self.format_error);\
-return;\
-}
 
-#pragma mark - annotion keys
 
-//ignore property
-#define HPIgnore @"ignore"
 
-//property could be nil
-#define HPOptional @"optional"
 
-//property map to another key name
-#define HPMapto(s) @{@"mapto":s}
 
-//autocast between NSNumber and NSString
-#define HPAutoCast @"autocast"
 
-//value scope, only use for NSNumber
-#define HPScope(from,to) @{@"scope":@{@"from":@(from),@"to":@(to)}}
 
-//inner type, specified the class in array or the class of dictionary
-#define HPInnerType(s) @{@"innertype":s}
 
-//type devide, use on array whose items is of one more type, or use on dictionary whose type if decide by data
-//ie. data has a key 'type', if value == 1 , convert itself to Aclass if (value == 2) convert itself to Bclass
-//you can write like ppx(@"type", @(1), Aclass, @(2), Bclass)
-#define HPDivideType(typekey, type1, class1, ...) @{@"dividetype":@[typekey, type1, class1, __VA_ARGS__]}
 
 
 
+@class HDOPropertyExt;
 
-
-
-
-
-
-
-
-
-
-
-@interface HDeserializableObject : NSObject
+@interface HDeserializableObject : NSObject <NSCopying>
 @property (nonatomic, strong) NSString *format_error;
 
 #pragma mark - basic method
-
+- (instancetype)initWithDictionary:(NSDictionary *)dict;
+- (instancetype)initWithDictionary:(NSDictionary *)dict enableKeyMap:(BOOL)enableKeyMap couldEmpty:(BOOL)couldEmpty;
 
 //set data with dictionary
 - (void)setWithDictionary:(NSDictionary *)dict;
 
 //enableKeyMap: enable key mapping feature in deserialize progress?
 - (void)setWithDictionary:(NSDictionary *)dict enableKeyMap:(BOOL)enableKeyMap;
+- (void)setWithDictionary:(NSDictionary *)dict enableKeyMap:(BOOL)enableKeyMap couldEmpty:(BOOL)couldEmpty;
+//set with anothor obj, just shallow copy
+- (void)setWithDObj:(HDeserializableObject *)obj;
 
 //before data examlation and value setting, you can pre-processing data there, if some error occured, please record to self.format_error and return nil
 - (id)preMapValue:(id)value forKey:(NSString *)key;
-
+//set value to property, you can rewrite it for some special design, if some error occured, please record to self.format_error and return nil
+- (void)setValue:(id)value forProperty:(HPropertyDetail *)ppDetail exts:(HDOPropertyExt *)propertyExts enableKeyMap:(BOOL)enableKeyMap couldEmpty:(BOOL)couldEmpty;
 #pragma mark - advance method
 
 //decide the class in array, according to data, propert info and annotation, if some error occured, please record to self.format_error and return nil
 - (Class)classInArray:(id)item ppDetail:(HPropertyDetail *)ppDetail;
 
 //decide the class of a dictionaty , according to data, propert info and annotation, if some error occured, please record to self.format_error and return nil
 - (Class)classForDictionary:(NSDictionary *)item ppDetail:(HPropertyDetail *)ppDetail;
+
+//create obj
+- (id)createObjectWithClass:(Class)cls;
 @end
+
+
+