Merge pull request #152 from vapor/count-fixes

count fixes

Author: tanner0101

Sources/Fluent/Query/Query.swift

@@ -158,7 +158,20 @@ extension QueryRepresentable {
     public func count() throws -> Int {
         let query = try makeQuery()
         query.action = .count
-        return try query.raw().int ?? 0
+
+        let raw = try query.raw()
+
+        let count: Int
+
+        if let c = raw.int {
+            count = c
+        } else if let c = raw[0, "_fluent_count"]?.int {
+            count = c
+        } else {
+            throw QueryError.notSupported("Count not supported.")
+        }
+
+        return count
     }
 
     //MARK: Create

Sources/Fluent/SQL/GeneralSQLSerializer.swift

@@ -73,7 +73,7 @@ open class GeneralSQLSerializer: SQLSerializer {
             var statement: [String] = []
             var values: [Node] = []
 
-            statement += "SELECT COUNT(*) FROM"
+            statement += "SELECT COUNT(*) as _fluent_count FROM"
             statement += sql(table)
 
             if !unions.isEmpty {

Tests/FluentTests/SQLSerializerTests.swift

@@ -74,7 +74,7 @@ class SQLSerializerTests: XCTestCase {
         let sql = SQL.count(table: "users", filters: [], joins: [])
         let (statement, values) = serialize(sql)
 
-        XCTAssertEqual(statement, "SELECT COUNT(*) FROM `users`")
+        XCTAssertEqual(statement, "SELECT COUNT(*) as _fluent_count FROM `users`")
         XCTAssert(values.isEmpty)
     }
 
@@ -83,7 +83,7 @@ class SQLSerializerTests: XCTestCase {
         let sql = SQL.count(table: "users", filters: [filter], joins: [])
         let (statement, values) = serialize(sql)
 
-        XCTAssertEqual(statement, "SELECT COUNT(*) FROM `users` WHERE `users`.`age` >= ?")
+        XCTAssertEqual(statement, "SELECT COUNT(*) as _fluent_count FROM `users` WHERE `users`.`age` >= ?")
         XCTAssertEqual(values.first?.int, 21)
         XCTAssertEqual(values.count, 1)
     }
@@ -94,7 +94,7 @@ class SQLSerializerTests: XCTestCase {
         let select = SQL.count(table: "friends", filters: [filter], joins: [])
         let (statement, values) = serialize(select)
 
-        XCTAssertEqual(statement, "SELECT COUNT(*) FROM `friends` WHERE `users`.`name` != ?")
+        XCTAssertEqual(statement, "SELECT COUNT(*) as _fluent_count FROM `friends` WHERE `users`.`name` != ?")
         XCTAssertEqual(values.first?.string, "duck")
         XCTAssertEqual(values.count, 1)
     }
@@ -105,7 +105,7 @@ class SQLSerializerTests: XCTestCase {
         let select = SQL.count(table: "friends", filters: [filter], joins: [])
         let (statement, values) = serialize(select)
 
-        XCTAssertEqual(statement, "SELECT COUNT(*) FROM `friends` WHERE `users`.`name` LIKE ?")
+        XCTAssertEqual(statement, "SELECT COUNT(*) as _fluent_count FROM `friends` WHERE `users`.`name` LIKE ?")
         XCTAssertEqual(values.first?.string, "duc%")
         XCTAssertEqual(values.count, 1)
     }

Tests/FluentTests/Utilities/Dummy.swift

@@ -30,6 +30,10 @@ class DummyDriver: Driver {
     }
 
     func query<T: Entity>(_ query: Query<T>) throws -> Node {
+        if query.action == .count {
+            return 0
+        }
+        
         return .array([])
     }