expression: use maximum length for integer display (#56463)

close #45338, close #56462
pingcap · Oct 14, 2024 · e017e1b · e017e1b
1 parent 87f42ea
commit e017e1b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/pkg/expression/builtin_control.go b/pkg/expression/builtin_control.go
@@ -87,12 +87,25 @@ func setFlenFromArgs(evalType types.EvalType, resultFieldType *types.FieldType,
 	} else if evalType == types.ETString {
 		maxLen := 0
 		for i := range argTps {
-			argFlen := argTps[i].GetFlen()
-			if argFlen == types.UnspecifiedLength {
-				resultFieldType.SetFlen(types.UnspecifiedLength)
-				return
+			switch argTps[i].GetType() {
+			case mysql.TypeTiny:
+				maxLen = maxlen(4, maxLen)
+			case mysql.TypeShort:
+				maxLen = maxlen(6, maxLen)
+			case mysql.TypeInt24:
+				maxLen = maxlen(9, maxLen)
+			case mysql.TypeLong:
+				maxLen = maxlen(11, maxLen)
+			case mysql.TypeLonglong:
+				maxLen = maxlen(20, maxLen)
+			default:
+				argFlen := argTps[i].GetFlen()
+				if argFlen == types.UnspecifiedLength {
+					resultFieldType.SetFlen(types.UnspecifiedLength)
+					return
+				}
+				maxLen = maxlen(argFlen, maxLen)
 			}
-			maxLen = maxlen(argFlen, maxLen)
 		}
 		resultFieldType.SetFlen(maxLen)
 	} else {

diff --git a/tests/integrationtest/r/expression/issues.result b/tests/integrationtest/r/expression/issues.result
@@ -3224,3 +3224,9 @@ Warning	1292	Truncated incorrect DOUBLE value: 'a'
 Warning	1292	Truncated incorrect DOUBLE value: 'a'
 Warning	1292	Truncated incorrect DOUBLE value: 'b'
 Warning	1292	Truncated incorrect DOUBLE value: 'b'
+DROP TABLE IF EXISTS test.t;
+CREATE TABLE test.t (id bigint(11) UNSIGNED PRIMARY KEY);
+INSERT INTO test.t VALUES (1234567890123456);
+SELECT IFNULL(id, 'abcdef') FROM test.t;
+IFNULL(id, 'abcdef')
+1234567890123456
diff --git a/tests/integrationtest/t/expression/issues.test b/tests/integrationtest/t/expression/issues.test
@@ -2176,3 +2176,9 @@ select (cast(f1 as float) = 1) or (cast(f1 as float) = 2) from test.t;
 SHOW WARNINGS;
 select (cast(f1 as float) != 1) and (cast(f1 as float) != 2) from test.t;
 SHOW WARNINGS;
+
+# TestIssue56462
+DROP TABLE IF EXISTS test.t;
+CREATE TABLE test.t (id bigint(11) UNSIGNED PRIMARY KEY);
+INSERT INTO test.t VALUES (1234567890123456);
+SELECT IFNULL(id, 'abcdef') FROM test.t;