Skip to content

refactor(database/gdb): simplify order and group by alias quoting (bu… #4555

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
hailaz merged 4 commits into from
Dec 26, 2025
+10 −395
Merged

refactor(database/gdb): simplify order and group by alias quoting (bu… #4555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81f0e43
refactor(database/gdb): simplify order and group by alias quoting (bu…
lingcoder Dec 9, 2025
d04ab12
test(contrib/drivers/mysql): remove unit tests for join, group and or…
lingcoder Dec 9, 2025
2242af4
refactor(database/gdb): remove unused table alias parsing functions
hailaz Dec 26, 2025
04b47d5
Merge branch 'master' into bugfix/order-alias
hailaz Dec 26, 2025
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
236 changes: 0 additions & 236 deletions contrib/drivers/mysql/mysql_z_unit_feature_model_join_group_order_test.go
View file
Open in desktop

This file was deleted.

69 changes: 7 additions & 62 deletions database/gdb/gdb_model_order_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package gdb

import (
"fmt"
"strings"

"github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/gconv"
Expand All @@ -30,7 +30,6 @@ func (m *Model) Order(orderBy ...any) *Model {
core = m.db.GetCore()
model = m.getModel()
)

for _, v := range orderBy {
if model.orderBy != "" {
model.orderBy += ","
Expand All @@ -41,47 +40,13 @@ func (m *Model) Order(orderBy ...any) *Model {
default:
orderByStr := gconv.String(v)
if gstr.Contains(orderByStr, " ") {
// Handle "column asc/desc" format
parts := gstr.SplitAndTrim(orderByStr, " ")
if len(parts) >= 2 {
columnPart := parts[0]
orderPart := gstr.Join(parts[1:], " ")

// Check if column part is qualified
if gstr.Contains(columnPart, ".") {
model.orderBy += core.QuoteString(columnPart) + " " + orderPart
} else {
// Try to get the correct prefix for this field
prefix := m.getPrefixByField(columnPart)
if prefix != "" {
model.orderBy += core.QuoteString(fmt.Sprintf("%s.%s", prefix, columnPart)) + " " + orderPart
} else {
// If we can't determine the table, just quote the field
model.orderBy += core.QuoteWord(columnPart) + " " + orderPart
}
}
} else {
// Fallback for complex expressions
model.orderBy += core.QuoteString(orderByStr)
}
model.orderBy += core.QuoteString(orderByStr)
} else {
if gstr.Equal(orderByStr, "ASC") || gstr.Equal(orderByStr, "DESC") {
model.orderBy = gstr.TrimRight(model.orderBy, ",")
model.orderBy += " " + orderByStr
} else {
// Check if column is already qualified
if gstr.Contains(orderByStr, ".") {
model.orderBy += core.QuoteString(orderByStr)
} else {
// Try to get the correct prefix for this field
prefix := m.getPrefixByField(orderByStr)
if prefix != "" {
model.orderBy += core.QuoteString(fmt.Sprintf("%s.%s", prefix, orderByStr))
} else {
// If we can't determine the table, just quote the field
model.orderBy += core.QuoteWord(orderByStr)
}
}
model.orderBy += core.QuoteWord(orderByStr)
}
}
}
Expand Down Expand Up @@ -113,7 +78,7 @@ func (m *Model) OrderRandom() *Model {
}

// Group sets the "GROUP BY" statement for the model.
func (m *Model) Group(groupBy ...any) *Model {
func (m *Model) Group(groupBy ...string) *Model {
if len(groupBy) == 0 {
return m
}
Expand All @@ -122,29 +87,9 @@ func (m *Model) Group(groupBy ...any) *Model {
model = m.getModel()
)

for _, v := range groupBy {
if model.groupBy != "" {
model.groupBy += ","
}
switch v.(type) {
case Raw, *Raw:
model.groupBy += gconv.String(v)
default:
groupByStr := gconv.String(v)
if gstr.Contains(groupByStr, ".") {
// Already qualified (e.g., "table.column")
model.groupBy += core.QuoteString(groupByStr)
} else {
// Try to get the correct prefix for this field
prefix := m.getPrefixByField(groupByStr)
if prefix != "" {
model.groupBy += core.QuoteString(fmt.Sprintf("%s.%s", prefix, groupByStr))
} else {
// If we can't determine the table, just quote the field
model.groupBy += core.QuoteWord(groupByStr)
}
}
}
if model.groupBy != "" {
model.groupBy += ","
}
model.groupBy += core.QuoteString(strings.Join(groupBy, ","))
return model
}
Loading
Loading