Skip to content

Commit 19746ea

Browse files
committed
Fix: Long column identifiers in deeply nested joins cause fields to be omitted #7513
1 parent 751a6dd commit 19746ea

File tree

5 files changed

+102
-2
lines changed

5 files changed

+102
-2
lines changed

callbacks/query.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ func BuildQuerySQL(db *gorm.DB) {
4040
}
4141
}
4242

43+
if db.Statement.TruncatedFields == nil {
44+
db.Statement.TruncatedFields = make(map[string]string)
45+
}
4346
if db.Statement.SQL.Len() == 0 {
4447
db.Statement.SQL.Grow(100)
4548
clauseSelect := clause.Select{Distinct: db.Statement.Distinct}
@@ -158,11 +161,17 @@ func BuildQuerySQL(db *gorm.DB) {
158161
selectColumns, restricted := columnStmt.SelectAndOmitColumns(false, false)
159162
for _, s := range relation.FieldSchema.DBNames {
160163
if v, ok := selectColumns[s]; (ok && v) || (!ok && !restricted) {
164+
aliasName := db.NamingStrategy.JoinNestedRelationNames([]string{tableAliasName, s})
161165
clauseSelect.Columns = append(clauseSelect.Columns, clause.Column{
162166
Table: tableAliasName,
163167
Name: s,
164-
Alias: utils.NestedRelationName(tableAliasName, s),
168+
Alias: aliasName,
165169
})
170+
origTableAliasName := tableAliasName
171+
if alias, ok := db.Statement.TruncatedFields[tableAliasName]; ok {
172+
origTableAliasName = alias
173+
}
174+
db.Statement.TruncatedFields[aliasName] = utils.NestedRelationName(origTableAliasName, s)
166175
}
167176
}
168177

@@ -236,7 +245,9 @@ func BuildQuerySQL(db *gorm.DB) {
236245
// joins table alias like "Manager, Company, Manager__Company"
237246
curAliasName := rel.Name
238247
if parentTableName != clause.CurrentTable {
239-
curAliasName = utils.NestedRelationName(parentTableName, curAliasName)
248+
aliasName := db.NamingStrategy.JoinNestedRelationNames([]string{parentTableName, curAliasName})
249+
db.Statement.TruncatedFields[aliasName] = utils.NestedRelationName(parentTableName, curAliasName)
250+
curAliasName = aliasName
240251
}
241252

242253
if _, ok := specifiedRelationsName[curAliasName]; !ok {

scan.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ func Scan(rows Rows, db *DB, mode ScanMode) {
227227
if sch != nil {
228228
matchedFieldCount := make(map[string]int, len(columns))
229229
for idx, column := range columns {
230+
if origName, ok := db.Statement.TruncatedFields[column]; ok {
231+
column = origName
232+
}
230233
if field := sch.LookUpField(column); field != nil && field.Readable {
231234
fields[idx] = field
232235
if count, ok := matchedFieldCount[column]; ok {

schema/naming.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ package schema
22

33
import (
44
"crypto/sha1"
5+
"crypto/sha256"
56
"encoding/hex"
67
"regexp"
78
"strings"
89
"unicode/utf8"
910

11+
"gorm.io/gorm/utils"
12+
1013
"github.com/jinzhu/inflection"
1114
"golang.org/x/text/cases"
1215
"golang.org/x/text/language"
@@ -22,6 +25,7 @@ type Namer interface {
2225
CheckerName(table, column string) string
2326
IndexName(table, column string) string
2427
UniqueName(table, column string) string
28+
JoinNestedRelationNames(relationNames []string) string
2529
}
2630

2731
// Replacer replacer interface like strings.Replacer
@@ -95,6 +99,29 @@ func (ns NamingStrategy) UniqueName(table, column string) string {
9599
return ns.formatName("uni", table, ns.toDBName(column))
96100
}
97101

102+
// JoinNestedRelationNames nested relationships like `Manager__Company` with enforcing IdentifierMaxLength
103+
func (ns NamingStrategy) JoinNestedRelationNames(relationNames []string) string {
104+
tableAlias := utils.JoinNestedRelationNames(relationNames)
105+
return ns.truncateName(tableAlias)
106+
}
107+
108+
// TruncatedName generate truncated name
109+
func (ns NamingStrategy) truncateName(ident string) string {
110+
formattedName := ident
111+
if ns.IdentifierMaxLength == 0 {
112+
ns.IdentifierMaxLength = 64
113+
}
114+
115+
if utf8.RuneCountInString(formattedName) > ns.IdentifierMaxLength {
116+
h := sha256.New224()
117+
h.Write([]byte(formattedName))
118+
bs := h.Sum(nil)
119+
120+
formattedName = formattedName[0:ns.IdentifierMaxLength-8] + hex.EncodeToString(bs)[:8]
121+
}
122+
return formattedName
123+
}
124+
98125
func (ns NamingStrategy) formatName(prefix, table, name string) string {
99126
formattedName := strings.ReplaceAll(strings.Join([]string{
100127
prefix, table, name,

statement.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ type Statement struct {
4747
attrs []interface{}
4848
assigns []interface{}
4949
scopes []func(*DB) *DB
50+
TruncatedFields map[string]string
5051
Result *result
5152
}
5253

tests/joins_test.go

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,3 +476,61 @@ func TestJoinsPreload_Issue7013_NoEntries(t *testing.T) {
476476

477477
AssertEqual(t, len(entries), 0)
478478
}
479+
480+
func TestJoinsLongName_Issue7513(t *testing.T) {
481+
type (
482+
Owner struct {
483+
gorm.Model
484+
Name string
485+
}
486+
487+
Land struct {
488+
gorm.Model
489+
Address string
490+
OwneeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerID uint `gorm:"column:owner_id"`
491+
Owneeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeer *Owner
492+
}
493+
494+
Building struct {
495+
gorm.Model
496+
Name string
497+
LanaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadID uint `gorm:"column:land_id"`
498+
Lanaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaad *Land
499+
}
500+
)
501+
502+
DB.Migrator().DropTable(&Building{}, &Owner{}, &Land{})
503+
DB.Migrator().AutoMigrate(&Building{}, &Owner{}, &Land{})
504+
505+
home := &Building{
506+
Model: gorm.Model{
507+
ID: 1,
508+
},
509+
Name: "Awesome Building",
510+
LanaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadID: 2,
511+
Lanaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaad: &Land{
512+
Model: gorm.Model{
513+
ID: 2,
514+
},
515+
Address: "Awesome Street",
516+
OwneeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerID: 3,
517+
Owneeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeer: &Owner{
518+
Model: gorm.Model{
519+
ID: 3,
520+
},
521+
Name: "Awesome Person",
522+
},
523+
},
524+
}
525+
DB.Create(home)
526+
527+
var entries []Building
528+
assert.NotPanics(t, func() {
529+
assert.NoError(t,
530+
DB.Joins("Lanaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaad").
531+
Joins("Lanaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaad.Owneeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeer").
532+
Find(&entries).Error)
533+
})
534+
535+
AssertEqual(t, entries, []Building{*home})
536+
}

0 commit comments

Comments
 (0)