update deps to tags + add group by

Author: tanner0101

Package.swift

@@ -12,10 +12,10 @@ let package = Package(
         .package(url: "https://github.com/vapor/core.git", from: "3.0.0"),
 
         // Swift ORM framework (queries, models, and relations) for building NoSQL and SQL database integrations.
-        .package(url: "https://github.com/vapor/fluent.git", .branch("sql")),
+        .package(url: "https://github.com/vapor/fluent.git", from: "3.0.0-rc"),
 
         // 🐘 Non-blocking, event-driven Swift client for PostgreSQL.
-        .package(url: "https://github.com/vapor/postgresql.git", .branch("sql")),
+        .package(url: "https://github.com/vapor/postgresql.git", from: "1.0.0-rc"),
     ],
     targets: [
         .target(name: "FluentPostgreSQL", dependencies: ["Async", "FluentSQL", "PostgreSQL"]),

Sources/FluentPostgreSQL/Deprecated.swift

@@ -16,12 +16,3 @@ public protocol PostgreSQLEnumType { }
 // - warning: Deprecated.
 @available(*, deprecated, message: "Use custom migration instead.")
 public protocol PostgreSQLType { }
-
-
-//extension QueryBuilder where Database == PostgreSQLDatabase {
-//    /// - warning: Deprecated.
-//    @available(*, deprecated, renamed: "groupBy(_:)")
-//    public func group<T>(by field: KeyPath<Result, T>) -> Self {
-//        return groupBy(field)
-//    }
-//}

Sources/FluentPostgreSQL/FluentPostgreSQLQuery.swift

@@ -24,6 +24,7 @@ public struct FluentPostgreSQLQuery: FluentSQLQuery {
     public typealias SelectExpression = PostgreSQLSelectExpression
     public typealias Join = PostgreSQLJoin
     public typealias OrderBy = PostgreSQLOrderBy
+    public typealias GroupBy = PostgreSQLGroupBy
     public typealias Upsert = PostgreSQLUpsert
 
     public var statement: Statement
@@ -33,6 +34,7 @@ public struct FluentPostgreSQLQuery: FluentSQLQuery {
     public var joins: [Join]
     public var predicate: Expression?
     public var orderBy: [OrderBy]
+    public var groupBy: [GroupBy]
     public var limit: Int?
     public var offset: Int?
     public var upsert: PostgreSQLUpsert?
@@ -47,6 +49,7 @@ public struct FluentPostgreSQLQuery: FluentSQLQuery {
             joins: [],
             predicate: nil,
             orderBy: [],
+            groupBy: [],
             limit: nil,
             offset: nil,
             upsert: nil,

Sources/FluentPostgreSQL/PostgreSQLDatabase+QuerySupporting.swift

@@ -75,6 +75,7 @@ extension PostgreSQLDatabase: QuerySupporting {
             select.joins = fluent.joins
             select.predicate = fluent.predicate
             select.orderBy = fluent.orderBy
+            select.groupBy = fluent.groupBy
             select.limit = fluent.limit
             select.offset = fluent.offset
             query = .select(select)