Skip to content

Commit

Permalink
fix select alias
Browse files Browse the repository at this point in the history
  • Loading branch information
Fs02 committed Jul 2, 2022
1 parent 0ca5cb6 commit 075ffcb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion join_query.go
Expand Up @@ -49,7 +49,7 @@ func (jq *JoinQuery) Populate(query *Query, docMeta DocumentMeta) {
if load {
fields := make([]string, len(assocDocMeta.Fields()))
for i, f := range assocDocMeta.Fields() {
fields[i] = jq.Assoc + "." + f
fields[i] = jq.Assoc + "." + f + " as " + jq.Assoc + "." + f
}
query.SelectQuery.Fields = append(query.SelectQuery.Fields[:(len(query.SelectQuery.Fields)-1)], fields...)
}
Expand Down
15 changes: 13 additions & 2 deletions join_query_test.go
Expand Up @@ -85,7 +85,12 @@ func TestJoinAssoc_hasOne(t *testing.T) {
Assoc: "address",
}, populated.JoinQuery[0])
assert.Equal(t, []string{
"*", "address.id", "address.user_id", "address.street", "address.notes", "address.deleted_at",
"*",
"address.id as address.id",
"address.user_id as address.user_id",
"address.street as address.street",
"address.notes as address.notes",
"address.deleted_at as address.deleted_at",
}, populated.SelectQuery.Fields)
}

Expand All @@ -103,7 +108,13 @@ func TestJoinPopulate_hasOnePtr(t *testing.T) {
Assoc: "work_address",
}, populated.JoinQuery[0])
assert.Equal(t, []string{
"id", "name", "work_address.id", "work_address.user_id", "work_address.street", "work_address.notes", "work_address.deleted_at",
"id",
"name",
"work_address.id as work_address.id",
"work_address.user_id as work_address.user_id",
"work_address.street as work_address.street",
"work_address.notes as work_address.notes",
"work_address.deleted_at as work_address.deleted_at",
}, populated.SelectQuery.Fields)
}

Expand Down

0 comments on commit 075ffcb

Please sign in to comment.