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

Jump to bottom

expression: fix different types compare error #21338

Merged
merged 24 commits into from
Dec 25, 2020
Merged

expression: fix different types compare error #21338

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
313ab85
fix different types compare error and query for bit
zhaoxugang Nov 26, 2020
0ba309c
fix test
zhaoxugang Nov 28, 2020
0664e07
fix test
zhaoxugang Nov 28, 2020
2431753
fix test
zhaoxugang Nov 28, 2020
6ed6dcf
revert undignedFlag of typebit and evalReal not convert to uint when …
zhaoxugang Nov 29, 2020
6968a16
calc flag of result from cast function
zhaoxugang Dec 1, 2020
849beff
fix
zhaoxugang Dec 1, 2020
904bf51
Merge branch 'master' into different-types-compare
bb7133 Dec 3, 2020
fd27373
revert change to check race test
zhaoxugang Dec 5, 2020
579cd43
commit change by step
zhaoxugang Dec 5, 2020
6fba459
commit change by step
zhaoxugang Dec 5, 2020
ba4cc45
add comment,fix bug
zhaoxugang Dec 14, 2020
596dd27
Merge remote-tracking branch 'origin/master' into different-types-com…
zhaoxugang Dec 15, 2020
cd6cea4
add test
zhaoxugang Dec 15, 2020
0e0a148
Merge branch 'master' into different-types-compare
zhaoxugang Dec 15, 2020
a29360c
when param type are decimal and enum retuen real type
zhaoxugang Dec 19, 2020
7a6c730
fix
zhaoxugang Dec 20, 2020
9fcd148
fix
zhaoxugang Dec 20, 2020
5d2d0c1
fix
zhaoxugang Dec 20, 2020
671ab34
revert
zhaoxugang Dec 20, 2020
521d416
remove bit compare suit
zhaoxugang Dec 22, 2020
8d0794c
Remove useless code
zhaoxugang Dec 23, 2020
a6352f1
Merge branch 'master' into different-types-compare
zhaoxugang Dec 24, 2020
794473e
Merge branch 'master' into different-types-compare
ti-srebot Dec 25, 2020
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
2 changes: 2 additions & 0 deletions expression/builtin_compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,8 @@ func getBaseCmpType(lhs, rhs types.EvalType, lft, rft *types.FieldType) types.Ev
return types.ETString
} else if (lhs == types.ETInt || (lft != nil && lft.Hybrid())) && (rhs == types.ETInt || (rft != nil && rft.Hybrid())) {
return types.ETInt
} else if (lhs == types.ETDecimal && rhs == types.ETString) || (lhs == types.ETString && rhs == types.ETDecimal) {
return types.ETReal
} else if ((lhs == types.ETInt || (lft != nil && lft.Hybrid())) || lhs == types.ETDecimal) &&
((rhs == types.ETInt || (rft != nil && rft.Hybrid())) || rhs == types.ETDecimal) {
return types.ETDecimal
Expand Down
13 changes: 13 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8381,6 +8381,19 @@ func (s *testIntegrationSuite) TestIssue12205(c *C) {
testkit.Rows("Warning 1292 Truncated incorrect time value: '18446744072635875000'"))
}

// for issue 20128
func (s *testIntegrationSerialSuite) TestIssue20128(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t;")
tk.MustExec("create table t(b enum('a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z') DEFAULT NULL, c decimal(40,20));")
tk.MustExec("insert into t values('z', 19.18040000000000000000);")
tk.MustExec("insert into t values('z', 26.18040000000000000000);")
tk.MustExec("insert into t values('z', 25.18040000000000000000);")
tk.MustQuery("select * from t where t.b > t.c;").Check(testkit.Rows("z 19.18040000000000000000", "z 25.18040000000000000000"))
tk.MustQuery("select * from t where t.b < t.c;").Check(testkit.Rows("z 26.18040000000000000000"))
}

func (s *testIntegrationSuite) TestIssue21677(c *C) {
tk := testkit.NewTestKit(c, s.store)

Expand Down