code clean & bug fix

Author: ljh

LKDBHelper/Helper/LKDB+Mapping.h

@@ -39,27 +39,27 @@
 @interface LKDBProperty : NSObject
 
 ///保存的方式
-@property (readonly, copy, nonatomic) NSString* type;
+@property (nonatomic, copy, readonly) NSString* type;
 
 ///保存到数据的  列名
-@property (readonly, copy, nonatomic) NSString* sqlColumnName;
+@property (nonatomic, copy, readonly) NSString* sqlColumnName;
 ///保存到数据的类型
-@property (readonly, copy, nonatomic) NSString* sqlColumnType;
+@property (nonatomic, copy, readonly) NSString* sqlColumnType;
 
 ///属性名
-@property (readonly, copy, nonatomic) NSString* propertyName;
+@property (nonatomic, copy, readonly) NSString* propertyName;
 ///属性的类型
-@property (readonly, copy, nonatomic) NSString* propertyType;
+@property (nonatomic, copy, readonly) NSString* propertyType;
 
 ///属性的Protocol
 //@property(readonly,copy,nonatomic)NSString* propertyProtocol;
 
 ///creating table's column
-@property BOOL isUnique;
-@property BOOL isNotNull;
-@property (copy, nonatomic) NSString* defaultValue;
-@property (copy, nonatomic) NSString* checkValue;
-@property NSInteger length;
+@property (nonatomic, assign) BOOL isUnique;
+@property (nonatomic, assign) BOOL isNotNull;
+@property (nonatomic, copy) NSString* defaultValue;
+@property (nonatomic, copy) NSString* checkValue;
+@property (nonatomic, assign) NSInteger length;
 
 - (BOOL)isUserCalculate;
 @end
@@ -68,8 +68,8 @@
 
 - (id)initWithKeyMapping:(NSDictionary*)keyMapping propertyNames:(NSArray*)propertyNames propertyType:(NSArray*)propertyType primaryKeys:(NSArray*)primaryKeys;
 
-@property (readonly, nonatomic) NSUInteger count;
-@property (readonly, nonatomic) NSArray* primaryKeys;
+@property (nonatomic, readonly) NSUInteger count;
+@property (nonatomic, readonly) NSArray* primaryKeys;
 
 - (LKDBProperty*)objectWithIndex:(NSInteger)index;
 - (LKDBProperty*)objectWithPropertyName:(NSString*)propertyName;

LKDBHelper/Helper/LKDB+Mapping.m

@@ -23,13 +23,13 @@ - (void)updateProperty:(LKDBProperty*)property propertyName:(NSString*)propertyN
 
 #pragma mark - 声明属性
 @interface LKDBProperty ()
-@property (copy, nonatomic) NSString* type;
+@property (nonatomic, copy) NSString* type;
 
-@property (copy, nonatomic) NSString* sqlColumnName;
-@property (copy, nonatomic) NSString* sqlColumnType;
+@property (nonatomic, copy) NSString* sqlColumnName;
+@property (nonatomic, copy) NSString* sqlColumnType;
 
-@property (copy, nonatomic) NSString* propertyName;
-@property (copy, nonatomic) NSString* propertyType;
+@property (nonatomic, copy) NSString* propertyName;
+@property (nonatomic, copy) NSString* propertyType;
 
 - (id)initWithType:(NSString*)type cname:(NSString*)cname ctype:(NSString*)ctype pname:(NSString*)pname ptype:(NSString*)ptype;
 @end

LKDBHelper/Helper/LKDBHelper.m

@@ -44,18 +44,15 @@ - (void)setDb_inserting:(BOOL)db_inserting;
 @end
 
 @interface LKDBWeakObject : NSObject
-@property (LKDBWeak, nonatomic) LKDBHelper* obj;
+@property (nonatomic, LKDBWeak) LKDBHelper* obj;
 @end
 
 @interface LKDBHelper ()
-
-@property (strong, nonatomic) NSMutableArray* createdTableNames;
-
-@property (LKDBWeak, nonatomic) FMDatabase* usingdb;
-@property (strong, nonatomic) FMDatabaseQueue* bindingQueue;
-@property (copy, nonatomic) NSString* dbPath;
-
-@property (strong, nonatomic) NSRecursiveLock* threadLock;
+@property (nonatomic, LKDBWeak) FMDatabase* usingdb;
+@property (nonatomic, strong) FMDatabaseQueue* bindingQueue;
+@property (nonatomic, copy) NSString* dbPath;
+@property (nonatomic, strong) NSMutableArray* createdTableNames;
+@property (nonatomic, strong) NSRecursiveLock* threadLock;
 @end
 
 @implementation LKDBHelper
