Merge pull request vapor#105 from vapor/sql-2-1

sql 2.1 updates

Author: tanner0101

Sources/PostgreSQL/SQL/PostgreSQLDropIndex.swift

@@ -13,29 +13,29 @@ public struct PostgreSQLDropIndex: SQLDropIndex {
 }
 
 /// Builds `PostgreSQLDropIndex` queries.
-public final class PostgreSQLDropIndexBuilder<Connection>: SQLQueryBuilder
-    where Connection: SQLConnection, Connection.Query == PostgreSQLQuery
+public final class PostgreSQLDropIndexBuilder<Connectable>: SQLQueryBuilder
+    where Connectable: SQLConnectable, Connectable.Connection.Query == PostgreSQLQuery
 {
     /// `AlterTable` query being built.
     public var dropIndex: PostgreSQLDropIndex
 
     /// See `SQLQueryBuilder`.
-    public var connection: Connection
+    public var connectable: Connectable
 
     /// See `SQLQueryBuilder`.
     public var query: PostgreSQLQuery {
         return .dropIndex(dropIndex)
     }
 
     /// Creates a new `SQLCreateIndexBuilder`.
-    public init(_ dropIndex: PostgreSQLDropIndex, on connection: Connection) {
+    public init(_ dropIndex: PostgreSQLDropIndex, on connectable: Connectable) {
         self.dropIndex = dropIndex
-        self.connection = connection
+        self.connectable = connectable
     }
 }
 
 
-extension SQLConnection where Query == PostgreSQLQuery {
+extension SQLConnectable where Connection.Query == PostgreSQLQuery {
     /// Creates a `PostgreSQLDropIndexBuilder` for this connection.
     public func drop(index identifier: PostgreSQLIdentifier) -> PostgreSQLDropIndexBuilder<Self> {
         return .init(PostgreSQLDropIndex(identifier: identifier), on: self)

Sources/PostgreSQL/SQL/PostgreSQLInsert.swift

@@ -50,7 +50,7 @@ public struct PostgreSQLInsert: SQLInsert {
     }
 }
 
-extension SQLInsertBuilder where Connection.Query.Insert == PostgreSQLInsert {
+extension SQLInsertBuilder where Connectable.Connection.Query.Insert == PostgreSQLInsert {
     /// Adds a `RETURNING` expression to the insert query.
     public func returning(_ exprs: PostgreSQLSelectExpression...) -> Self {
         insert.returning += exprs

Sources/PostgreSQL/SQL/PostgreSQLUpsert.swift

@@ -28,7 +28,7 @@ public struct PostgreSQLUpsert: SQLSerializable {
     }
 }
 
-extension SQLInsertBuilder where Connection.Query.Insert == PostgreSQLInsert {
+extension SQLInsertBuilder where Connectable.Connection.Query.Insert == PostgreSQLInsert {
     /// Adds an `ON CONFLICT ... DO UPDATE SET` clause to the insert.
     public func onConflict<T, V, E>(_ key: KeyPath<T, V>, set value: E) -> Self where
         T: PostgreSQLTable, E: Encodable