Skip to content

Support preload for struct slice #59

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support preload for struct slice #59

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
f4aeb83
Add a byte slice field to test model
tchssk Dec 16, 2019
909e0bd
Use types.Byte to assert a byte slice
tchssk Dec 16, 2019
e058798
Support preload for struct slice
tchssk Dec 16, 2019
f427252
Fix tests
tchssk Dec 16, 2019
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
12 changes: 11 additions & 1 deletion internal/queryset/field/field.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ type Info struct {
pointed *BaseInfo
BaseInfo
IsPointer bool
IsSlice bool
}

func (fi Info) GetPointed() Info {
Expand Down Expand Up @@ -125,9 +126,18 @@ func (g InfoGenerator) GenFieldInfo(f Field) *Info {
BaseInfo: bi,
}
case *types.Slice:
if t.Elem().String() == "byte" {
switch u := t.Elem().Underlying().(type) {
case *types.Basic:
if u.Kind() == types.Byte {
return &Info{
BaseInfo: bi,
}
}
case *types.Struct:
bi.IsStruct = true
return &Info{
BaseInfo: bi,
IsSlice: true,
}
}
return nil
Expand Down
4 changes: 4 additions & 0 deletions internal/queryset/generator/methodsbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ func (b *methodsBuilder) buildUpdaterStructMethods() {
}

func (b *methodsBuilder) buildUpdaterFieldMethods(f field.Info) {
if f.IsSlice {
return
}

if f.IsPointer {
p := f.GetPointed()
if p.IsStruct {
Expand Down
19 changes: 13 additions & 6 deletions internal/queryset/generator/queryset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import (

const testSurname = "Ivanov"

var testPassword = "Password"

func fixedFullRe(s string) string {
return fmt.Sprintf("^%s$", regexp.QuoteMeta(s))
}
Expand Down Expand Up @@ -290,11 +292,14 @@ func runUserQueryFilterSubTest(t *testing.T, c userQueryTestCase, m sqlmock.Sqlm

func testUserCreateOne(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
u := getUserNoID()
req := "INSERT INTO `users` (`created_at`,`updated_at`,`deleted_at`,`name`,`user_surname`,`email`) " +
"VALUES (?,?,?,?,?,?)"
req := "INSERT INTO `users` (`created_at`,`updated_at`,`deleted_at`,`name`,`user_surname`,`email`,`password`) " +
"VALUES (?,?,?,?,?,?,?)"

password := []byte(testPassword)
u.Password = password

args := []driver.Value{sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(),
u.Name, nil, u.Email}
u.Name, nil, u.Email, password}
m.ExpectExec(fixedFullRe(req)).
WithArgs(args...).
WillReturnResult(sqlmock.NewResult(2, 1))
Expand All @@ -304,14 +309,16 @@ func testUserCreateOne(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {

func testUserCreateOneWithSurname(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
u := getUserNoID()
req := "INSERT INTO `users` (`created_at`,`updated_at`,`deleted_at`,`name`,`user_surname`,`email`) " +
"VALUES (?,?,?,?,?,?)"
req := "INSERT INTO `users` (`created_at`,`updated_at`,`deleted_at`,`name`,`user_surname`,`email`,`password`) " +
"VALUES (?,?,?,?,?,?,?)"

surname := testSurname
password := []byte(testPassword)
u.Surname = &surname
u.Password = password

args := []driver.Value{sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(),
u.Name, &surname, u.Email}
u.Name, &surname, u.Email, password}
m.ExpectExec(fixedFullRe(req)).
WithArgs(args...).
WillReturnResult(sqlmock.NewResult(2, 1))
Expand Down
63 changes: 63 additions & 0 deletions internal/queryset/generator/test/autogenerated_models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions internal/queryset/generator/test/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ import (
type User struct {
gorm.Model

//Posts []Post
Name string
Surname *string `gorm:"column:user_surname"`
Email string
Posts []Post
Name string
Surname *string `gorm:"column:user_surname"`
Email string
Password []byte
}

// Blog is a blog
Expand Down