@@ -204,13 +201,12 @@ - (void)setDBPath:(NSString*)filePath
                                   withIntermediateDirectories:YES
                                                    attributes:attributes
                                                         error:&error];
-
             if (success == NO) {
                 LKErrorLog(@"create dir error: %@", error.debugDescription);
             }
         }
         else {
-/**
+            /**
              *  @brief  Disk I/O error when device is locked
              *          https://github.com/ccgus/fmdb/issues/262
              */
@@ -226,19 +222,19 @@ - (void)setDBPath:(NSString*)filePath
 
     self.dbPath = filePath;
     [self.bindingQueue close];
+    [self.createdTableNames removeAllObjects];
 
 #ifndef SQLITE_OPEN_FILEPROTECTION_NONE
 #define SQLITE_OPEN_FILEPROTECTION_NONE 0x00400000
 #endif
-
     self.bindingQueue = [[FMDatabaseQueue alloc] initWithPath:filePath
                                                         flags:SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FILEPROTECTION_NONE];
 #ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
     if ([fileManager fileExistsAtPath:filePath]) {
         [fileManager setAttributes:@{ NSFileProtectionKey : NSFileProtectionNone } ofItemAtPath:filePath error:nil];
     }
 #endif
-
+    
     ///reset encryptionKey
     _encryptionKey = nil;
 
@@ -263,6 +259,7 @@ - (void)executeDB:(void (^)(FMDatabase* db))block
     else {
         if (self.bindingQueue == nil) {
             self.bindingQueue = [[FMDatabaseQueue alloc] initWithPath:_dbPath];
+            [self.createdTableNames removeAllObjects];
             [self.bindingQueue inDatabase:^(FMDatabase* db) {
                 db.logsErrors = LKDBLogErrorEnable;
                 if (_encryptionKey.length > 0) {

LKDBHelper/Helper/LKDBUtils.h

@@ -95,22 +95,22 @@ extern NSString* LKSQLTypeFromObjcType(NSString* objcType);
 @interface LKDBQueryParams : NSObject
 
 ///columns or array
-@property (strong, nonatomic) NSString* columns;
-@property (strong, nonatomic) NSArray* columnArray;
+@property (nonatomic, copy) NSString* columns;
+@property (nonatomic, copy) NSArray* columnArray;
 
-@property (strong, nonatomic) NSString* tableName;
+@property (nonatomic, copy) NSString* tableName;
 
 ///where or dic
-@property (strong, nonatomic) NSString* where;
-@property (strong, nonatomic) NSDictionary* whereDic;
+@property (nonatomic, copy) NSString* where;
+@property (nonatomic, copy) NSDictionary* whereDic;
 
-@property (strong, nonatomic) NSString* groupBy;
-@property (strong, nonatomic) NSString* orderBy;
+@property (nonatomic, copy) NSString* groupBy;
+@property (nonatomic, copy) NSString* orderBy;
 
-@property (assign, nonatomic) NSInteger offset;
-@property (assign, nonatomic) NSInteger count;
+@property (nonatomic, assign) NSInteger offset;
+@property (nonatomic, assign) NSInteger count;
 
-@property (assign, nonatomic) Class toClass;
+@property (nonatomic, assign) Class toClass;
 
-@property (copy, nonatomic) void (^callback)(NSMutableArray* results);
+@property (nonatomic, copy) void (^callback)(NSMutableArray* results);
 @end

LKDBHelper/Helper/LKDBUtils.m

@@ -9,7 +9,7 @@
 #import "LKDBUtils.h"
 
 @interface LKDateFormatter : NSDateFormatter
-@property (strong, nonatomic) NSRecursiveLock* lock;
+@property (nonatomic, strong) NSRecursiveLock* lock;
 @end
 
 @implementation LKDateFormatter

LKDBHelper/Helper/NSObject+LKModel.h

@@ -26,17 +26,17 @@
 /**
  *  if you set it will use it as a table name
  */
-@property (copy, nonatomic) NSString* db_tableName;
+@property (nonatomic, copy) NSString* db_tableName;
 
 /**
  *  the model is inserting ..
  */
-@property (readonly, nonatomic) BOOL db_inserting;
+@property (nonatomic, readonly) BOOL db_inserting;
 
 /**
  *  sqlite comes with rowid
  */
-@property NSInteger rowid;
+@property (nonatomic, assign) NSInteger rowid;
 
 /**
  *  overwrite in your models, if your table has primary key