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

CONVERT_TZ should return NULL if its arguments are invalid. (#11161) (#11176) #11359

Merged
merged 3 commits into from
Jul 23, 2019
Merged

CONVERT_TZ should return NULL if its arguments are invalid. (#11161) (#11176) #11359

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29ecd9d
CONVERT_TZ should return NULL if its arguments are invalid. (#11161)
Jul 10, 2019
8420801
Merge branch 'release-3.0' into automated-cherry-pick-of-#11176-upstr…
SunRunAway Jul 22, 2019
efe4592
Merge branch 'release-3.0' into automated-cherry-pick-of-#11176-upstr…
zz-jason Jul 23, 2019
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
19 changes: 10 additions & 9 deletions expression/builtin_time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5101,21 +5101,22 @@ func (b *builtinConvertTzSig) Clone() builtinFunc {
}

// evalTime evals CONVERT_TZ(dt,from_tz,to_tz).
// `CONVERT_TZ` function returns NULL if the arguments are invalid.
// See https://dev.mysql.com/doc/refman/5.7/en/date-and-time-functions.html#function_convert-tz
func (b *builtinConvertTzSig) evalTime(row chunk.Row) (types.Time, bool, error) {
dt, isNull, err := b.args[0].EvalTime(b.ctx, row)
if isNull || err != nil {
return types.Time{}, true, err
return types.Time{}, true, nil
}

fromTzStr, isNull, err := b.args[1].EvalString(b.ctx, row)
if isNull || err != nil {
return types.Time{}, true, err
if isNull || err != nil || fromTzStr == "" {
return types.Time{}, true, nil
}

toTzStr, isNull, err := b.args[2].EvalString(b.ctx, row)
if isNull || err != nil {
return types.Time{}, true, err
if isNull || err != nil || toTzStr == "" {
return types.Time{}, true, nil
}

fromTzMatched := b.timezoneRegex.MatchString(fromTzStr)
Expand All @@ -5124,17 +5125,17 @@ func (b *builtinConvertTzSig) evalTime(row chunk.Row) (types.Time, bool, error)
if !fromTzMatched && !toTzMatched {
fromTz, err := time.LoadLocation(fromTzStr)
if err != nil {
return types.Time{}, true, err
return types.Time{}, true, nil
}

toTz, err := time.LoadLocation(toTzStr)
if err != nil {
return types.Time{}, true, err
return types.Time{}, true, nil
}

t, err := dt.Time.GoTime(fromTz)
if err != nil {
return types.Time{}, true, err
return types.Time{}, true, nil
}

return types.Time{
Expand All @@ -5146,7 +5147,7 @@ func (b *builtinConvertTzSig) evalTime(row chunk.Row) (types.Time, bool, error)
if fromTzMatched && toTzMatched {
t, err := dt.Time.GoTime(time.Local)
if err != nil {
return types.Time{}, true, err
return types.Time{}, true, nil
}

return types.Time{
Expand Down
19 changes: 14 additions & 5 deletions expression/builtin_time_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2437,8 +2437,8 @@ func (s *testEvaluatorSuite) TestSecToTime(c *C) {
func (s *testEvaluatorSuite) TestConvertTz(c *C) {
tests := []struct {
t interface{}
fromTz string
toTz string
fromTz interface{}
toTz interface{}
Success bool
expect string
}{
Expand All @@ -2450,20 +2450,29 @@ func (s *testEvaluatorSuite) TestConvertTz(c *C) {
{"2004-01-01 12:00:00", "-00:00", "+13:00", true, "2004-01-02 01:00:00"},
{"2004-01-01 12:00:00", "-00:00", "-13:00", true, ""},
{"2004-01-01 12:00:00", "-00:00", "-12:88", true, ""},
{"2004-01-01 12:00:00", "+10:82", "GMT", false, ""},
{"2004-01-01 12:00:00", "+10:82", "GMT", true, ""},
{"2004-01-01 12:00:00", "+00:00", "GMT", true, ""},
{"2004-01-01 12:00:00", "GMT", "+00:00", true, ""},
{20040101, "+00:00", "+10:32", true, "2004-01-01 10:32:00"},
{3.14159, "+00:00", "+10:32", true, ""},
{"2004-01-01 12:00:00", "", "GMT", true, ""},
{"2004-01-01 12:00:00", "GMT", "", true, ""},
{"2004-01-01 12:00:00", "a", "GMT", true, ""},
{"2004-01-01 12:00:00", "0", "GMT", true, ""},
{"2004-01-01 12:00:00", "GMT", "a", true, ""},
{"2004-01-01 12:00:00", "GMT", "0", true, ""},
{nil, "GMT", "+00:00", true, ""},
{"2004-01-01 12:00:00", nil, "+00:00", true, ""},
{"2004-01-01 12:00:00", "GMT", nil, true, ""},
}
fc := funcs[ast.ConvertTz]
for _, test := range tests {
f, err := fc.getFunction(s.ctx,
s.datumsToConstants(
[]types.Datum{
types.NewDatum(test.t),
types.NewStringDatum(test.fromTz),
types.NewStringDatum(test.toTz)}))
types.NewDatum(test.fromTz),
types.NewDatum(test.toTz)}))
c.Assert(err, IsNil)
d, err := evalBuiltinFunc(f, chunk.Row{})
if test.Success {
Expand Down
13 changes: 10 additions & 3 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1790,9 +1790,16 @@ func (s *testIntegrationSuite) TestTimeBuiltin(c *C) {
// for convert_tz
result = tk.MustQuery(`select convert_tz("2004-01-01 12:00:00", "+00:00", "+10:32"), convert_tz("2004-01-01 12:00:00.01", "+00:00", "+10:32"), convert_tz("2004-01-01 12:00:00.01234567", "+00:00", "+10:32");`)
result.Check(testkit.Rows("2004-01-01 22:32:00 2004-01-01 22:32:00.01 2004-01-01 22:32:00.012346"))
// TODO: release the following test after fix #4462
//result = tk.MustQuery(`select convert_tz(20040101, "+00:00", "+10:32"), convert_tz(20040101.01, "+00:00", "+10:32"), convert_tz(20040101.01234567, "+00:00", "+10:32");`)
//result.Check(testkit.Rows("2004-01-01 10:32:00 2004-01-01 10:32:00.00 2004-01-01 10:32:00.000000"))
result = tk.MustQuery(`select convert_tz(20040101, "+00:00", "+10:32"), convert_tz(20040101.01, "+00:00", "+10:32"), convert_tz(20040101.01234567, "+00:00", "+10:32");`)
result.Check(testkit.Rows("2004-01-01 10:32:00 2004-01-01 10:32:00.00 2004-01-01 10:32:00.000000"))
result = tk.MustQuery(`select convert_tz(NULL, "+00:00", "+10:32"), convert_tz("2004-01-01 12:00:00", NULL, "+10:32"), convert_tz("2004-01-01 12:00:00", "+00:00", NULL);`)
result.Check(testkit.Rows("<nil> <nil> <nil>"))
result = tk.MustQuery(`select convert_tz("a", "+00:00", "+10:32"), convert_tz("2004-01-01 12:00:00", "a", "+10:32"), convert_tz("2004-01-01 12:00:00", "+00:00", "a");`)
result.Check(testkit.Rows("<nil> <nil> <nil>"))
result = tk.MustQuery(`select convert_tz("", "+00:00", "+10:32"), convert_tz("2004-01-01 12:00:00", "", "+10:32"), convert_tz("2004-01-01 12:00:00", "+00:00", "");`)
result.Check(testkit.Rows("<nil> <nil> <nil>"))
result = tk.MustQuery(`select convert_tz("0", "+00:00", "+10:32"), convert_tz("2004-01-01 12:00:00", "0", "+10:32"), convert_tz("2004-01-01 12:00:00", "+00:00", "0");`)
result.Check(testkit.Rows("<nil> <nil> <nil>"))

// for from_unixtime
tk.MustExec(`set @@session.time_zone = "+08:00"`)
Expand Down