Skip to content

auto: cherry-pick v2 commits #330

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
scbizu merged 2 commits into from
Jun 4, 2025
Merged

auto: cherry-pick v2 commits #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e55bfc2
Fix/remove mongo embed index (#323)
scbizu Nov 5, 2024
f096827
internal/parser: mongo: fixup if field has duplicate keywords in test
scbizu Jun 4, 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
5 changes: 2 additions & 3 deletions cmd/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"fmt"
"io"
"io/fs"
"io/ioutil"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -65,7 +64,7 @@ var genCmd = &cobra.Command{
if filepath.Ext(path) != ".yaml" {
return nil
}
data, err := ioutil.ReadFile(path)
data, err := os.ReadFile(path)
if err != nil {
return err
}
Expand All @@ -77,7 +76,7 @@ var genCmd = &cobra.Command{
return err
}
default:
data, err := ioutil.ReadFile(input)
data, err := os.ReadFile(input)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func version(commit string) string {
const (
vMajor = 2
vMinor = 8
vPatch = 10
vPatch = 11
)

// versionCmd represents the version command
Expand Down
36 changes: 18 additions & 18 deletions e2e/mongo/nested/gen_User_mongo_orm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,20 +324,20 @@ func (s *UserSuite) TestQuery() {
// TestFindByUsername tests the FindByUsername method
func (s *UserSuite) TestFindByUsername() {
cases := []struct {
name string
username string
limit int
offset int
sortFields interface{}
wantErr bool
name string
field_username string
limit int
offset int
sortFields interface{}
wantErr bool
}{
{
name: "findbyusername_success",
username: "test_username",
limit: 10,
offset: 0,
sortFields: nil,
wantErr: false,
name: "findbyusername_success",
field_username: "test_username",
limit: 10,
offset: 0,
sortFields: nil,
wantErr: false,
},
}
mt := mtest.New(
Expand All @@ -362,14 +362,14 @@ func (s *UserSuite) TestFindByUsername() {
})
killCursors := mtest.CreateCursorResponse(0, "test.user", mtest.NextBatch)
t.AddMockResponses(first, killCursors)
result, err := Get_UserMgr().FindByUsername(s.ctx, c.username, c.limit, c.offset, c.sortFields)
result, err := Get_UserMgr().FindByUsername(s.ctx, c.field_username, c.limit, c.offset, c.sortFields)
if c.wantErr {
assert.Error(t, err)
} else {
assert.NoError(t, err)
assert.NotNil(t, result)
assert.Len(t, result, 1)
assert.Equal(t, c.username, result[0].Username)
assert.Equal(t, c.field_username, result[0].Username)
}
})
})
Expand All @@ -380,15 +380,15 @@ func (s *UserSuite) TestFindByUsername() {
func (s *UserSuite) TestFindByAge() {
cases := []struct {
name string
age int32
field_age int32
limit int
offset int
sortFields interface{}
wantErr bool
}{
{
name: "findbyage_success",
age: int32(1),
field_age: int32(1),
limit: 10,
offset: 0,
sortFields: nil,
Expand Down Expand Up @@ -417,14 +417,14 @@ func (s *UserSuite) TestFindByAge() {
})
killCursors := mtest.CreateCursorResponse(0, "test.user", mtest.NextBatch)
t.AddMockResponses(first, killCursors)
result, err := Get_UserMgr().FindByAge(s.ctx, c.age, c.limit, c.offset, c.sortFields)
result, err := Get_UserMgr().FindByAge(s.ctx, c.field_age, c.limit, c.offset, c.sortFields)
if c.wantErr {
assert.Error(t, err)
} else {
assert.NoError(t, err)
assert.NotNil(t, result)
assert.Len(t, result, 1)
assert.Equal(t, c.age, result[0].Age)
assert.Equal(t, c.field_age, result[0].Age)
}
})
})
Expand Down
28 changes: 14 additions & 14 deletions e2e/mongo/user/gen_UserBlog_mongo_orm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,20 +310,20 @@ func (s *UserBlogSuite) TestQuery() {
// TestFindByUserId tests the FindByUserId method
func (s *UserBlogSuite) TestFindByUserId() {
cases := []struct {
name string
userid uint64
limit int
offset int
sortFields interface{}
wantErr bool
name string
field_userid uint64
limit int
offset int
sortFields interface{}
wantErr bool
}{
{
name: "findbyuserid_success",
userid: uint64(1),
limit: 10,
offset: 0,
sortFields: nil,
wantErr: false,
name: "findbyuserid_success",
field_userid: uint64(1),
limit: 10,
offset: 0,
sortFields: nil,
wantErr: false,
},
}
mt := mtest.New(
Expand All @@ -346,14 +346,14 @@ func (s *UserBlogSuite) TestFindByUserId() {
})
killCursors := mtest.CreateCursorResponse(0, "test.userblog", mtest.NextBatch)
t.AddMockResponses(first, killCursors)
result, err := Get_UserBlogMgr().FindByUserId(s.ctx, c.userid, c.limit, c.offset, c.sortFields)
result, err := Get_UserBlogMgr().FindByUserId(s.ctx, c.field_userid, c.limit, c.offset, c.sortFields)
if c.wantErr {
assert.Error(t, err)
} else {
assert.NoError(t, err)
assert.NotNil(t, result)
assert.Len(t, result, 1)
assert.Equal(t, c.userid, result[0].UserId)
assert.Equal(t, c.field_userid, result[0].UserId)
}
})
})
Expand Down
98 changes: 49 additions & 49 deletions e2e/mongo/user/gen_User_mongo_orm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,22 +317,22 @@ func (s *UserSuite) TestQuery() {
// TestFindByUsernameAge tests the FindByUsernameAge method
func (s *UserSuite) TestFindByUsernameAge() {
cases := []struct {
name string
username string
age int32
limit int
offset int
sortFields interface{}
wantErr bool
name string
field_username string
field_age int32
limit int
offset int
sortFields interface{}
wantErr bool
}{
{
name: "findbyusernameage_success",
username: "test_username",
age: int32(1),
limit: 10,
offset: 0,
sortFields: nil,
wantErr: false,
name: "findbyusernameage_success",
field_username: "test_username",
field_age: int32(1),
limit: 10,
offset: 0,
sortFields: nil,
wantErr: false,
},
}
mt := mtest.New(
Expand All @@ -356,15 +356,15 @@ func (s *UserSuite) TestFindByUsernameAge() {
})
killCursors := mtest.CreateCursorResponse(0, "test.user", mtest.NextBatch)
t.AddMockResponses(first, killCursors)
result, err := Get_UserMgr().FindByUsernameAge(s.ctx, c.username, c.age, c.limit, c.offset, c.sortFields)
result, err := Get_UserMgr().FindByUsernameAge(s.ctx, c.field_username, c.field_age, c.limit, c.offset, c.sortFields)
if c.wantErr {
assert.Error(t, err)
} else {
assert.NoError(t, err)
assert.NotNil(t, result)
assert.Len(t, result, 1)
assert.Equal(t, c.username, result[0].Username)
assert.Equal(t, c.age, result[0].Age)
assert.Equal(t, c.field_username, result[0].Username)
assert.Equal(t, c.field_age, result[0].Age)
}
})
})
Expand All @@ -374,20 +374,20 @@ func (s *UserSuite) TestFindByUsernameAge() {
// TestFindByUsername tests the FindByUsername method
func (s *UserSuite) TestFindByUsername() {
cases := []struct {
name string
username string
limit int
offset int
sortFields interface{}
wantErr bool
name string
field_username string
limit int
offset int
sortFields interface{}
wantErr bool
}{
{
name: "findbyusername_success",
username: "test_username",
limit: 10,
offset: 0,
sortFields: nil,
wantErr: false,
name: "findbyusername_success",
field_username: "test_username",
limit: 10,
offset: 0,
sortFields: nil,
wantErr: false,
},
}
mt := mtest.New(
Expand All @@ -411,14 +411,14 @@ func (s *UserSuite) TestFindByUsername() {
})
killCursors := mtest.CreateCursorResponse(0, "test.user", mtest.NextBatch)
t.AddMockResponses(first, killCursors)
result, err := Get_UserMgr().FindByUsername(s.ctx, c.username, c.limit, c.offset, c.sortFields)
result, err := Get_UserMgr().FindByUsername(s.ctx, c.field_username, c.limit, c.offset, c.sortFields)
if c.wantErr {
assert.Error(t, err)
} else {
assert.NoError(t, err)
assert.NotNil(t, result)
assert.Len(t, result, 1)
assert.Equal(t, c.username, result[0].Username)
assert.Equal(t, c.field_username, result[0].Username)
}
})
})
Expand All @@ -429,15 +429,15 @@ func (s *UserSuite) TestFindByUsername() {
func (s *UserSuite) TestFindByAge() {
cases := []struct {
name string
age int32
field_age int32
limit int
offset int
sortFields interface{}
wantErr bool
}{
{
name: "findbyage_success",
age: int32(1),
field_age: int32(1),
limit: 10,
offset: 0,
sortFields: nil,
Expand Down Expand Up @@ -465,14 +465,14 @@ func (s *UserSuite) TestFindByAge() {
})
killCursors := mtest.CreateCursorResponse(0, "test.user", mtest.NextBatch)
t.AddMockResponses(first, killCursors)
result, err := Get_UserMgr().FindByAge(s.ctx, c.age, c.limit, c.offset, c.sortFields)
result, err := Get_UserMgr().FindByAge(s.ctx, c.field_age, c.limit, c.offset, c.sortFields)
if c.wantErr {
assert.Error(t, err)
} else {
assert.NoError(t, err)
assert.NotNil(t, result)
assert.Len(t, result, 1)
assert.Equal(t, c.age, result[0].Age)
assert.Equal(t, c.field_age, result[0].Age)
}
})
})
Expand All @@ -482,20 +482,20 @@ func (s *UserSuite) TestFindByAge() {
// TestFindByRegisterDate tests the FindByRegisterDate method
func (s *UserSuite) TestFindByRegisterDate() {
cases := []struct {
name string
registerdate time.Time
limit int
offset int
sortFields interface{}
wantErr bool
name string
field_registerdate time.Time
limit int
offset int
sortFields interface{}
wantErr bool
}{
{
name: "findbyregisterdate_success",
registerdate: time.Date(2023, 1, 1, 12, 0, 0, 0, time.UTC),
limit: 10,
offset: 0,
sortFields: nil,
wantErr: false,
name: "findbyregisterdate_success",
field_registerdate: time.Date(2023, 1, 1, 12, 0, 0, 0, time.UTC),
limit: 10,
offset: 0,
sortFields: nil,
wantErr: false,
},
}
mt := mtest.New(
Expand All @@ -519,14 +519,14 @@ func (s *UserSuite) TestFindByRegisterDate() {
})
killCursors := mtest.CreateCursorResponse(0, "test.user", mtest.NextBatch)
t.AddMockResponses(first, killCursors)
result, err := Get_UserMgr().FindByRegisterDate(s.ctx, c.registerdate, c.limit, c.offset, c.sortFields)
result, err := Get_UserMgr().FindByRegisterDate(s.ctx, c.field_registerdate, c.limit, c.offset, c.sortFields)
if c.wantErr {
assert.Error(t, err)
} else {
assert.NoError(t, err)
assert.NotNil(t, result)
assert.Len(t, result, 1)
assert.Equal(t, c.registerdate.Unix(), result[0].RegisterDate.Unix())
assert.Equal(t, c.field_registerdate.Unix(), result[0].RegisterDate.Unix())
}
})
})
Expand Down
Loading
Loading