Commit 7658f62

committed

update deps to tags + add group by

1 parent 9fa5ed7 commit 7658f62Copy full SHA for 7658f62

File tree

-11

lines changed

-11

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ let package = Package(`
`12`	`12`	`.package(url: "https://github.com/vapor/core.git", from: "3.0.0"),`
`13`	`13`
`14`	`14`	`// Swift ORM framework (queries, models, and relations) for building NoSQL and SQL database integrations.`
`15`		`- .package(url: "https://github.com/vapor/fluent.git", .branch("sql")),`
	`15`	`+ .package(url: "https://github.com/vapor/fluent.git", from:"3.0.0-rc"),`
`16`	`16`
`17`	`17`	`// 🐘 Non-blocking, event-driven Swift client for PostgreSQL.`
`18`		`- .package(url: "https://github.com/vapor/postgresql.git", .branch("sql")),`
	`18`	`+ .package(url: "https://github.com/vapor/postgresql.git", from:"1.0.0-rc"),`
`19`	`19`	`],`
`20`	`20`	`targets: [`
`21`	`21`	`.target(name: "FluentPostgreSQL", dependencies: ["Async", "FluentSQL", "PostgreSQL"]),`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,3 @@ public protocol PostgreSQLEnumType { }`
`16`	`16`	`// - warning: Deprecated.`
`17`	`17`	`@available(*, deprecated, message: "Use custom migration instead.")`
`18`	`18`	`public protocol PostgreSQLType { }`
`19`		`-`
`20`		`-`
`21`		`-//extension QueryBuilder where Database == PostgreSQLDatabase {`
`22`		`-// /// - warning: Deprecated.`
`23`		`-// @available(*, deprecated, renamed: "groupBy(_:)")`
`24`		`-// public func group<T>(by field: KeyPath<Result, T>) -> Self {`
`25`		`-// return groupBy(field)`
`26`		`-// }`
`27`		`-//}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public struct FluentPostgreSQLQuery: FluentSQLQuery {`
`24`	`24`	`public typealias SelectExpression = PostgreSQLSelectExpression`
`25`	`25`	`public typealias Join = PostgreSQLJoin`
`26`	`26`	`public typealias OrderBy = PostgreSQLOrderBy`
	`27`	`+ public typealias GroupBy = PostgreSQLGroupBy`
`27`	`28`	`public typealias Upsert = PostgreSQLUpsert`
`28`	`29`
`29`	`30`	`public var statement: Statement`
`@@ -33,6 +34,7 @@ public struct FluentPostgreSQLQuery: FluentSQLQuery {`
`33`	`34`	`public var joins: [Join]`
`34`	`35`	`public var predicate: Expression?`
`35`	`36`	`public var orderBy: [OrderBy]`
	`37`	`+ public var groupBy: [GroupBy]`
`36`	`38`	`public var limit: Int?`
`37`	`39`	`public var offset: Int?`
`38`	`40`	`public var upsert: PostgreSQLUpsert?`
`@@ -47,6 +49,7 @@ public struct FluentPostgreSQLQuery: FluentSQLQuery {`
`47`	`49`	`joins: [],`
`48`	`50`	`predicate: nil,`
`49`	`51`	`orderBy: [],`
	`52`	`+ groupBy: [],`
`50`	`53`	`limit: nil,`
`51`	`54`	`offset: nil,`
`52`	`55`	`upsert: nil,`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ extension PostgreSQLDatabase: QuerySupporting {`
`75`	`75`	`select.joins = fluent.joins`
`76`	`76`	`select.predicate = fluent.predicate`
`77`	`77`	`select.orderBy = fluent.orderBy`
	`78`	`+ select.groupBy = fluent.groupBy`
`78`	`79`	`select.limit = fluent.limit`
`79`	`80`	`select.offset = fluent.offset`
`80`	`81`	`query = .select(select)`

Comments

(0)