Support union primary key 支持联合主键

overwrite -(NSArray*)getPrimaryKeyUnionArray

Author: li6185377

LKDBHelper/Helper/LKDB+Mapping.h

@@ -76,9 +76,10 @@ extern inline NSString* LKSQLTypeFromObjcType(NSString *objcType);
 
 @interface LKModelInfos : NSObject
 
--(id)initWithKeyMapping:(NSDictionary*)keyMapping propertyNames:(NSArray*)propertyNames propertyType:(NSArray*)propertyType;
+-(id)initWithKeyMapping:(NSDictionary*)keyMapping propertyNames:(NSArray*)propertyNames propertyType:(NSArray*)propertyType primaryKeys:(NSArray*)primaryKeys;
 
 @property(readonly,nonatomic)int count;
+@property(readonly,nonatomic)NSArray* primaryKeys;
 
 -(LKDBProperty*)objectWithIndex:(int)index;
 -(LKDBProperty*)objectWithPropertyName:(NSString*)propertyName;

LKDBHelper/Helper/LKDB+Mapping.m

@@ -40,6 +40,7 @@ @interface LKModelInfos()
 {
     __strong NSMutableDictionary* _proNameDic;
     __strong NSMutableDictionary* _sqlNameDic;
+    __strong NSMutableArray* _primaryKeys;
 }
 -(void)removeWithColumeName:(NSString*)columeName;
 @end
@@ -100,11 +101,13 @@ +(void)removePropertyWithColumeName:(NSString *)columename
 #pragma mark- LKModelInfos
 
 @implementation LKModelInfos
-- (id)initWithKeyMapping:(NSDictionary *)keyMapping propertyNames:(NSArray *)propertyNames propertyType:(NSArray *)propertyType
+- (id)initWithKeyMapping:(NSDictionary *)keyMapping propertyNames:(NSArray *)propertyNames propertyType:(NSArray *)propertyType primaryKeys:(NSArray *)primaryKeys
 {
     self = [super init];
     if (self) {
 
+        _primaryKeys = [primaryKeys copy];
+        
         _proNameDic = [[NSMutableDictionary alloc]init];
         _sqlNameDic = [[NSMutableDictionary alloc]init];
 
@@ -187,6 +190,10 @@ -(void)addDBPropertyWithType:(NSString *)type cname:(NSString *)colume_name ctyp
         [_sqlNameDic setObject:db_property forKey:db_property.sqlColumeName];
     }
 }
+-(NSArray *)primaryKeys
+{
+    return _primaryKeys;
+}
 -(int)count
 {
     return _sqlNameDic.count;

LKDBHelper/Helper/LKDBHelper.m

@@ -182,7 +182,49 @@ -(NSString*)dictionaryToSqlWhere:(NSDictionary*)dic andValues:(NSMutableArray*)v
     }
     return wherekey;
 }
-
+//where sql statements about model primary keys
+-(NSMutableString*)primaryKeyWhereSQLWithModel:(NSObject*)model addPValues:(NSMutableArray*)addPValues
+{
+    LKModelInfos* infos = [model.class getModelInfos];
+    NSArray* primaryKeys = infos.primaryKeys;
+    NSMutableString* pwhere = [NSMutableString string];
+    if(primaryKeys.count>0)
+    {
+        for (int i=0; i<primaryKeys.count; i++) {
+            NSString* pk = [primaryKeys objectAtIndex:i];
+            if([LKDBUtils checkStringIsEmpty:pk] == NO)
+            {
+                LKDBProperty* property = [infos objectWithSqlColumeName:pk];
+                id pvalue = nil;
+                if(property && [property.type isEqualToString:LKSQLUserCalculate])
+                {
+                    pvalue = [model userGetValueForModel:property];
+                }
+                else if(pk && property)
+                {
+                    pvalue = [model modelGetValue:property];
+                }
+                
+                if(pvalue)
+                {
+                    if(pwhere.length>0)
+                        [pwhere appendString:@"and"];
+                    
+                    if(addPValues)
+                    {
+                        [pwhere appendFormat:@" %@=? ",pk];
+                        [addPValues addObject:pvalue];
+                    }
+                    else
+                    {
+                        [pwhere appendFormat:@" %@='%@' ",pk,pvalue];
+                    }
+                }
+            }
+        }
+    }
+    return pwhere;
+}
 #pragma mark- dealloc
 -(void)dealloc
 {
@@ -265,7 +307,7 @@ -(BOOL)createTableWithModelClass:(Class)modelClass
                 isTableCreated = YES;
             }
             [set close];
