Skip to content

Commit a4270cc

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

File tree

5 files changed

+162
-2
lines changed

5 files changed

+162
-2
lines changed

callbacks/query.go

Lines changed: 23 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.TruncatedAliases == nil {
44+
db.Statement.TruncatedAliases = 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.TruncatedAliases[tableAliasName]; ok {
172+
origTableAliasName = alias
173+
}
174+
db.Statement.TruncatedAliases[aliasName] = utils.NestedRelationName(origTableAliasName, s)
166175
}
167176
}
168177

@@ -232,12 +241,23 @@ func BuildQuerySQL(db *gorm.DB) {
232241
}
233242

234243
parentTableName := clause.CurrentTable
244+
parentFullTableName := clause.CurrentTable
235245
for idx, rel := range relations {
236246
// joins table alias like "Manager, Company, Manager__Company"
237247
curAliasName := rel.Name
248+
249+
var nameParts []string
250+
var fullName string
238251
if parentTableName != clause.CurrentTable {
239-
curAliasName = utils.NestedRelationName(parentTableName, curAliasName)
252+
nameParts = []string{parentFullTableName, curAliasName}
253+
fullName = utils.NestedRelationName(parentFullTableName, curAliasName)
254+
} else {
255+
nameParts = []string{curAliasName}
256+
fullName = curAliasName
240257
}
258+
aliasName := db.NamingStrategy.JoinNestedRelationNames(nameParts)
259+
db.Statement.TruncatedAliases[aliasName] = fullName
260+
curAliasName = aliasName
241261

242262
if _, ok := specifiedRelationsName[curAliasName]; !ok {
243263
aliasName := curAliasName
@@ -250,6 +270,7 @@ func BuildQuerySQL(db *gorm.DB) {
250270
}
251271

252272
parentTableName = curAliasName
273+
parentFullTableName = fullName
253274
}
254275
} else {
255276
fromClause.Joins = append(fromClause.Joins, clause.Join{

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.TruncatedAliases[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: 56 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,58 @@ 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 len(formattedName) > ns.IdentifierMaxLength {
116+
h := sha256.New224()
117+
h.Write([]byte(formattedName))
118+
bs := h.Sum(nil)
119+
formattedName = truncate(formattedName, ns.IdentifierMaxLength-8) + hex.EncodeToString(bs)[:8]
120+
}
121+
return formattedName
122+
}
123+
124+
func truncate(s string, size int) string {
125+
if len(s) <= size {
126+
return s
127+
}
128+
s = s[0:size]
129+
num := brokenTailSize(s)
130+
s = s[0 : len(s)-num]
131+
return s
132+
}
133+
134+
func brokenTailSize(s string) int {
135+
if len(s) == 0 {
136+
return 0
137+
}
138+
res := 1
139+
140+
for i := len(s) - 1; i >= 0; i-- {
141+
char := s[i] & 0b11000000
142+
if char != 0b10000000 {
143+
break
144+
}
145+
res++
146+
}
147+
148+
if utf8.Valid([]byte(s[len(s)-res:])) {
149+
res = 0
150+
}
151+
return res
152+
}
153+
98154
func (ns NamingStrategy) formatName(prefix, table, name string) string {
99155
formattedName := strings.ReplaceAll(strings.Join([]string{
100156
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+
TruncatedAliases map[string]string
5051
Result *result
5152
}
5253

tests/joins_test.go

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package tests_test
22

33
import (
44
"fmt"
5+
"os"
56
"regexp"
67
"sort"
78
"testing"
@@ -476,3 +477,81 @@ func TestJoinsPreload_Issue7013_NoEntries(t *testing.T) {
476477

477478
AssertEqual(t, len(entries), 0)
478479
}
480+
481+
func TestJoinsLongName_Issue7513(t *testing.T) {
482+
if os.Getenv("GORM_DIALECT") != "postgres" {
483+
// Another DB may not support UTF-8 characters in identifiers
484+
return
485+
}
486+
type (
487+
Owner struct {
488+
gorm.Model
489+
Name string
490+
}
491+
492+
Land struct {
493+
gorm.Model
494+
Address string
495+
OwneeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerID uint `gorm:"column:owner_id"`
496+
Owneeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeer *Owner
497+
}
498+
499+
Design struct {
500+
gorm.Model
501+
Name𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃x string
502+
}
503+
504+
Building struct {
505+
gorm.Model
506+
Name string
507+
Laaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaand𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃xID uint `gorm:"column:land_id"`
508+
Laaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaand𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃x *Land
509+
510+
DesignID uint `gorm:"column:design_id"`
511+
Design *Design
512+
}
513+
)
514+
515+
DB.Migrator().DropTable(&Building{}, &Owner{}, &Land{}, Design{})
516+
DB.Migrator().AutoMigrate(&Building{}, &Owner{}, &Land{}, Design{})
517+
518+
home := &Building{
519+
Model: gorm.Model{
520+
ID: 1,
521+
},
522+
Name: "Awesome Building",
523+
Laaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaand𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃xID: 2,
524+
Laaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaand𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃x: &Land{
525+
Model: gorm.Model{
526+
ID: 2,
527+
},
528+
Address: "Awesome Street",
529+
OwneeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerID: 3,
530+
Owneeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeer: &Owner{
531+
Model: gorm.Model{
532+
ID: 3,
533+
},
534+
Name: "Awesome Person",
535+
},
536+
},
537+
DesignID: 4,
538+
Design: &Design{
539+
Model: gorm.Model{
540+
ID: 4,
541+
},
542+
Name𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃x: "Awesome Design",
543+
},
544+
}
545+
DB.Create(home)
546+
547+
var entries []Building
548+
assert.NotPanics(t, func() {
549+
assert.NoError(t,
550+
DB.Joins("Laaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaand𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃x").
551+
Joins("Laaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaand𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃𒀃x.Owneeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeer").
552+
Joins("Design").
553+
Find(&entries).Error)
554+
})
555+
556+
AssertEqual(t, entries, []Building{*home})
557+
}

0 commit comments

Comments
 (0)