golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-22 09:31:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

entc/select: add selection api

Browse Source 
Summary: Pull Request resolved: https://github.com/facebookincubator/ent/pull/27

Reviewed By: alexsn

Differential Revision: D17164536

fbshipit-source-id: f5caa80b05aff1ef8ec30d7a53256b00380d018c
This commit is contained in:
Ariel Mashraki
2019-09-04 07:12:55 -07:00
committed by Facebook Github Bot
parent c95a00c4ce
commit 9ab0a28ffe
38 changed files with 4934 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dialect/sql/builder.go
View File

@@ -750,8 +750,8 @@ func (d *DeleteBuilder) Where(p *Predicate) *DeleteBuilder {
// FromSelect make it possible to delete a sub query.
func (d *DeleteBuilder) FromSelect(s *Selector) *DeleteBuilder {
d.Where(s.where)
if s.from != nil {
d.table = s.from.name
if table, _ := s.from.(*SelectTable); table != nil {
d.table = table.name
}
return d
}
@@ -1217,7 +1217,7 @@ type join struct {
type Selector struct {
as string
columns []string
from *SelectTable
from TableView
joins []join
where *Predicate
or bool
@@ -1250,8 +1250,8 @@ func (s *Selector) Select(columns ...string) *Selector {
return s
}
// From sets the source of `FORM` clause.
func (s *Selector) From(t *SelectTable) *Selector {
// From sets the source of `FROM` clause.
func (s *Selector) From(t TableView) *Selector {
s.from = t
return s
}
@@ -1312,7 +1312,7 @@ func (s *Selector) Or() *Selector {
// Table returns the selected table.
func (s *Selector) Table() *SelectTable {
return s.from
return s.from.(*SelectTable)
}
// Join appends a `JOIN` clause to the statement.
@@ -1339,7 +1339,7 @@ func (s *Selector) C(column string) string {
if s.as != "" {
return fmt.Sprintf("`%s`.`%s`", s.as, column)
}
return s.from.C(column)
return s.Table().C(column)
}
// Columns returns a list of formatted strings for a selected columns from this statement.
@@ -1445,7 +1445,14 @@ func (s *Selector) Query() (string, []interface{}) {
b.WriteString("*")
}
b.WriteString(" FROM ")
b.WriteString(s.from.ref())
switch t := s.from.(type) {
case *SelectTable:
b.WriteString(t.ref())
case *Selector:
query, args := t.Query()
b.WriteString(fmt.Sprintf("(%s) AS `%s`", query, t.as))
b.args = append(b.args, args...)
}
for _, join := range s.joins {
b.WriteString(fmt.Sprintf(" %s ", join.kind))
switch view := join.table.(type) {
@@ -1504,7 +1511,7 @@ type WithBuilder struct {
// With returns a new builder for the `WITH` statement.
//
// n := Queriers{With("users_view").As(Select().From(Table("users"))), Select().From(Table("users_view"))}
// n := Queries{With("users_view").As(Select().From(Table("users"))), Select().From(Table("users_view"))}
// return n.Query()
//
func With(name string) *WithBuilder {

16
dialect/sql/builder_test.go
View File

@@ -388,6 +388,22 @@ func TestBuilder(t *testing.T) {
wantQuery: "SELECT * FROM `users` WHERE NOT (`name` = ? AND `age` = ?)",
wantArgs: []interface{}{"foo", "bar"},
},
{
input: func() Querier {
s1 := Select().From(Table("users")).Where(Not(EQ("name", "foo").And().EQ("age", "bar")))
return Queries{With("users_view").As(s1), Select("name").From(Table("users_view"))}
}(),
wantQuery: "WITH users_view AS (SELECT * FROM `users` WHERE NOT (`name` = ? AND `age` = ?)) SELECT `name` FROM `users_view`",
wantArgs: []interface{}{"foo", "bar"},
},
{
input: func() Querier {
s1 := Select().From(Table("users")).Where(Not(EQ("name", "foo").And().EQ("age", "bar"))).As("users_view")
return Select("name").From(s1)
}(),
wantQuery: "SELECT `name` FROM (SELECT * FROM `users` WHERE NOT (`name` = ? AND `age` = ?)) AS `users_view`",
wantArgs: []interface{}{"foo", "bar"},
},
{
input: func() Querier {
t1 := Table("users")