table: Don't cast date default values (same as timestamp/datetime) (#…

…59049) close #59047
pingcap · Jan 23, 2025 · b181a7b · b181a7b
1 parent e0726e7
commit b181a7b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/ddl/db_partition_test.go b/ddl/db_partition_test.go
@@ -4903,3 +4903,12 @@ func TestIssue54829(t *testing.T) {
 }
 
 // TODO: check EXCHANGE how it handles null (for all types of partitioning!!!)
+
+func TestIssue59047(t *testing.T) {
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec(`create table t (id bigint primary key, name varchar(20))`)
+	tk.MustExec(`alter table t add column d date not null`)
+	tk.MustExec(`update t set name = 'x'`)
+}
diff --git a/table/column.go b/table/column.go
@@ -568,7 +568,9 @@ func getColDefaultValue(ctx sessionctx.Context, col *model.ColumnInfo, defaultVa
 		return getColDefaultValueFromNil(ctx, col, args)
 	}
 
-	if col.GetType() != mysql.TypeTimestamp && col.GetType() != mysql.TypeDatetime {
+	switch col.GetType() {
+	case mysql.TypeTimestamp, mysql.TypeDate, mysql.TypeDatetime:
+	default:
 		value, err := CastValue(ctx, types.NewDatum(defaultVal), col, false, false)
 		if err != nil {
 			return types.Datum{}, err