*: Add test case for optimizer error

juniway · Dec 23, 2015 · c7baa9f · c7baa9f
1 parent b95f73a
commit c7baa9f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/optimizer/optimizer.go b/optimizer/optimizer.go
@@ -38,7 +38,7 @@ const (
 var (
 	ErrOneColumn     = terror.ClassOptimizer.New(CodeOneColumn, "Operand should contain 1 column(s)")
 	ErrRowColumns    = terror.ClassOptimizer.New(CodeRowColumns, "Operand should contain >= 2 columns for Row")
-	ErrSameColumns   = terror.ClassOptimizer.New(CodeRowColumns, "Operands should contain same columns")
+	ErrSameColumns   = terror.ClassOptimizer.New(CodeSameColumns, "Operands should contain same columns")
 	ErrMultiWildCard = terror.ClassOptimizer.New(CodeMultiWildCard, "wildcard field exist more than once")
 	ErrUnSupported   = terror.ClassOptimizer.New(CodeUnsupported, "unsupported")
 )

diff --git a/terror/terror.go b/terror/terror.go
@@ -202,7 +202,7 @@ func (e *Error) getMySQLErrorCode() uint16 {
 	}
 	code, ok := codeMap[e.code]
 	if !ok {
-		log.Warnf("Unknown error class: %v", e.class)
+		log.Warnf("Unknown error class: %v code: %v", e.class, e.code)
 		return defaultMySQLErrorCode
 	}
 	return code

diff --git a/tidb-server/server/server_test.go b/tidb-server/server/server_test.go
@@ -238,6 +238,12 @@ func runTestErrorCode(c *C) {
 		checkErrorCode(c, err, tmysql.ErrBadDb)
 		_, err = txn2.Exec("select * from tbl_not_exists;")
 		checkErrorCode(c, err, tmysql.ErrNoSuchTable)
+
+		// Optimizer errors
+		_, err = txn2.Exec("select *, * from test;")
+		checkErrorCode(c, err, tmysql.ErrParse)
+		_, err = txn2.Exec("select row(1, 2) > 1;")
+		checkErrorCode(c, err, tmysql.ErrOperandColumns)
 	})
 }