insert ignore to enum column truncates data

Author: jennifersp

enginetest/queries/insert_queries.go

@@ -2702,6 +2702,28 @@ var InsertIgnoreScripts = []ScriptTest{
 			},
 		},
 	},
+	{
+		// https://github.com/dolthub/dolt/issues/8611
+		Name: "issue 8611: insert ignore on enum type column",
+		SetUpScript: []string{
+			"create table test_table (x int auto_increment primary key, y enum('hello','bye'))",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:       "insert into test_table values (1, 'invalid'), (2, 'comparative politics'), (3, null)",
+				ExpectedErr: types.ErrConvertingToEnum, // TODO: should be ErrDataTruncatedForColumn
+			},
+			{
+				Query:    "insert ignore into test_table values (1, 'invalid'), (2, 'bye'), (3, null)",
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 3}}},
+				//ExpectedWarning: mysql.ERWarnDataTruncated, // TODO: incorrect code
+			},
+			{
+				Query:    "select * from test_table",
+				Expected: []sql.Row{{1, ""}, {2, "bye"}, {3, nil}},
+			},
+		},
+	},
 }
 
 var IgnoreWithDuplicateUniqueKeyKeylessScripts = []ScriptTest{
@@ -2958,4 +2980,21 @@ var InsertBrokenScripts = []ScriptTest{
 			},
 		},
 	},
+	{
+		// https://github.com/dolthub/dolt/issues/8617
+		Name: "INSERT INTO with ENUM NOT NULL",
+		SetUpScript: []string{
+			"CREATE TABLE test (pk BIGINT PRIMARY KEY NOT NULL, v1 ENUM('a','b','c') NOT NULL);",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "INSERT INTO test (pk) VALUES (1);",
+				Expected: []sql.Row{{types.NewOkResult(1)}},
+			},
+			{
+				Query:    "select * from t2;",
+				Expected: []sql.Row{{1, "a"}},
+			},
+		},
+	},
 }

enginetest/queries/script_queries.go

@@ -4368,7 +4368,7 @@ CREATE TABLE tab3 (
 						time.Date(0, 1, 1, 0, 0, 0, 0, time.UTC),
 						time.Date(0, 1, 1, 0, 0, 0, 0, time.UTC),
 						0,
-						"first",
+						"",
 						"",
 					},
 				},

sql/rowexec/ddl_iters.go

@@ -570,7 +570,7 @@ func (i *modifyColumnIter) rewriteTable(ctx *sql.Context, rwt sql.RewritableTabl
 			oldStr, _ := oldEnum.At(oldIdx)
 			newIdx := newEnum.IndexOf(oldStr)
 			if newIdx == -1 {
-				return false, fmt.Errorf("data truncated for column %s", newCol.Name)
+				return false, types.ErrDataTruncatedForColumn.New(newCol.Name)
 			}
 			newRow[newColIdx] = uint16(newIdx)
 		}

sql/types/enum.go

@@ -41,6 +41,8 @@ const (
 var (
 	ErrConvertingToEnum = errors.NewKind("value %v is not valid for this Enum")
 
+	ErrDataTruncatedForColumn = errors.NewKind("Data truncated for column '%s'")
+
 	enumValueType = reflect.TypeOf(uint16(0))
 )
 
@@ -278,15 +280,17 @@ func (t EnumType) CollationCoercibility(ctx *sql.Context) (collation sql.Collati
 
 // Zero implements Type interface.
 func (t EnumType) Zero() interface{} {
-	// / If an ENUM column is declared NOT NULL, its default value is the first element of the list of permitted values.
-	return uint16(1)
+	// If an ENUM column is declared NOT NULL, its default value is the first element of the list of permitted values.
+	return uint16(0)
 }
 
 // At implements EnumType interface.
 func (t EnumType) At(index int) (string, bool) {
-	// / The elements listed in the column specification are assigned index numbers, beginning with 1.
+	// The elements listed in the column specification are assigned index numbers, beginning with 1.
 	index -= 1
-	if index < 0 || index >= len(t.indexToVal) {
+	if index == -1 {
+		return "", true
+	} else if index >= len(t.indexToVal) {
 		return "", false
 	}
 	return t.indexToVal[index], true

sql/types/enum_test.go

@@ -199,7 +199,7 @@ func TestEnumZero(t *testing.T) {
 			typ := MustCreateEnumType(test.vals, sql.Collation_Default)
 			v, ok := typ.Zero().(uint16)
 			assert.True(t, ok)
-			assert.Equal(t, uint16(1), v)
+			assert.Equal(t, uint16(0), v)
 		})
 	}
 }