Skip to content

Commit 470fa97

Browse files
committed
internal/parser,e2e: mongo: introduce the new nullable flag to BSON (#335)
Signed-off-by: scbizu <scbizu@icloud.com>
1 parent 9062d11 commit 470fa97

14 files changed

+1010
-90
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ db/config.go
55
.idea/
66
bin/
77
mise*
8+
.aoi

e2e/mongo/nested/gen_User_mongo_orm.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ func (o *User) FindOneAndSave(ctx context.Context, query interface{}) (*mongo.Si
7979
col := UserMgr.GetCol()
8080
opts := options.FindOneAndUpdate().SetUpsert(true)
8181
opts.SetReturnDocument(options.After)
82+
setFields := bson.M{}
83+
setFields[UserMgoFieldUserId] = o.UserId
84+
setFields[UserMgoFieldUsername] = o.Username
85+
setFields[UserMgoFieldAge] = o.Age
86+
setFields[UserMgoFieldBlogs] = o.Blogs
87+
setFields[UserMgoFieldRegisterDate] = o.RegisterDate
8288
update := bson.M{
83-
"$set": bson.M{
84-
UserMgoFieldUserId: o.UserId,
85-
UserMgoFieldUsername: o.Username,
86-
UserMgoFieldAge: o.Age,
87-
UserMgoFieldBlogs: o.Blogs,
88-
UserMgoFieldRegisterDate: o.RegisterDate,
89-
},
89+
"$set": setFields,
9090
}
9191
ret := col.FindOneAndUpdate(ctx, query, update, opts)
9292
if ret.Err() != nil {
@@ -103,14 +103,14 @@ func (o *User) Save(ctx context.Context) (*mongo.UpdateResult, error) {
103103
}
104104

105105
filter := bson.M{"_id": o.ID}
106+
setFields := bson.M{}
107+
setFields[UserMgoFieldUserId] = o.UserId
108+
setFields[UserMgoFieldUsername] = o.Username
109+
setFields[UserMgoFieldAge] = o.Age
110+
setFields[UserMgoFieldBlogs] = o.Blogs
111+
setFields[UserMgoFieldRegisterDate] = o.RegisterDate
106112
update := bson.M{
107-
"$set": bson.M{
108-
UserMgoFieldUserId: o.UserId,
109-
UserMgoFieldUsername: o.Username,
110-
UserMgoFieldAge: o.Age,
111-
UserMgoFieldBlogs: o.Blogs,
112-
UserMgoFieldRegisterDate: o.RegisterDate,
113-
},
113+
"$set": setFields,
114114
}
115115

116116
opts := options.Update().SetUpsert(true)
@@ -135,15 +135,15 @@ func (o *User) Save(ctx context.Context) (*mongo.UpdateResult, error) {
135135
}
136136

137137
func (o *User) InsertUnique(ctx context.Context, query interface{}) (saved bool, err error) {
138+
setFields := bson.M{}
139+
setFields[UserMgoFieldID] = o.ID
140+
setFields[UserMgoFieldUserId] = o.UserId
141+
setFields[UserMgoFieldUsername] = o.Username
142+
setFields[UserMgoFieldAge] = o.Age
143+
setFields[UserMgoFieldBlogs] = o.Blogs
144+
setFields[UserMgoFieldRegisterDate] = o.RegisterDate
138145
update := bson.M{
139-
"$setOnInsert": bson.M{
140-
UserMgoFieldID: o.ID,
141-
UserMgoFieldUserId: o.UserId,
142-
UserMgoFieldUsername: o.Username,
143-
UserMgoFieldAge: o.Age,
144-
UserMgoFieldBlogs: o.Blogs,
145-
UserMgoFieldRegisterDate: o.RegisterDate,
146-
},
146+
"$setOnInsert": setFields,
147147
}
148148

149149
opts := options.Update().SetUpsert(true)

e2e/mongo/user/gen_UserBlog_mongo_orm.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ func (o *UserBlog) FindOneAndSave(ctx context.Context, query interface{}) (*mong
7373
col := UserBlogMgr.GetCol()
7474
opts := options.FindOneAndUpdate().SetUpsert(true)
7575
opts.SetReturnDocument(options.After)
76+
setFields := bson.M{}
77+
setFields[UserBlogMgoFieldUserId] = o.UserId
78+
setFields[UserBlogMgoFieldBlogId] = o.BlogId
79+
setFields[UserBlogMgoFieldContent] = o.Content
7680
update := bson.M{
77-
"$set": bson.M{
78-
UserBlogMgoFieldUserId: o.UserId,
79-
UserBlogMgoFieldBlogId: o.BlogId,
80-
UserBlogMgoFieldContent: o.Content,
81-
},
81+
"$set": setFields,
8282
}
8383
ret := col.FindOneAndUpdate(ctx, query, update, opts)
8484
if ret.Err() != nil {
@@ -95,12 +95,12 @@ func (o *UserBlog) Save(ctx context.Context) (*mongo.UpdateResult, error) {
9595
}
9696

9797
filter := bson.M{"_id": o.ID}
98+
setFields := bson.M{}
99+
setFields[UserBlogMgoFieldUserId] = o.UserId
100+
setFields[UserBlogMgoFieldBlogId] = o.BlogId
101+
setFields[UserBlogMgoFieldContent] = o.Content
98102
update := bson.M{
99-
"$set": bson.M{
100-
UserBlogMgoFieldUserId: o.UserId,
101-
UserBlogMgoFieldBlogId: o.BlogId,
102-
UserBlogMgoFieldContent: o.Content,
103-
},
103+
"$set": setFields,
104104
}
105105

106106
opts := options.Update().SetUpsert(true)
@@ -125,13 +125,13 @@ func (o *UserBlog) Save(ctx context.Context) (*mongo.UpdateResult, error) {
125125
}
126126

127127
func (o *UserBlog) InsertUnique(ctx context.Context, query interface{}) (saved bool, err error) {
128+
setFields := bson.M{}
129+
setFields[UserBlogMgoFieldID] = o.ID
130+
setFields[UserBlogMgoFieldUserId] = o.UserId
131+
setFields[UserBlogMgoFieldBlogId] = o.BlogId
132+
setFields[UserBlogMgoFieldContent] = o.Content
128133
update := bson.M{
129-
"$setOnInsert": bson.M{
130-
UserBlogMgoFieldID: o.ID,
131-
UserBlogMgoFieldUserId: o.UserId,
132-
UserBlogMgoFieldBlogId: o.BlogId,
133-
UserBlogMgoFieldContent: o.Content,
134-
},
134+
"$setOnInsert": setFields,
135135
}
136136

137137
opts := options.Update().SetUpsert(true)

0 commit comments

Comments
 (0)