type/compatibility: fix show create table output of generated column (p…

…ingcap#315)
crazycs520 · May 5, 2019 · 595d728 · 595d728
1 parent b2f7fc7
commit 595d728
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/ast/functions_test.go b/ast/functions_test.go
@@ -49,7 +49,7 @@ func (ts *testFunctionsSuite) TestConvert(c *C) {
 		ErrorMessage string
 	}{
 		{`SELECT CONVERT("abc" USING "latin1")`, "latin1", ""},
-		{`SELECT CONVERT("abc" USING laTiN1)`, "laTiN1", ""},
+		{`SELECT CONVERT("abc" USING laTiN1)`, "latin1", ""},
 		{`SELECT CONVERT("abc" USING "binary")`, "binary", ""},
 		{`SELECT CONVERT("abc" USING biNaRy)`, "binary", ""},
 		{`SELECT CONVERT(a USING a)`, "", `[parser:1115]Unknown character set: 'a'`}, // TiDB issue #4436.
@@ -78,7 +78,7 @@ func (ts *testFunctionsSuite) TestChar(c *C) {
 		ErrorMessage string
 	}{
 		{`SELECT CHAR("abc" USING "latin1")`, "latin1", ""},
-		{`SELECT CHAR("abc" USING laTiN1)`, "laTiN1", ""},
+		{`SELECT CHAR("abc" USING laTiN1)`, "latin1", ""},
 		{`SELECT CHAR("abc" USING "binary")`, "binary", ""},
 		{`SELECT CHAR("abc" USING binary)`, "binary", ""},
 		{`SELECT CHAR(a USING a)`, "", `[parser:1115]Unknown character set: 'a'`},

diff --git a/parser.go b/parser.go
diff --git a/parser.y b/parser.y
@@ -5604,14 +5604,14 @@ CharsetName:
 	StringName
 	{
 		// Validate input charset name to keep the same behavior as parser of MySQL.
-		_, _, err := charset.GetCharsetInfo($1.(string))
+		name, _, err := charset.GetCharsetInfo($1.(string))
 		if err != nil {
 			yylex.AppendError(ErrUnknownCharacterSet.GenWithStackByArgs($1))
 			return 1
 		}
-		// Use $1 instead of charset name returned from charset.GetCharsetInfo(),
-		// to keep upper-lower case of input for restore.
-		$$ = $1
+		// Use charset name returned from charset.GetCharsetInfo(),
+		// to keep lower case of input for generated column restore.
+		$$ = name
 	}
 |	binaryType
 	{