Swift 1.2 stuff.

src/extra/Swift extensions/FMDatabaseAdditionsVariadic.swift

@@ -15,12 +15,12 @@ extension FMDatabase {
     ///
     /// :returns: This returns the T value if value is found. Returns nil if column is NULL or upon error.
     
-    private func valueForQuery<T>(sql: String, values: NSArray?, completionHandler:(FMResultSet)->(T!)) -> T! {
+    private func valueForQuery<T>(sql: String, values: [AnyObject]?, completionHandler:(FMResultSet)->(T!)) -> T! {
         var result: T!
         
         if let rs = executeQuery(sql, withArgumentsInArray: values) {
             if rs.next() {
-                let obj = rs.objectForColumnIndex(0) as NSObject
+                let obj: AnyObject! = rs.objectForColumnIndex(0)
                 if !(obj is NSNull) {
                     result = completionHandler(rs)
                 }
@@ -40,7 +40,7 @@ extension FMDatabase {
     /// :returns: This returns string value if value is found. Returns nil if column is NULL or upon error.
     
     func stringForQuery(sql: String, _ values: AnyObject...) -> String! {
-        return valueForQuery(sql, values: values as NSArray) { $0.stringForColumnIndex(0) }
+        return valueForQuery(sql, values: values) { $0.stringForColumnIndex(0) }
     }
     
     /// This is a rendition of intForQuery that handles Swift variadic parameters
@@ -52,7 +52,7 @@ extension FMDatabase {
     /// :returns: This returns integer value if value is found. Returns nil if column is NULL or upon error.
     
     func intForQuery(sql: String, _ values: AnyObject...) -> Int32! {
-        return valueForQuery(sql, values: values as NSArray) { $0.intForColumnIndex(0) }
+        return valueForQuery(sql, values: values) { $0.intForColumnIndex(0) }
     }
     
     /// This is a rendition of longForQuery that handles Swift variadic parameters
@@ -64,7 +64,7 @@ extension FMDatabase {
     /// :returns: This returns long value if value is found. Returns nil if column is NULL or upon error.
     
     func longForQuery(sql: String, _ values: AnyObject...) -> Int! {
-        return valueForQuery(sql, values: values as NSArray) { $0.longForColumnIndex(0) }
+        return valueForQuery(sql, values: values) { $0.longForColumnIndex(0) }
     }
     
     /// This is a rendition of boolForQuery that handles Swift variadic parameters
@@ -76,7 +76,7 @@ extension FMDatabase {
     /// :returns: This returns Bool value if value is found. Returns nil if column is NULL or upon error.
     
     func boolForQuery(sql: String, _ values: AnyObject...) -> Bool! {
-        return valueForQuery(sql, values: values as NSArray) { $0.boolForColumnIndex(0) }
+        return valueForQuery(sql, values: values) { $0.boolForColumnIndex(0) }
     }
     
     /// This is a rendition of doubleForQuery that handles Swift variadic parameters
@@ -88,7 +88,7 @@ extension FMDatabase {
     /// :returns: This returns Double value if value is found. Returns nil if column is NULL or upon error.
     
     func doubleForQuery(sql: String, _ values: AnyObject...) -> Double! {
-        return valueForQuery(sql, values: values as NSArray) { $0.doubleForColumnIndex(0) }
+        return valueForQuery(sql, values: values) { $0.doubleForColumnIndex(0) }
     }
     
     /// This is a rendition of dateForQuery that handles Swift variadic parameters
@@ -100,7 +100,7 @@ extension FMDatabase {
     /// :returns: This returns NSDate value if value is found. Returns nil if column is NULL or upon error.
     
     func dateForQuery(sql: String, _ values: AnyObject...) -> NSDate! {
-        return valueForQuery(sql, values: values as NSArray) { $0.dateForColumnIndex(0) }
+        return valueForQuery(sql, values: values) { $0.dateForColumnIndex(0) }
     }
     
     /// This is a rendition of dataForQuery that handles Swift variadic parameters
@@ -112,6 +112,6 @@ extension FMDatabase {
     /// :returns: This returns NSData value if value is found. Returns nil if column is NULL or upon error.
     
     func dataForQuery(sql: String, _ values: AnyObject...) -> NSData! {
-        return valueForQuery(sql, values: values as NSArray) { $0.dataForColumnIndex(0) }
+        return valueForQuery(sql, values: values) { $0.dataForColumnIndex(0) }
     }
-}
+}

src/extra/Swift extensions/FMDatabaseVariadic.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 extension FMDatabase {
-
+    
     /// This is a rendition of executeQuery that handles Swift variadic parameters
     /// for the values to be bound to the ? placeholders in the SQL.
     ///
@@ -17,11 +17,11 @@ extension FMDatabase {
     /// :param: values The values to be bound to the ? placeholders
     ///
     /// :returns: This returns FMResultSet if successful. Returns nil upon error.
-
+    
     func executeQuery(sql:String, _ values: AnyObject...) -> FMResultSet? {
-        return executeQuery(sql, withArgumentsInArray: values as NSArray);
+        return executeQuery(sql, withArgumentsInArray: values as [AnyObject]);
     }
-
+    
     /// This is a rendition of executeUpdate that handles Swift variadic parameters
     /// for the values to be bound to the ? placeholders in the SQL.
     ///
@@ -29,8 +29,8 @@ extension FMDatabase {
     /// :param: values The values to be bound to the ? placeholders
     ///
     /// :returns: This returns true if successful. Returns false upon error.
-
+    
     func executeUpdate(sql:String, _ values: AnyObject...) -> Bool {
-        return executeUpdate(sql, withArgumentsInArray: values as NSArray);
+        return executeUpdate(sql, withArgumentsInArray: values as [AnyObject]);
     }
-}
+}