解决冲突

Author: zhangao0086

.DS_Store

@@ -0,0 +1,24 @@
+build/
+**/build
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+*.hmap
+*.ipa
+*.xcuserstate
+.DS_Store
+*.DS_Store
+**/.DS_Store
+**/xcuserdata
+**/DerivedData
+
+# emacs backup files
+*~

.gitignore

@@ -1,6 +1,6 @@
 {
   "name": "LKDBHelper",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "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.4"
+    "tag": "2.1.6"
   },
   "platforms": {
     "ios": "4.3",

LKDBHelper.podspec.json

@@ -8,7 +8,7 @@
 
 #import "LKDBUtils.h"
 
-@interface NSObject(TableMapping)
+@interface NSObject (TableMapping)
 
 /**
  *	@brief Overwrite in your models if your property names don't match your Table Column names.
@@ -17,64 +17,62 @@
  @{ sql column name : ( model property name ) or LKDBInherit or LKDBUserCalculate}
  
  */
-+(NSDictionary*)getTableMapping;
++ (NSDictionary*)getTableMapping;
 
 /***
  simple set a column as "LKSQL_Mapping_UserCalculate"
  column name
 */
-+(void)setUserCalculateForCN:(NSString*)columnName;
++ (void)setUserCalculateForCN:(NSString*)columnName;
 
 ///property type name
-+(void)setUserCalculateForPTN:(NSString*)propertyTypeName;
++ (void)setUserCalculateForPTN:(NSString*)propertyTypeName;
 
 ///binding columnName to PropertyName
-+(void)setTableColumnName:(NSString*)columnName bindingPropertyName:(NSString*)propertyName;
++ (void)setTableColumnName:(NSString*)columnName bindingPropertyName:(NSString*)propertyName;
 
 ///remove unwanted binding property
-+(void)removePropertyWithColumnName:(NSString*)columnName;
-+(void)removePropertyWithColumnNameArray:(NSArray*)columnNameArray;
++ (void)removePropertyWithColumnName:(NSString*)columnName;
++ (void)removePropertyWithColumnNameArray:(NSArray*)columnNameArray;
 @end
 
 @interface LKDBProperty : NSObject
 
 ///保存的方式
-@property(readonly,copy,nonatomic)NSString* type;
+@property (readonly, copy, nonatomic) NSString* type;
 
 ///保存到数据的  列名
-@property(readonly,copy,nonatomic)NSString* sqlColumnName;
+@property (readonly, copy, nonatomic) NSString* sqlColumnName;
 ///保存到数据的类型
-@property(readonly,copy,nonatomic)NSString* sqlColumnType;
+@property (readonly, copy, nonatomic) NSString* sqlColumnType;
 
 ///属性名
-@property(readonly,copy,nonatomic)NSString* propertyName;
+@property (readonly, copy, nonatomic) NSString* propertyName;
 ///属性的类型
-@property(readonly,copy,nonatomic)NSString* propertyType;
+@property (readonly, copy, nonatomic) 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 (copy, nonatomic) NSString* defaultValue;
+@property (copy, nonatomic) NSString* checkValue;
 @property NSInteger length;
 
--(BOOL)isUserCalculate;
+- (BOOL)isUserCalculate;
 @end
 
-
 @interface LKModelInfos : NSObject
 
--(id)initWithKeyMapping:(NSDictionary*)keyMapping propertyNames:(NSArray*)propertyNames propertyType:(NSArray*)propertyType primaryKeys:(NSArray*)primaryKeys;
+- (id)initWithKeyMapping:(NSDictionary*)keyMapping propertyNames:(NSArray*)propertyNames propertyType:(NSArray*)propertyType primaryKeys:(NSArray*)primaryKeys;
 
-@property(readonly,nonatomic)NSUInteger count;
-@property(readonly,nonatomic)NSArray* primaryKeys;
+@property (readonly, nonatomic) NSUInteger count;
+@property (readonly, nonatomic) NSArray* primaryKeys;
 
--(LKDBProperty*)objectWithIndex:(NSInteger)index;
--(LKDBProperty*)objectWithPropertyName:(NSString*)propertyName;
--(LKDBProperty*)objectWithSqlColumnName:(NSString*)columnName;
+- (LKDBProperty*)objectWithIndex:(NSInteger)index;
+- (LKDBProperty*)objectWithPropertyName:(NSString*)propertyName;
+- (LKDBProperty*)objectWithSqlColumnName:(NSString*)columnName;
 
 @end