-         }];
+        }];
         if(isTableCreated)
         {
             //已创建表 就跳过
@@ -274,7 +316,8 @@ -(BOOL)createTableWithModelClass:(Class)modelClass
     }
 
     LKModelInfos* infos = [modelClass getModelInfos];
-    NSString* primaryKey = [modelClass getPrimaryKey];
+    NSArray* primaryKeys = infos.primaryKeys;
+    
     NSMutableString* table_pars = [NSMutableString string];
     for (int i=0; i<infos.count; i++) {
 
@@ -309,13 +352,21 @@ -(BOOL)createTableWithModelClass:(Class)modelClass
         {
             [table_pars appendFormat:@" %@ %@",LKSQLDefault,property.defaultValue];
         }
-        if(primaryKey && [property.sqlColumeName isEqualToString:primaryKey])
-        {
-            [table_pars appendFormat:@" %@",LKSQLPrimaryKey];
+    }
+    NSMutableString* pksb = [NSMutableString string];
+    if(primaryKeys.count>0)
+    {
+        pksb = [NSMutableString stringWithString:@",primary key("];
+        for (int i=0; i<primaryKeys.count; i++) {
+            NSString* pk = [primaryKeys objectAtIndex:i];
+            if(i>0)
+                [pksb appendString:@","];
+            
+            [pksb appendString:pk];
         }
+        [pksb appendString:@")"];
     }
-    NSString* createTableSQL = [NSString stringWithFormat:@"CREATE TABLE IF NOT EXISTS %@(%@)",tableName,table_pars];
-    
+    NSString* createTableSQL = [NSString stringWithFormat:@"CREATE TABLE IF NOT EXISTS %@(%@%@)",tableName,table_pars,pksb];
 
     BOOL isCreated = [self executeSQL:createTableSQL arguments:nil];
 
@@ -424,9 +475,8 @@ -(void)sqlString:(NSMutableString*)sql AddOder:(NSString*)orderby offset:(int)of
     {
         [sql appendFormat:@" order by %@",orderby];
     }
-    
-    // Add limit & offset only when count > 0
-    if (count > 0) {
+    if(count>0)
+    {
         [sql appendFormat:@" limit %d offset %d",count,offset];
     }
 }
@@ -530,7 +580,7 @@ -(BOOL)insertBase:(NSObject*)model{
 
     //拼接insertSQL 语句  采用 replace 插入
     NSString* insertSQL = [NSString stringWithFormat:@"replace into %@(%@) values(%@)",[modelClass getTableName],insertKey,insertValuesString];
-
+    
     __block BOOL execute = NO;
     __block int lastInsertRowId = 0;
 
@@ -586,7 +636,7 @@ -(BOOL)updateToDBBase:(NSObject *)model where:(id)where
         [updateValues addObject:value];
     }
 
-    NSMutableString* updateSQL = [NSMutableString stringWithFormat:@"update %@ set %@ where",[modelClass getTableName],updateKey];
+    NSMutableString* updateSQL = [NSMutableString stringWithFormat:@"update %@ set %@ where ",[modelClass getTableName],updateKey];
 
     //添加where 语句
     if([where isKindOfClass:[NSString class]] && [LKDBUtils checkStringIsEmpty:where]== NO)
@@ -608,19 +658,13 @@ -(BOOL)updateToDBBase:(NSObject *)model where:(id)where
     else
     {
         //如果不通过 rowid 来 更新数据  那 primarykey 一定要有值
-        NSString* primaryKey = [modelClass  getPrimaryKey];
-        if([LKDBUtils checkStringIsEmpty:primaryKey] == NO)
+        NSString* pwhere = [self primaryKeyWhereSQLWithModel:model addPValues:updateValues];
+        if(pwhere.length ==0)
         {
-            LKDBProperty* property = [infos objectWithSqlColumeName:primaryKey];
-            if(property)
-            {
-                [updateSQL appendFormat:@" %@=?",property.sqlColumeName];
-                
-                id value = [self modelValueWithProperty:property model:model];
-                
-                [updateValues addObject:value];
-            }
+            LKLog(@"database update fail : %@ no find primary key!",NSStringFromClass(modelClass));
+            return NO;
         }
+        [updateSQL appendString:pwhere];
     }
 
     BOOL execute = [self executeSQL:updateSQL arguments:updateValues];
@@ -671,31 +715,26 @@ -(BOOL)deleteToDBBase:(NSObject *)model
     [modelClass dbWillDelete:model];
 
     NSMutableString*  deleteSQL =[NSMutableString stringWithFormat:@"delete from %@ where ",[modelClass getTableName]];
-    id primaryValue = nil;
+    NSMutableArray* parsArray = [NSMutableArray array];
     if(model.rowid > 0)
     {
-        [deleteSQL appendFormat:@" rowid = %d",model.rowid];
+        [deleteSQL appendFormat:@"rowid = %d",model.rowid];
     }
     else
     {
-        primaryValue = [model getPrimaryValue];
-        if(primaryValue)
-        {
-            NSString* primarykey = [modelClass  getPrimaryKey];
-            [deleteSQL appendFormat:@" %@=? ",primarykey];
-        }
-        else
+        NSString* pwhere = [self primaryKeyWhereSQLWithModel:model addPValues:parsArray];
+        if(pwhere.length==0)
         {
             LKLog(@"delete fail : %@ primary value is nil",NSStringFromClass(modelClass));
             return NO;
         }
+        [deleteSQL appendString:pwhere];
     }
 
-    NSArray* array = nil;
-    if(primaryValue)
-        array = [NSArray arrayWithObject:primaryValue];
+    if(parsArray.count==0)
+        parsArray = nil;
 
-    BOOL execute = [self executeSQL:deleteSQL arguments:array];
+    BOOL execute = [self executeSQL:deleteSQL arguments:parsArray];
 
     //callback
     [modelClass dbDidIDeleted:model result:execute];
@@ -726,6 +765,7 @@ -(BOOL)deleteWithClassBase:(Class)modelClass where:(id)where
     BOOL result = [self executeSQL:deleteSQL arguments:values];
     return result;
 }
