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

sql/analyzer: case insensitive checks for group by rules #728

Merged
merged 1 commit into from
May 28, 2019
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
4 changes: 4 additions & 0 deletions engine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,10 @@ var queries = []struct {
`SELECT CHAR_LENGTH('áé'), LENGTH('àè')`,
[]sql.Row{{int32(2), int32(4)}},
},
{
"SELECT i, COUNT(i) AS `COUNT(i)` FROM (SELECT i FROM mytable) t GROUP BY i ORDER BY i, `COUNT(i)` DESC",
[]sql.Row{{int64(1), int64(1)}, {int64(2), int64(1)}, {int64(3), int64(1)}},
},
}

func TestQueries(t *testing.T) {
Expand Down
9 changes: 5 additions & 4 deletions sql/analyzer/resolve_orderby.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func resolveOrderBy(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error)
childNewCols := columnsDefinedInNode(sort.Child)
var schemaCols []string
for _, col := range sort.Child.Schema() {
schemaCols = append(schemaCols, col.Name)
schemaCols = append(schemaCols, strings.ToLower(col.Name))
}

var colsFromChild []string
Expand All @@ -38,9 +38,10 @@ func resolveOrderBy(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error)
ns := findExprNameables(f.Column)

for _, n := range ns {
if stringContains(childNewCols, n.Name()) {
name := strings.ToLower(n.Name())
if stringContains(childNewCols, name) {
colsFromChild = append(colsFromChild, n.Name())
} else if !stringContains(schemaCols, n.Name()) {
} else if !stringContains(schemaCols, name) {
missingCols = append(missingCols, n.Name())
}
}
Expand Down Expand Up @@ -140,7 +141,7 @@ func columnsDefinedInNode(n sql.Node) []string {
for _, e := range exprs {
alias, ok := e.(*expression.Alias)
if ok {
cols = append(cols, alias.Name())
cols = append(cols, strings.ToLower(alias.Name()))
}
}

Expand Down