golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-01 23:20:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

dialect/sql/sqlgraph: apply predicate on update-node

Browse Source
This commit is contained in:
Ariel Mashraki
2021-01-22 22:45:04 +02:00
committed by Ariel Mashraki
parent 5e4d7dcbfc
commit f315801779
70 changed files with 485 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dialect/sql/sqlgraph/graph.go
View File

@@ -653,6 +653,11 @@ func (u *updater) node(ctx context.Context, tx dialect.ExecQuerier) error {
clearEdges = EdgeSpecs(u.Edges.Clear).GroupRel()
)
update := u.builder.Update(u.Node.Table).Schema(u.Node.Schema).Where(sql.EQ(u.Node.ID.Column, id))
if pred := u.Predicate; pred != nil {
selector := u.builder.Select().From(u.builder.Table(u.Node.Table).Schema(u.Node.Schema))
pred(selector)
update.FromSelect(selector)
}
if err := u.setTableColumns(update, addEdges, clearEdges); err != nil {
return err
}
@@ -669,6 +674,9 @@ func (u *updater) node(ctx context.Context, tx dialect.ExecQuerier) error {
selector := u.builder.Select(u.Node.Columns...).
From(u.builder.Table(u.Node.Table).Schema(u.Node.Schema)).
Where(sql.EQ(u.Node.ID.Column, u.Node.ID.Value))
if pred := u.Predicate; pred != nil {
pred(selector)
}
rows := &sql.Rows{}
query, args := selector.Query()
if err := tx.Query(ctx, query, args, rows); err != nil {

11
dialect/sql/sqlgraph/graph_test.go
View File

@@ -1333,6 +1333,9 @@ func TestUpdateNode(t *testing.T) {
Columns: []string{"id", "name", "age"},
ID: &FieldSpec{Column: "id", Type: field.TypeInt, Value: 1},
},
Predicate: func(s *sql.Selector) {
s.Where(sql.EQ("deleted", false))
},
Fields: FieldMut{
Add: []*FieldSpec{
{Column: "age", Type: field.TypeInt, Value: 1},
@@ -1344,11 +1347,11 @@ func TestUpdateNode(t *testing.T) {
},
prepare: func(mock sqlmock.Sqlmock) {
mock.ExpectBegin()
mock.ExpectExec(escape("UPDATE `users` SET `name` = NULL, `age` = COALESCE(`age`, ?) + ? WHERE `id` = ?")).
WithArgs(0, 1, 1).
mock.ExpectExec(escape("UPDATE `users` SET `name` = NULL, `age` = COALESCE(`age`, ?) + ? WHERE `id` = ? AND `deleted` = ?")).
WithArgs(0, 1, 1, false).
WillReturnResult(sqlmock.NewResult(1, 1))
mock.ExpectQuery(escape("SELECT `id`, `name`, `age` FROM `users` WHERE `id` = ?")).
WithArgs(1).
mock.ExpectQuery(escape("SELECT `id`, `name`, `age` FROM `users` WHERE `id` = ? AND `deleted` = ?")).
WithArgs(1, false).
WillReturnRows(sqlmock.NewRows([]string{"id", "age", "name"}).
AddRow(1, 31, nil))
mock.ExpectCommit()