Merge branch 'master' of https://github.com/li6185377/LKDBHelper-SQLite-ORM

Author: li6185377

LKDBHelper/Helper/LKDBHelper.h

@@ -126,6 +126,15 @@
  */
 - (NSMutableArray*)searchWithRAWSQL:(NSString*)sql toClass:(Class)modelClass;
 
+/**
+ *  query sql, query finished result is an array(model instance collection)
+ *  you can use the "@t" replace Model TableName and replace all ? placeholders with the va_list
+ *  example:
+ NSMutableArray* array = [[LKDBHelper getUsingLKDBHelper] searc:[ModelClass class] withSQL:@"select rowid from name_table where name = ?", @"Swift"];
+ *
+ */
+-(NSMutableArray *)search:(Class)modelClass withSQL:(NSString *)sql,...;
+
 /**
     columns may NSArray or NSString   if query column count == 1  return single column string array
     other return models entity array

LKDBHelper/Helper/LKDBHelper.m

@@ -620,10 +620,6 @@ - (BOOL)_createTableWithModelClass:(Class)modelClass tableName:(NSString*)tableN
 
         NSString* columnType = property.sqlColumnType;
 
-        if ([columnType isEqualToString:LKSQL_Type_Double]) {
-            columnType = LKSQL_Type_Text;
-        }
-
         [table_pars appendFormat:@"%@ %@", property.sqlColumnName, columnType];
 
         if ([property.sqlColumnType isEqualToString:LKSQL_Type_Text]) {
@@ -937,29 +933,36 @@ - (NSMutableArray*)searchBase:(Class)modelClass columns:(id)columns where:(id)wh
     return [self searchBaseWithParams:params];
 }
 
+- (NSString *)replaceTableNameIfNeeded:(NSString *)sql withModelClass:(Class)modelClass
+{
+	// replace @t to model table name
+	NSString* replaceString = [[modelClass getTableName] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+	if ([sql hasSuffix:@" @t"]) {
+		sql = [sql stringByAppendingString:@" "];
+	}
+	if ([sql componentsSeparatedByString:@" from "].count == 2 && [sql rangeOfString:@" join "].length == 0) {
+		sql = [sql stringByReplacingOccurrencesOfString:@" from " withString:[NSString stringWithFormat:@",%@.rowid from ", replaceString]];
+	}
+	
+	sql = [sql stringByReplacingOccurrencesOfString:@" @t "
+										 withString:
+		   [NSString stringWithFormat:@" %@ ", replaceString]];
+	sql = [sql stringByReplacingOccurrencesOfString:@" @t,"
+										 withString:
+		   [NSString stringWithFormat:@" %@,", replaceString]];
+	sql = [sql stringByReplacingOccurrencesOfString:@",@t "
+										 withString:
+		   [NSString stringWithFormat:@",%@ ", replaceString]];
+	
+	return sql;
+}
+
 - (NSMutableArray*)searchWithSQL:(NSString*)sql toClass:(Class)modelClass
 {
-    // replace @t to model table name
-    NSString* replaceString = [[modelClass getTableName] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-    if ([sql hasSuffix:@" @t"]) {
-        sql = [sql stringByAppendingString:@" "];
-    }
-    if ([sql componentsSeparatedByString:@" from "].count == 2 && [sql rangeOfString:@" join "].length == 0) {
-        sql = [sql stringByReplacingOccurrencesOfString:@" from " withString:[NSString stringWithFormat:@",%@.rowid from ", replaceString]];
-    }
-
-    sql = [sql stringByReplacingOccurrencesOfString:@" @t "
-                                         withString:
-                                             [NSString stringWithFormat:@" %@ ", replaceString]];
-    sql = [sql stringByReplacingOccurrencesOfString:@" @t,"
-                                         withString:
-                                             [NSString stringWithFormat:@" %@,", replaceString]];
-    sql = [sql stringByReplacingOccurrencesOfString:@",@t "
-                                         withString:
-                                             [NSString stringWithFormat:@",%@ ", replaceString]];
-
+	sql = [self replaceTableNameIfNeeded:sql withModelClass:modelClass];
     return [self searchWithRAWSQL:sql toClass:modelClass];
 }
+		
 - (NSMutableArray*)searchWithRAWSQL:(NSString*)sql toClass:(Class)modelClass
 {
     __block NSMutableArray* results = nil;
@@ -971,6 +974,25 @@ - (NSMutableArray*)searchWithRAWSQL:(NSString*)sql toClass:(Class)modelClass
     return results;
 }
 
+- (NSMutableArray*)search:(Class)modelClass withSQL:(NSString*)sql, ...
+{
+	va_list args;
+	va_start(args, sql);
+	
+	sql = [self replaceTableNameIfNeeded:sql withModelClass:modelClass];
+	
+	va_list *argsPoint = &args;
+	__block NSMutableArray *results = nil;
+	[self executeDB:^(FMDatabase *db) {
+		FMResultSet *set = [db executeQuery:sql withVAList:*argsPoint];
+		results = [self executeResult:set Class:modelClass tableName:nil];
+		[set close];
+	}];
+	
+	va_end(args);
+	return results;
+}
+
 - (void)sqlString:(NSMutableString*)sql groupBy:(NSString*)groupBy orderBy:(NSString*)orderby offset:(NSInteger)offset count:(NSInteger)count
 {
     if ([LKDBUtils checkStringIsEmpty:groupBy] == NO) {
@@ -1549,4 +1571,4 @@ + (LKDBHelper*)getUsingLKDBHelper
 
 @implementation LKDBWeakObject
 
-@end
+@end