From 7cf2f363847b0177650616e835ed3872482f2295 Mon Sep 17 00:00:00 2001 From: zachmu Date: Thu, 2 Jun 2022 17:05:21 +0000 Subject: [PATCH] [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh --- go/libraries/doltcore/sqle/enginetest/ddl_queries.go | 3 ++- go/libraries/doltcore/sqle/tables.go | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/ddl_queries.go b/go/libraries/doltcore/sqle/enginetest/ddl_queries.go index 98c0164a6a..2064b15de0 100755 --- a/go/libraries/doltcore/sqle/enginetest/ddl_queries.go +++ b/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 diff --git a/go/libraries/doltcore/sqle/tables.go b/go/libraries/doltcore/sqle/tables.go index 5e14af62f5..cf0f017e50 100644 --- a/go/libraries/doltcore/sqle/tables.go +++ b/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)