Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddl, tests: make the error message of the default value expression more appropriate. #51704

Merged
merged 2 commits into from
Mar 12, 2024
Merged

ddl, tests: make the error message of the default value expression more appropriate. #51704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12cfc4b
ddl, tests: update the error message
zimulala Mar 12, 2024
1de619d
Merge branch 'master' into zimuxia/expr-err
zimulala Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions pkg/ddl/ddl_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1341,7 +1341,8 @@ func getFuncCallDefaultValue(col *table.Column, option *ast.ColumnOption, expr *
col.DefaultIsExpr = true
return str, false, nil
}
return nil, false, dbterror.ErrDefValGeneratedNamedFunctionIsNotAllowed.GenWithStackByArgs(col.Name.String(), nowFunc.FnName.String())
return nil, false, dbterror.ErrDefValGeneratedNamedFunctionIsNotAllowed.GenWithStackByArgs(col.Name.String(),
fmt.Sprintf("%s with disallowed args", expr.FnName.String()))
case ast.Replace:
if err := expression.VerifyArgsWrapper(expr.FnName.L, len(expr.Args)); err != nil {
return nil, false, errors.Trace(err)
Expand Down Expand Up @@ -1371,7 +1372,8 @@ func getFuncCallDefaultValue(col *table.Column, option *ast.ColumnOption, expr *
return str, false, nil
}
}
return nil, false, dbterror.ErrDefValGeneratedNamedFunctionIsNotAllowed.GenWithStackByArgs(col.Name.String(), expr.FnName.String())
return nil, false, dbterror.ErrDefValGeneratedNamedFunctionIsNotAllowed.GenWithStackByArgs(col.Name.String(),
fmt.Sprintf("%s with disallowed args", expr.FnName.String()))
case ast.Upper:
if err := expression.VerifyArgsWrapper(expr.FnName.L, len(expr.Args)); err != nil {
return nil, false, errors.Trace(err)
Expand All @@ -1397,7 +1399,8 @@ func getFuncCallDefaultValue(col *table.Column, option *ast.ColumnOption, expr *
return str, false, nil
}
}
return nil, false, dbterror.ErrDefValGeneratedNamedFunctionIsNotAllowed.GenWithStackByArgs(col.Name.String(), expr.FnName.String())
return nil, false, dbterror.ErrDefValGeneratedNamedFunctionIsNotAllowed.GenWithStackByArgs(col.Name.String(),
fmt.Sprintf("%s with disallowed args", expr.FnName.String()))
case ast.StrToDate: // STR_TO_DATE()
if err := expression.VerifyArgsWrapper(expr.FnName.L, len(expr.Args)); err != nil {
return nil, false, errors.Trace(err)
Expand All @@ -1413,7 +1416,8 @@ func getFuncCallDefaultValue(col *table.Column, option *ast.ColumnOption, expr *
return str, false, nil
}
}
return nil, false, dbterror.ErrDefValGeneratedNamedFunctionIsNotAllowed.GenWithStackByArgs(col.Name.String(), fmt.Sprintf("%s with these args", expr.FnName.String()))
return nil, false, dbterror.ErrDefValGeneratedNamedFunctionIsNotAllowed.GenWithStackByArgs(col.Name.String(),
fmt.Sprintf("%s with disallowed args", expr.FnName.String()))
default:
return nil, false, dbterror.ErrDefValGeneratedNamedFunctionIsNotAllowed.GenWithStackByArgs(col.Name.String(), expr.FnName.String())
}
Expand Down
12 changes: 6 additions & 6 deletions tests/integrationtest/r/ddl/default_as_expression.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ create table t (c int(10), c1 varchar(256) default (REPLACE(UPPER(UUID()), '-',
create table t1 (c int(10), c1 int default (REPLACE(UPPER(UUID()), '-', '')), index idx(c1));
create table t2 (c int(10), c1 varchar(256) default (REPLACE(CONVERT(UPPER(UUID()) USING UTF8MB4), '-', '')), index idx(c1));
create table t1 (c int(10), c1 varchar(256) default (REPLACE('xdfj-jfj', '-', '')));
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `REPLACE`.
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `REPLACE with disallowed args`.
create table t1 (c int(10), c1 varchar(256) default (UPPER(UUID())));
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `UPPER`.
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `UPPER with disallowed args`.
create table t1 (c int(10), c1 varchar(256) default (REPLACE(UPPER('dfdkj-kjkl-d'), '-', '')));
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `REPLACE`.
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `REPLACE with disallowed args`.
alter table t add column c2 varchar(32) default (REPLACE(UPPER(UUID()), '-', ''));
Error 1674 (HY000): Statement is unsafe because it uses a system function that may return a different value on the slave
alter table t add column c3 int default (UPPER(UUID()));
Expand Down Expand Up @@ -219,9 +219,9 @@ create table t2 (c int(10), c1 blob default (str_to_date('1980-01-01','%Y-%m-%d'
create table t5 (c int(10), c1 json default (str_to_date('9999-01-01','%Y-%m-%d')), c2 timestamp default (str_to_date('1980-01-01','%Y-%m-%d')));
set session sql_mode=@sqlMode;
create table t6 (c int(10), c1 varchar(32) default (str_to_date(upper('1980-01-01'),'%Y-%m-%d')));
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `str_to_date with these args`.
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `str_to_date with disallowed args`.
create table t6 (c int(10), c1 varchar(32) default (str_to_date('1980-01-01',upper('%Y-%m-%d'))));
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `str_to_date with these args`.
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `str_to_date with disallowed args`.
alter table t0 add column c3 varchar(32) default (str_to_date('1980-01-01','%Y-%m-%d'));
Error 1674 (HY000): Statement is unsafe because it uses a system function that may return a different value on the slave
alter table t0 add column c4 int default (str_to_date('1980-01-01','%Y-%m-%d'));
Expand Down Expand Up @@ -365,7 +365,7 @@ create table t1 (c int(10), c1 int default (upper(substring_index(user(),_utf8mb
create table t2 (c int(10), c1 varchar(256) default (substring_index(user(),'@',1)));
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `substring_index`.
create table t2 (c int(10), c1 varchar(256) default (upper(substring_index('fjks@jkkl','@',1))));
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `upper`.
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `upper with disallowed args`.
create table t2 (c int(10), c1 varchar(256) default (upper(substring_index(user(),'x',1))));
Error 3770 (HY000): Default value expression of column 'c1' contains a disallowed function: `KindString x`.
alter table t add column c2 varchar(32) default (upper(substring_index(user(),'@',1)));
Expand Down