Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 35 additions & 1 deletion server/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ func TestHandlerComPrepareExecuteWithPreparedDisabled(t *testing.T) {

for _, test := range []testcase{
{
name: "select statement returns nil schema",
name: "select statement returns nil schema bug",
prepare: &mysql.PrepareData{
StatementID: 0,
PrepareStmt: "select c1 from test where c1 < ?",
Expand All @@ -555,6 +555,40 @@ func TestHandlerComPrepareExecuteWithPreparedDisabled(t *testing.T) {
{0}, {1}, {2}, {3}, {4},
},
},
{
name: "ifnull typing",
prepare: &mysql.PrepareData{
StatementID: 0,
PrepareStmt: "select ifnull(not null, 1000) as a",
ParamsCount: 0,
ParamsType: nil,
ColumnNames: nil,
BindVars: nil,
},
schema: []*query.Field{
{Name: "a", OrgName: "a", Table: "", OrgTable: "", Database: "", Type: query.Type_INT16, Charset: uint32(sql.CharacterSet_utf8mb4), ColumnLength: 6, Flags: uint32(query.MySqlFlag_NOT_NULL_FLAG)},
},
expected: []sql.Row{
{1000},
},
},
{
name: "ifnull typing negative",
prepare: &mysql.PrepareData{
StatementID: 0,
PrepareStmt: "select ifnull(not null, -129) as a",
ParamsCount: 0,
ParamsType: nil,
ColumnNames: nil,
BindVars: nil,
},
schema: []*query.Field{
{Name: "a", OrgName: "a", Table: "", OrgTable: "", Database: "", Type: query.Type_INT16, Charset: uint32(sql.CharacterSet_utf8mb4), ColumnLength: 6, Flags: uint32(query.MySqlFlag_NOT_NULL_FLAG)},
},
expected: []sql.Row{
{-129},
},
},
} {
t.Run(test.name, func(t *testing.T) {
handler.ComInitDB(dummyConn, "test")
Expand Down
3 changes: 3 additions & 0 deletions sql/expression/boolean.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ func NewNot(child sql.Expression) *Not {

// Type implements the Expression interface.
func (e *Not) Type() sql.Type {
if types.IsNull(e.Child) {
return types.Null
}
return types.Boolean
}

Expand Down