Skip to content

Handle Decimal types in greatest and least functions #3447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angelamayxie merged 3 commits into from
Feb 25, 2026
Merged

Handle Decimal types in greatest and least functions #3447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b82a346
handle decimal types in greatest/least
angelamayxie Feb 25, 2026
f65259e
add test
angelamayxie Feb 25, 2026
e75ee43
add dialect tag to skip test failing in doltgres
angelamayxie Feb 25, 2026
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
18 changes: 18 additions & 0 deletions enginetest/queries/script_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14865,6 +14865,24 @@ select * from t1 except (
},
},
},
{
Name: "Greatest and least with decimal arguments",
// TODO: This should work in Doltgres https://github.com/dolthub/doltgresql/issues/2378
Dialect: "mysql",
SetUpScript: []string{
"create table t(a decimal(6, 2), b decimal(8, 5), c decimal(5, 1));",
"insert into t values (2.75, 8.8, 3.1);",
},
Assertions: []ScriptTestAssertion{
{
// https://github.com/dolthub/dolt/issues/10562
Query: "select greatest(a, b, c), least(a, b, c) from t;",
// TODO: greatest and least currently return a float64 for decimals. MySQL returns a decimal with the
// highest precision https://github.com/dolthub/dolt/issues/10567
Expected: []sql.Row{{8.8, 2.75}},
},
},
},
}

var SpatialScriptTests = []ScriptTest{
Expand Down
6 changes: 0 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
github.com/dolthub/vitess v0.0.0-20260128180459-bd171d35a7e2 h1:QMqgG+oegtoQxcHXk/EU5SznJaRPkRHsLpWOJDhGQPU=
github.com/dolthub/vitess v0.0.0-20260128180459-bd171d35a7e2/go.mod h1:eLLslh1CSPMf89pPcaMG4yM72PQbTN9OUYJeAy0fAis=
github.com/dolthub/vitess v0.0.0-20260202234501-b14ed9b1632b h1:B8QS0U5EHtJTiOptjti1cH/OiE6uczyhePtvVFigf3w=
github.com/dolthub/vitess v0.0.0-20260202234501-b14ed9b1632b/go.mod h1:eLLslh1CSPMf89pPcaMG4yM72PQbTN9OUYJeAy0fAis=
github.com/dolthub/vitess v0.0.0-20260223195511-98894ce0c3ca h1:59IsCKj+MBdq1IjoWkF1qsvcZQ2lXh4rPr08THDMxeY=
github.com/dolthub/vitess v0.0.0-20260223195511-98894ce0c3ca/go.mod h1:eLLslh1CSPMf89pPcaMG4yM72PQbTN9OUYJeAy0fAis=
github.com/dolthub/vitess v0.0.0-20260224233013-568e5b4a9dbb h1:O/30JH3vVYQfIuUjuRW/KLV2xni/+2hJsrLdrflHmSg=
github.com/dolthub/vitess v0.0.0-20260224233013-568e5b4a9dbb/go.mod h1:eLLslh1CSPMf89pPcaMG4yM72PQbTN9OUYJeAy0fAis=
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
Expand Down
12 changes: 10 additions & 2 deletions sql/expression/function/greatest_least.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"strings"
"time"

"github.com/shopspring/decimal"
"gopkg.in/src-d/go-errors.v1"

"github.com/dolthub/go-mysql-server/sql"
Expand Down Expand Up @@ -52,6 +53,8 @@ func compEval(
return nil, err
}

// TODO: this switch statement can be cleaned up a lot. A lot of these type conversions and conversions are
// also unnecessary because they get converted during compare
switch t := val.(type) {
case int, int8, int16, int32, int64, uint,
uint8, uint16, uint32, uint64:
Expand Down Expand Up @@ -117,6 +120,11 @@ func compEval(
if i == 0 || cmp(t, selectedTime) {
selectedTime = t
}
case decimal.Decimal:
fval, _ := t.Float64()
if i == 0 || cmp(fval, selectedNum) {
selectedNum = fval
}
case nil:
return nil, nil
default:
Expand Down Expand Up @@ -166,8 +174,7 @@ func compRetType(args ...sql.Expression) (sql.Type, error) {
} else if types.IsNumber(argType) {
allString = false
allDatetime = false
if types.IsFloat(argType) {
allString = false
if !types.IsInteger(argType) {
allInt = false
}
} else if types.IsText(argType) {
Expand All @@ -186,6 +193,7 @@ func compRetType(args ...sql.Expression) (sql.Type, error) {
}
}

// TODO: return Decimal type if all Decimals. Account for Decimals of different scales and precisions
if allString {
return types.LongText, nil
} else if allInt {
Expand Down