Skip to content
This repository has been archived by the owner on Jan 28, 2021. It is now read-only.

Commit

Permalink
Remove some redundant stuff
Browse files Browse the repository at this point in the history
Signed-off-by: Juanjo Alvarez <juanjo@sourced.tech>
  • Loading branch information
Juanjo Alvarez committed May 6, 2019
1 parent 9c0402d commit d569429
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
10 changes: 0 additions & 10 deletions sql/expression/function/greatest_least.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ func NewGreatest(args ...sql.Expression) (sql.Expression, error) {
}

for _, arg := range args {
if !arg.Resolved() {
continue
}

if sql.IsTuple(arg.Type()) {
return nil, sql.ErrInvalidType.New("tuple")
}
Expand Down Expand Up @@ -183,12 +179,6 @@ func NewLeast(args ...sql.Expression) (sql.Expression, error) {
}

for _, arg := range args {
// Don't perform this check until it's resolved. Otherwise we
// can't get the type for sure.
if !arg.Resolved() {
continue
}

if len(args) > 1 && sql.IsArray(arg.Type()) {
return nil, ErrConcatArrayWithOthers.New()
}
Expand Down
11 changes: 0 additions & 11 deletions sql/expression/function/greatest_least_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ func TestGreatest(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType(int64(1), v)
require.Equal(int64(5), v)
})

Expand All @@ -48,7 +47,6 @@ func TestGreatest(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType(float64(1), v)
require.Equal(float64(10), v)
})

Expand All @@ -64,7 +62,6 @@ func TestGreatest(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType(float64(1), v)
require.Equal(float64(10), v)
})

Expand All @@ -79,7 +76,6 @@ func TestGreatest(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType(float64(1), v)
require.Equal(float64(10.0), v)
})

Expand All @@ -95,7 +91,6 @@ func TestGreatest(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType("", v)
require.Equal("bbb", v)
})
}
Expand Down Expand Up @@ -126,7 +121,6 @@ func TestLeast(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType(int64(1), v)
require.Equal(int64(-1), v)
})

Expand All @@ -141,7 +135,6 @@ func TestLeast(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType(float64(1), v)
require.Equal(float64(1), v)
})

Expand All @@ -157,7 +150,6 @@ func TestLeast(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType(float64(1), v)
require.Equal(float64(1), v)
})

Expand All @@ -172,7 +164,6 @@ func TestLeast(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType(float64(1), v)
require.Equal(float64(1.0), v)
})

Expand All @@ -187,7 +178,6 @@ func TestLeast(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType("", v)
require.Equal("9999", v)
})

Expand All @@ -203,7 +193,6 @@ func TestLeast(t *testing.T) {

v, err := f.Eval(sql.NewEmptyContext(), nil)
require.NoError(err)
require.IsType("", v)
require.Equal("", v)
})
}

0 comments on commit d569429

Please sign in to comment.