+
 #pragma mark - other operation
 -(BOOL)isExistsModel:(NSObject *)model
 {
@@ -734,19 +774,13 @@ -(BOOL)isExistsModel:(NSObject *)model
         return YES;
     else
     {
-        Class modelClass = model.class;
-        
-        NSString* primarykey = [modelClass getPrimaryKey];
-        id primaryValue = [model getPrimaryValue];
-        
-        if(primarykey&&primaryValue)
+        NSMutableString* pwhere = [self primaryKeyWhereSQLWithModel:model addPValues:nil];
+        if(pwhere.length == 0)
         {
-            NSString* where = [NSString stringWithFormat:@"%@ = '%@'",primarykey,primaryValue];
-            return [self isExistsClass:modelClass where:where];
+            LKLog(@"exists model fail: primary key is nil or invalid");
+            return NO;
         }
-        
-        LKLog(@"exists model fail: primary key is nil or invalid");
-        return NO;
+        return [self isExistsClass:model.class where:pwhere];
     }
 }
 -(BOOL)isExistsClass:(Class)modelClass where:(id)where

LKDBHelper/Helper/LKDBUtils.m

@@ -8,6 +8,28 @@
 
 #import "LKDBUtils.h"
 
+@interface LKDateFormatter : NSDateFormatter
+@property(strong,nonatomic)NSLock* lock;
+@end
+
+@implementation LKDateFormatter
+//防止在IOS5下 多线程 格式化时间时 崩溃
+-(NSDate *)dateFromString:(NSString *)string
+{
+    [_lock lock];
+    NSDate* date = [super dateFromString:string];
+    [_lock unlock];
+    return date;
+}
+-(NSString *)stringFromDate:(NSDate *)date
+{
+    [_lock lock];
+    NSString* string = [super stringFromDate:date];
+    [_lock unlock];
+    return string;
+}
+@end
+
 @implementation LKDBUtils
 +(NSString *)getDocumentPath
 {
@@ -40,7 +62,7 @@ +(BOOL)isFileExists:(NSString *)filepath
 }
 +(BOOL)deleteWithFilepath:(NSString *)filepath
 {
-   return [[NSFileManager defaultManager] removeItemAtPath:filepath error:nil];
+    return [[NSFileManager defaultManager] removeItemAtPath:filepath error:nil];
 }
 +(NSArray*)getFilenamesWithDir:(NSString*)dir
 {
@@ -49,7 +71,7 @@ +(NSArray*)getFilenamesWithDir:(NSString*)dir
     return fileList;
 }
 +(BOOL)checkStringIsEmpty:(NSString *)string
-{ 
+{
     if(string == nil)
     {
         return YES;
@@ -67,7 +89,7 @@ +(NSDateFormatter*)getDBDateFormat
     static NSDateFormatter* format;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        format = [[NSDateFormatter alloc]init];
+        format = [[LKDateFormatter alloc]init];
         format.dateFormat = @"yyyy-MM-dd HH:mm:ss";
     });
     return format;

LKDBHelper/Helper/NSObject+LKModel.h

@@ -29,6 +29,8 @@
             主键列名 如果rowid<0 则跟据此名称update 和delete
  */
 +(NSString*)getPrimaryKey;
+//return multi primary key    返回联合主键
++(NSArray*) getPrimaryKeyUnionArray;
 
 @property int rowid;