Merge branch 'james/enum' of https://github.com/dolthub/go-mysql-server into james/enum

Author: James Cor

enginetest/queries/script_queries.go

@@ -7690,11 +7690,11 @@ where
 		},
 		Assertions: []ScriptTestAssertion{
 			{
-				Query: "insert into t values (1, 500)",
+				Query:          "insert into t values (1, 500)",
 				ExpectedErrStr: "value 500 is not valid for this Enum",
 			},
 			{
-				Query: "insert into t values (1, -1)",
+				Query:          "insert into t values (1, -1)",
 				ExpectedErrStr: "value -1 is not valid for this Enum",
 			},
 		},

sql/expression/enum.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,7 +20,7 @@ import (
 
 // EnumToString is an expression that converts an enum value to a string.
 type EnumToString struct {
-	Enum     sql.Expression
+	Enum sql.Expression
 }
 
 var _ sql.Expression = (*EnumToString)(nil)
@@ -90,4 +90,4 @@ func (e *EnumToString) String() string {
 // DebugString implements the sql.Expression interface.
 func (e *EnumToString) DebugString() string {
 	return sql.DebugString(e.Enum)
-}
+}

sql/planbuilder/factory.go

@@ -15,8 +15,9 @@
 package planbuilder
 
 import (
+	"strings"
+
 	"github.com/dolthub/go-mysql-server/sql/types"
-"strings"
 
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/expression"

sql/types/enum.go

@@ -301,7 +301,7 @@ func (t EnumType) At(idx int) (string, bool) {
 		return "", false
 	}
 	// The elements listed in the column specification are assigned index numbers, beginning with 1.
-	return t.idxToVal[idx - 1], true
+	return t.idxToVal[idx-1], true
 }
 
 // CharacterSet implements EnumType interface.