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

sql 2.1 updates

Author: tanner0101

Sources/MySQL/SQL/MySQLAlterTable.swift

@@ -72,7 +72,7 @@ public struct MySQLAlterTable: SQLAlterTable {
     }
 }
 
-extension SQLAlterTableBuilder where Connection.Query.AlterTable == MySQLAlterTable {
+extension SQLAlterTableBuilder where Connectable.Connection.Query.AlterTable == MySQLAlterTable {
     /// Specifies the position of a newly added column in a table relative to an existing column.
     ///
     ///     conn.alter(table: User.self)

Sources/MySQL/SQL/MySQLDropIndex.swift

@@ -18,24 +18,24 @@ public struct MySQLDropIndex: SQLDropIndex {
 }
 
 /// Builds `MySQLDropIndex` queries.
-public final class MySQLDropIndexBuilder<Connection>: SQLQueryBuilder
-    where Connection: SQLConnection, Connection.Query == MySQLQuery
+public final class MySQLDropIndexBuilder<Connectable>: SQLQueryBuilder
+    where Connectable: SQLConnection, Connectable.Connection.Query == MySQLQuery
 {
     /// `AlterTable` query being built.
     public var dropIndex: MySQLDropIndex
 
     /// See `SQLQueryBuilder`.
-    public var connection: Connection
+    public var connectable: Connectable
 
     /// See `SQLQueryBuilder`.
     public var query: MySQLQuery {
         return .dropIndex(dropIndex)
     }
 
     /// Creates a new `SQLCreateIndexBuilder`.
-    public init(_ dropIndex: MySQLDropIndex, on connection: Connection) {
+    public init(_ dropIndex: MySQLDropIndex, on connectable: Connectable) {
         self.dropIndex = dropIndex
-        self.connection = connection
+        self.connectable = connectable
     }
 }
 

Sources/MySQL/SQL/MySQLUpsert.swift

@@ -23,7 +23,7 @@ public struct MySQLUpsert: SQLSerializable {
     }
 }
 
-extension SQLInsertBuilder where Connection.Query.Insert == MySQLInsert {
+extension SQLInsertBuilder where Connectable.Connection.Query.Insert == MySQLInsert {
     /// Adds an `ON DUPLICATE KEY UPDATE` or "upsert" clause to the query.
     ///
     ///     conn.insert(into: Planet.self).value(earth)