Merge branch 'zachmu/ddl-4' of github.com:dolthub/dolt into zachmu/ddl-4

go/libraries/doltcore/sqle/enginetest/ddl_queries.go

@@ -15,9 +15,10 @@
 package enginetest
 
 import (
-	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
 	"github.com/dolthub/go-mysql-server/enginetest/queries"
 	"github.com/dolthub/go-mysql-server/sql"
+
+	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
 )
 
 // Tests in this file are a grab bag of DDL queries, many of them ported from older parts of the Dolt codebase

go/libraries/doltcore/sqle/tables.go

@@ -1159,10 +1159,10 @@ func (t *AlterableDoltTable) RewriteInserter(
 // validateSchemaChange returns an error if the schema change given is not legal
 func validateSchemaChange(
 	tableName string,
-		oldSchema sql.PrimaryKeySchema,
-		newSchema sql.PrimaryKeySchema,
-		oldColumn *sql.Column,
-		newColumn *sql.Column,
+	oldSchema sql.PrimaryKeySchema,
+	newSchema sql.PrimaryKeySchema,
+	oldColumn *sql.Column,
+	newColumn *sql.Column,
 ) error {
 	if newColumn != nil {
 		newCol, err := sqlutil.ToDoltCol(schema.SystemTableReservedMin, newColumn)