database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ddl: Better error when check constraint is off (#52814)

Browse Source 
close pingcap/tidb#52815
This commit is contained in:
Daniël van Eeden
2024-05-15 11:25:13 +02:00
committed by GitHub
parent 201f2232c5
commit 63cf3e54ae
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/ddl/ddl_api.go
View File

@ -96,6 +96,8 @@ const (
tiflashCheckPendingTablesRetry = 7
)
var errCheckConstraintIsOff = errors.NewNoStackError(variable.TiDBEnableCheckConstraint + " is off")
func (d *ddl) CreateSchema(ctx sessionctx.Context, stmt *ast.CreateDatabaseStmt) (err error) {
var placementPolicyRef *model.PolicyRefInfo
sessionVars := ctx.GetSessionVars()
@ -1254,7 +1256,7 @@ func columnDefToCol(ctx sessionctx.Context, offset int, colDef *ast.ColumnDef, o
ctx.GetSessionVars().StmtCtx.AppendWarning(dbterror.ErrTableCantHandleFt.FastGenByArgs())
case ast.ColumnOptionCheck:
if !variable.EnableCheckConstraint.Load() {
ctx.GetSessionVars().StmtCtx.AppendWarning(errors.NewNoStackError("the switch of check constraint is off"))
ctx.GetSessionVars().StmtCtx.AppendWarning(errCheckConstraintIsOff)
} else {
// Check the column CHECK constraint dependency lazily, after fill all the name.
// Extract column constraint from column option.
@ -2197,7 +2199,7 @@ func BuildTableInfo(
// check constraint
if constr.Tp == ast.ConstraintCheck {
if !variable.EnableCheckConstraint.Load() {
ctx.GetSessionVars().StmtCtx.AppendWarning(errors.NewNoStackError("the switch of check constraint is off"))
ctx.GetSessionVars().StmtCtx.AppendWarning(errCheckConstraintIsOff)
continue
}
// Since column check constraint dependency has been done in columnDefToCol.
@ -3947,7 +3949,7 @@ func (d *ddl) AlterTable(ctx context.Context, sctx sessionctx.Context, stmt *ast
sctx.GetSessionVars().StmtCtx.AppendWarning(dbterror.ErrTableCantHandleFt)
case ast.ConstraintCheck:
if !variable.EnableCheckConstraint.Load() {
sctx.GetSessionVars().StmtCtx.AppendWarning(errors.NewNoStackError("the switch of check constraint is off"))
sctx.GetSessionVars().StmtCtx.AppendWarning(errCheckConstraintIsOff)
} else {
err = d.CreateCheckConstraint(sctx, ident, model.NewCIStr(constr.Name), spec.Constraint)
}
@ -4048,13 +4050,13 @@ func (d *ddl) AlterTable(ctx context.Context, sctx sessionctx.Context, stmt *ast
err = d.AlterIndexVisibility(sctx, ident, spec.IndexName, spec.Visibility)
case ast.AlterTableAlterCheck:
if !variable.EnableCheckConstraint.Load() {
sctx.GetSessionVars().StmtCtx.AppendWarning(errors.NewNoStackError("the switch of check constraint is off"))
sctx.GetSessionVars().StmtCtx.AppendWarning(errCheckConstraintIsOff)
} else {
err = d.AlterCheckConstraint(sctx, ident, model.NewCIStr(spec.Constraint.Name), spec.Constraint.Enforced)
}
case ast.AlterTableDropCheck:
if !variable.EnableCheckConstraint.Load() {
sctx.GetSessionVars().StmtCtx.AppendWarning(errors.NewNoStackError("the switch of check constraint is off"))
sctx.GetSessionVars().StmtCtx.AppendWarning(errCheckConstraintIsOff)
} else {
err = d.DropCheckConstraint(sctx, ident, model.NewCIStr(spec.Constraint.Name))
}

4
tests/integrationtest/r/ddl/constraint.result
View File

@ -606,11 +606,11 @@ set @@global.tidb_enable_check_constraint = 0;
alter table t drop constraint t_chk_1;
show warnings;
Level Code Message
Warning 1105 the switch of check constraint is off
Warning 1105 tidb_enable_check_constraint is off
alter table t alter constraint t_chk_1 not enforced;
show warnings;
Level Code Message
Warning 1105 the switch of check constraint is off
Warning 1105 tidb_enable_check_constraint is off
show create table t;
Table Create Table
t CREATE TABLE `t` (