Merge branch 'main' into james/group

Author: James Cor

enginetest/queries/script_queries.go

@@ -8078,6 +8078,27 @@ where
 			},
 		},
 	},
+	{
+		Name:    "ensure that special case does not apply for nullable enums",
+		Dialect: "mysql",
+		SetUpScript: []string{
+			"create table t (i int primary key, e enum('abc', 'def', 'ghi'));",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: "insert into t(i) values (1)",
+				Expected: []sql.Row{
+					{types.NewOkResult(1)},
+				},
+			},
+			{
+				Query: "select * from t;",
+				Expected: []sql.Row{
+					{1, nil},
+				},
+			},
+		},
+	},
 	{
 		Name:    "not expression optimization",
 		Dialect: "mysql",

sql/rowexec/insert.go

@@ -87,7 +87,7 @@ func (i *insertIter) Next(ctx *sql.Context) (returnRow sql.Row, returnErr error)
 			break
 		}
 		_, isColDefVal := i.insertExprs[idx].(*sql.ColumnDefaultValue)
-		if row[idx] == nil && types.IsEnum(col.Type) && isColDefVal {
+		if row[idx] == nil && !col.Nullable && types.IsEnum(col.Type) && isColDefVal {
 			row[idx] = 1
 		}
 	}