Skip to content

Commit

Permalink
expression: fix wrong result for unsigned non-const int cmp const dur…
Browse files Browse the repository at this point in the history
…ation (#46620)

close #45410
  • Loading branch information
wshwsh12 authored Sep 6, 2023
1 parent e8b590c commit ca69622
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
12 changes: 11 additions & 1 deletion expression/integration_test/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7824,7 +7824,7 @@ func TestIfFunctionWithNull(t *testing.T) {
testkit.Rows("20000 35100"))
}

func TestIssue41733(t *testing.T) {
func TestIssue41733AndIssue45410(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
tk.MustExec("create database testIssue41733")
Expand Down Expand Up @@ -7855,4 +7855,14 @@ func TestIssue41733(t *testing.T) {
tk.MustExec("INSERT IGNORE INTO t_big(c0) VALUES (1E20)")
tk.MustQuery("show warnings").Check(testkit.Rows("Warning 1264 Out of range value for column 'c0' at row 1"))
tk.MustQuery("select * from t_big;").Check(testkit.Rows("18446744073709551615"))

// Issue 45410
tk.MustExec("create database testIssue45410")
defer tk.MustExec("drop database testIssue45410")
tk.MustExec("use testIssue45410")

tk.MustExec("DROP TABLE IF EXISTS t1;")
tk.MustExec("CREATE TABLE t1 (c1 TINYINT(1) UNSIGNED NOT NULL );")
tk.MustExec("INSERT INTO t1 VALUES (0);")
tk.MustQuery("SELECT c1>=CAST('-787360724' AS TIME) FROM t1;").Check(testkit.Rows("1"))
}
7 changes: 4 additions & 3 deletions types/datum.go
Original file line number Diff line number Diff line change
Expand Up @@ -1216,9 +1216,10 @@ func (d *Datum) convertToUint(sc *stmtctx.StatementContext, target *FieldType) (
case KindMysqlDuration:
dec := d.GetMysqlDuration().ToNumber()
err = dec.Round(dec, 0, ModeHalfUp)
ival, err1 := dec.ToInt()
if err1 == nil {
val, err = ConvertIntToUint(sc, ival, upperBound, tp)
var err1 error
val, err1 = ConvertDecimalToUint(sc, dec, upperBound, tp)
if err == nil {
err = err1
}
case KindMysqlDecimal:
val, err = ConvertDecimalToUint(sc, d.GetMysqlDecimal(), upperBound, tp)
Expand Down

0 comments on commit ca69622

Please sign in to comment.