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

all: gofmt -w -r 'interface{} -> any' (#2874)

Browse Source
This commit is contained in:
Ariel Mashraki
2022-08-19 18:23:04 +03:00
committed by GitHub
parent b6c185a660
commit 2c63d1d70e
619 changed files with 3449 additions and 3449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dialect/sql/sqlgraph/entql.go
View File

@@ -292,7 +292,7 @@ func (e *state) field(f *entql.Field) string {
}
func args(b *sql.Builder, v *entql.Value) {
vs, ok := v.V.([]interface{})
vs, ok := v.V.([]any)
if !ok {
b.Arg(v.V)
return
@@ -301,7 +301,7 @@ func args(b *sql.Builder, v *entql.Value) {
}
// expect panics if the condition is false.
func expect(cond bool, msg string, args ...interface{}) {
func expect(cond bool, msg string, args ...any) {
if !cond {
panic(evalError{fmt.Sprintf("expect "+msg, args...)})
}

16
dialect/sql/sqlgraph/entql_test.go
View File

@@ -78,28 +78,28 @@ func TestGraph_EvalP(t *testing.T) {
s *sql.Selector
p entql.P
wantQuery string
wantArgs []interface{}
wantArgs []any
wantErr bool
}{
{
s: sql.Dialect(dialect.Postgres).Select().From(sql.Table("users")),
p: entql.FieldHasPrefix("name", "a"),
wantQuery: `SELECT * FROM "users" WHERE "users"."name" LIKE $1`,
wantArgs: []interface{}{"a%"},
wantArgs: []any{"a%"},
},
{
s: sql.Dialect(dialect.Postgres).Select().From(sql.Table("users")).
Where(sql.EQ("age", 1)),
p: entql.FieldHasPrefix("name", "a"),
wantQuery: `SELECT * FROM "users" WHERE "age" = $1 AND "users"."name" LIKE $2`,
wantArgs: []interface{}{1, "a%"},
wantArgs: []any{1, "a%"},
},
{
s: sql.Dialect(dialect.Postgres).Select().From(sql.Table("users")).
Where(sql.EQ("age", 1)),
p: entql.FieldHasPrefix("name", "a"),
wantQuery: `SELECT * FROM "users" WHERE "age" = $1 AND "users"."name" LIKE $2`,
wantArgs: []interface{}{1, "a%"},
wantArgs: []any{1, "a%"},
},
{
s: sql.Dialect(dialect.Postgres).Select().From(sql.Table("users")),
@@ -121,7 +121,7 @@ func TestGraph_EvalP(t *testing.T) {
Where(sql.EQ("foo", "bar")),
p: entql.Or(entql.FieldEQ("name", "foo"), entql.FieldEQ("name", "baz")),
wantQuery: `SELECT * FROM "users" WHERE "foo" = $1 AND ("users"."name" = $2 OR "users"."name" = $3)`,
wantArgs: []interface{}{"bar", "foo", "baz"},
wantArgs: []any{"bar", "foo", "baz"},
},
{
s: sql.Dialect(dialect.Postgres).Select().From(sql.Table("users")),
@@ -137,13 +137,13 @@ func TestGraph_EvalP(t *testing.T) {
s: sql.Dialect(dialect.Postgres).Select().From(sql.Table("users")),
p: entql.HasEdgeWith("pets", entql.Or(entql.FieldEQ("name", "pedro"), entql.FieldEQ("name", "xabi"))),
wantQuery: `SELECT * FROM "users" WHERE "users"."uid" IN (SELECT "pets"."owner_id" FROM "pets" WHERE "pets"."name" = $1 OR "pets"."name" = $2)`,
wantArgs: []interface{}{"pedro", "xabi"},
wantArgs: []any{"pedro", "xabi"},
},
{
s: sql.Dialect(dialect.Postgres).Select().From(sql.Table("users")).Where(sql.EQ("active", true)),
p: entql.HasEdgeWith("groups", entql.Or(entql.FieldEQ("name", "GitHub"), entql.FieldEQ("name", "GitLab"))),
wantQuery: `SELECT * FROM "users" WHERE "active" AND "users"."uid" IN (SELECT "user_groups"."user_id" FROM "user_groups" JOIN "groups" AS "t1" ON "user_groups"."group_id" = "t1"."gid" WHERE "t1"."name" = $1 OR "t1"."name" = $2)`,
wantArgs: []interface{}{"GitHub", "GitLab"},
wantArgs: []any{"GitHub", "GitLab"},
},
{
s: sql.Dialect(dialect.Postgres).Select().From(sql.Table("users")).Where(sql.EQ("active", true)),
@@ -156,7 +156,7 @@ func TestGraph_EvalP(t *testing.T) {
s.Where(sql.EQ("owner_id", 10))
})),
wantQuery: `SELECT * FROM "users" WHERE "active" AND "users"."uid" IN (SELECT "pets"."owner_id" FROM "pets" WHERE "pets"."name" = $1 AND "owner_id" = $2)`,
wantArgs: []interface{}{"pedro", 10},
wantArgs: []any{"pedro", 10},
},
}
for i, tt := range tests {

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

@@ -61,7 +61,7 @@ type Step struct {
From struct {
// V can be either one vertex or set of vertices.
// It can be a pre-processed step (sql.Query) or a simple Go type (integer or string).
V interface{}
V any
// Table holds the table name of V (from).
Table string
// Column to join with. Usually the "id" column.
@@ -99,7 +99,7 @@ type Step struct {
type StepOption func(*Step)
// From sets the source of the step.
func From(table, column string, v ...interface{}) StepOption {
func From(table, column string, v ...any) StepOption {
return func(s *Step) {
s.From.Table = table
s.From.Column = column
@@ -410,8 +410,8 @@ type (
Predicate func(*sql.Selector)
Modifiers []func(*sql.UpdateBuilder)
ScanValues func(columns []string) ([]interface{}, error)
Assign func(columns []string, values []interface{}) error
ScanValues func(columns []string) ([]any, error)
Assign func(columns []string, values []any) error
}
)
@@ -490,8 +490,8 @@ type QuerySpec struct {
Predicate func(*sql.Selector)
Modifiers []func(*sql.Selector)
ScanValues func(columns []string) ([]interface{}, error)
Assign func(columns []string, values []interface{}) error
ScanValues func(columns []string) ([]any, error)
Assign func(columns []string, values []any) error
}
// QueryNodes queries the nodes in the graph query and scans them to the given values.
@@ -513,8 +513,8 @@ func CountNodes(ctx context.Context, drv dialect.Driver, spec *QuerySpec) (int,
type EdgeQuerySpec struct {
Edge *EdgeSpec
Predicate func(*sql.Selector)
ScanValues func() [2]interface{}
Assign func(out, in interface{}) error
ScanValues func() [2]any
Assign func(out, in any) error
}
// QueryEdges queries the edges in the graph and scans the result with the given dest function.
@@ -1068,7 +1068,7 @@ func (c *batchCreator) nodes(ctx context.Context, drv dialect.Driver) error {
sorted := keys(columns)
insert := c.builder.Insert(c.Nodes[0].Table).Schema(c.Nodes[0].Schema).Default().Columns(sorted...)
for i := range values {
vs := make([]interface{}, len(sorted))
vs := make([]any, len(sorted))
for j, c := range sorted {
vs[j] = values[i][c]
}
@@ -1223,7 +1223,7 @@ func (g *graph) addM2MEdges(ctx context.Context, ids []driver.Value, edges EdgeS
var (
edges = tables[table]
columns = edges[0].Columns
values = make([]interface{}, 0, len(edges[0].Target.Fields))
values = make([]any, 0, len(edges[0].Target.Fields))
)
// Specs are generated equally for all edges from the same type.
for _, f := range edges[0].Target.Fields {
@@ -1242,9 +1242,9 @@ func (g *graph) addM2MEdges(ctx context.Context, ids []driver.Value, edges EdgeS
pk1, pk2 = pk2, pk1
}
for _, pair := range product(pk1, pk2) {
insert.Values(append([]interface{}{pair[0], pair[1]}, values...)...)
insert.Values(append([]any{pair[0], pair[1]}, values...)...)
if edge.Bidi {
insert.Values(append([]interface{}{pair[1], pair[0]}, values...)...)
insert.Values(append([]any{pair[1], pair[0]}, values...)...)
}
}
}

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

@@ -26,7 +26,7 @@ func TestNeighbors(t *testing.T) {
name string
input *Step
wantQuery string
wantArgs []interface{}
wantArgs []any
}{
{
name: "O2O/1type",
@@ -38,7 +38,7 @@ func TestNeighbors(t *testing.T) {
Edge(O2O, false, "users", "spouse_id"),
),
wantQuery: "SELECT * FROM `users` WHERE `spouse_id` = ?",
wantArgs: []interface{}{1},
wantArgs: []any{1},
},
{
name: "O2O/1type/inverse",
@@ -48,7 +48,7 @@ func TestNeighbors(t *testing.T) {
Edge(O2O, true, "nodes", "prev_id"),
),
wantQuery: "SELECT * FROM `nodes` JOIN (SELECT `prev_id` FROM `nodes` WHERE `id` = ?) AS `t1` ON `nodes`.`id` = `t1`.`prev_id`",
wantArgs: []interface{}{1},
wantArgs: []any{1},
},
{
name: "O2M/1type",
@@ -58,7 +58,7 @@ func TestNeighbors(t *testing.T) {
Edge(O2M, false, "users", "parent_id"),
),
wantQuery: "SELECT * FROM `users` WHERE `parent_id` = ?",
wantArgs: []interface{}{1},
wantArgs: []any{1},
},
{
name: "O2O/2types",
@@ -68,7 +68,7 @@ func TestNeighbors(t *testing.T) {
Edge(O2O, false, "cards", "owner_id"),
),
wantQuery: "SELECT * FROM `card` WHERE `owner_id` = ?",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "O2O/2types/inverse",
@@ -78,7 +78,7 @@ func TestNeighbors(t *testing.T) {
Edge(O2O, true, "cards", "owner_id"),
),
wantQuery: "SELECT * FROM `users` JOIN (SELECT `owner_id` FROM `cards` WHERE `id` = ?) AS `t1` ON `users`.`id` = `t1`.`owner_id`",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "O2M/2types",
@@ -88,7 +88,7 @@ func TestNeighbors(t *testing.T) {
Edge(O2M, false, "pets", "owner_id"),
),
wantQuery: "SELECT * FROM `pets` WHERE `owner_id` = ?",
wantArgs: []interface{}{1},
wantArgs: []any{1},
},
{
name: "M2O/2types/inverse",
@@ -98,7 +98,7 @@ func TestNeighbors(t *testing.T) {
Edge(M2O, true, "pets", "owner_id"),
),
wantQuery: "SELECT * FROM `users` JOIN (SELECT `owner_id` FROM `pets` WHERE `id` = ?) AS `t1` ON `users`.`id` = `t1`.`owner_id`",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "M2O/1type/inverse",
@@ -108,7 +108,7 @@ func TestNeighbors(t *testing.T) {
Edge(M2O, true, "users", "parent_id"),
),
wantQuery: "SELECT * FROM `users` JOIN (SELECT `parent_id` FROM `users` WHERE `id` = ?) AS `t1` ON `users`.`id` = `t1`.`parent_id`",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "M2M/2type",
@@ -118,7 +118,7 @@ func TestNeighbors(t *testing.T) {
Edge(M2M, false, "user_groups", "group_id", "user_id"),
),
wantQuery: "SELECT * FROM `users` JOIN (SELECT `user_groups`.`user_id` FROM `user_groups` WHERE `user_groups`.`group_id` = ?) AS `t1` ON `users`.`id` = `t1`.`user_id`",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "M2M/2type/inverse",
@@ -128,7 +128,7 @@ func TestNeighbors(t *testing.T) {
Edge(M2M, true, "user_groups", "group_id", "user_id"),
),
wantQuery: "SELECT * FROM `groups` JOIN (SELECT `user_groups`.`group_id` FROM `user_groups` WHERE `user_groups`.`user_id` = ?) AS `t1` ON `groups`.`id` = `t1`.`group_id`",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "schema/O2O/1type",
@@ -144,7 +144,7 @@ func TestNeighbors(t *testing.T) {
return step
}(),
wantQuery: "SELECT * FROM `mydb`.`users` WHERE `spouse_id` = ?",
wantArgs: []interface{}{1},
wantArgs: []any{1},
},
{
name: "schema/O2O/1type/inverse",
@@ -159,7 +159,7 @@ func TestNeighbors(t *testing.T) {
return step
}(),
wantQuery: "SELECT * FROM `mydb`.`nodes` JOIN (SELECT `prev_id` FROM `mydb`.`nodes` WHERE `id` = ?) AS `t1` ON `mydb`.`nodes`.`id` = `t1`.`prev_id`",
wantArgs: []interface{}{1},
wantArgs: []any{1},
},
{
name: "schema/O2M/1type",
@@ -173,7 +173,7 @@ func TestNeighbors(t *testing.T) {
return step
}(),
wantQuery: "SELECT * FROM `mydb`.`users` WHERE `parent_id` = ?",
wantArgs: []interface{}{1},
wantArgs: []any{1},
},
{
name: "schema/O2O/2types",
@@ -187,7 +187,7 @@ func TestNeighbors(t *testing.T) {
return step
}(),
wantQuery: "SELECT * FROM `mydb`.`card` WHERE `owner_id` = ?",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "schema/O2O/2types/inverse",
@@ -202,7 +202,7 @@ func TestNeighbors(t *testing.T) {
return step
}(),
wantQuery: "SELECT * FROM `mydb`.`users` JOIN (SELECT `owner_id` FROM `mydb`.`cards` WHERE `id` = ?) AS `t1` ON `mydb`.`users`.`id` = `t1`.`owner_id`",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "schema/O2M/2types",
@@ -216,7 +216,7 @@ func TestNeighbors(t *testing.T) {
return step
}(),
wantQuery: "SELECT * FROM `mydb`.`pets` WHERE `owner_id` = ?",
wantArgs: []interface{}{1},
wantArgs: []any{1},
},
{
name: "schema/M2O/2types/inverse",
@@ -231,7 +231,7 @@ func TestNeighbors(t *testing.T) {
return step
}(),
wantQuery: "SELECT * FROM `s1`.`users` JOIN (SELECT `owner_id` FROM `s2`.`pets` WHERE `id` = ?) AS `t1` ON `s1`.`users`.`id` = `t1`.`owner_id`",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "schema/M2O/1type/inverse",
@@ -246,7 +246,7 @@ func TestNeighbors(t *testing.T) {
return step
}(),
wantQuery: "SELECT * FROM `s1`.`users` JOIN (SELECT `parent_id` FROM `s1`.`users` WHERE `id` = ?) AS `t1` ON `s1`.`users`.`id` = `t1`.`parent_id`",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "schema/M2M/2type",
@@ -261,7 +261,7 @@ func TestNeighbors(t *testing.T) {
return step
}(),
wantQuery: "SELECT * FROM `s1`.`users` JOIN (SELECT `s2`.`user_groups`.`user_id` FROM `s2`.`user_groups` WHERE `s2`.`user_groups`.`group_id` = ?) AS `t1` ON `s1`.`users`.`id` = `t1`.`user_id`",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
{
name: "schema/M2M/2type/inverse",
@@ -276,7 +276,7 @@ func TestNeighbors(t *testing.T) {
return step
}(),
wantQuery: "SELECT * FROM `s1`.`groups` JOIN (SELECT `s2`.`user_groups`.`group_id` FROM `s2`.`user_groups` WHERE `s2`.`user_groups`.`user_id` = ?) AS `t1` ON `s1`.`groups`.`id` = `t1`.`group_id`",
wantArgs: []interface{}{2},
wantArgs: []any{2},
},
}
for _, tt := range tests {
@@ -294,7 +294,7 @@ func TestSetNeighbors(t *testing.T) {
name string
input *Step
wantQuery string
wantArgs []interface{}
wantArgs []any
}{
{
name: "O2M/2types",
@@ -304,7 +304,7 @@ func TestSetNeighbors(t *testing.T) {
Edge(O2M, false, "users", "owner_id"),
),
wantQuery: `SELECT * FROM "pets" JOIN (SELECT "users"."id" FROM "users" WHERE "name" = $1) AS "t1" ON "pets"."owner_id" = "t1"."id"`,
wantArgs: []interface{}{"a8m"},
wantArgs: []any{"a8m"},
},
{
name: "M2O/2types",
@@ -314,7 +314,7 @@ func TestSetNeighbors(t *testing.T) {
Edge(M2O, true, "pets", "owner_id"),
),
wantQuery: `SELECT * FROM "users" JOIN (SELECT "pets"."owner_id" FROM "pets" WHERE "name" = $1) AS "t1" ON "users"."id" = "t1"."owner_id"`,
wantArgs: []interface{}{"pedro"},
wantArgs: []any{"pedro"},
},
{
name: "M2M/2types",
@@ -333,7 +333,7 @@ JOIN
(SELECT "users"."id"
FROM "users"
WHERE "name" = $1) AS "t1" ON "user_groups"."user_id" = "t1"."id") AS "t1" ON "groups"."id" = "t1"."group_id"`,
wantArgs: []interface{}{"a8m"},
wantArgs: []any{"a8m"},
},
{
name: "M2M/2types/inverse",
@@ -352,7 +352,7 @@ JOIN
(SELECT "groups"."id"
FROM "groups"
WHERE "name" = $1) AS "t1" ON "user_groups"."group_id" = "t1"."id") AS "t1" ON "users"."id" = "t1"."user_id"`,
wantArgs: []interface{}{"GitHub"},
wantArgs: []any{"GitHub"},
},
{
name: "schema/O2M/2types",
@@ -366,7 +366,7 @@ JOIN
return step
}(),
wantQuery: `SELECT * FROM "s1"."pets" JOIN (SELECT "s2"."users"."id" FROM "s2"."users" WHERE "name" = $1) AS "t1" ON "s1"."pets"."owner_id" = "t1"."id"`,
wantArgs: []interface{}{"a8m"},
wantArgs: []any{"a8m"},
},
{
name: "schema/M2O/2types",
@@ -380,7 +380,7 @@ JOIN
return step
}(),
wantQuery: `SELECT * FROM "s1"."users" JOIN (SELECT "s2"."pets"."owner_id" FROM "s2"."pets" WHERE "name" = $1) AS "t1" ON "s1"."users"."id" = "t1"."owner_id"`,
wantArgs: []interface{}{"pedro"},
wantArgs: []any{"pedro"},
},
{
name: "schema/M2M/2types",
@@ -404,7 +404,7 @@ JOIN
(SELECT "s2"."users"."id"
FROM "s2"."users"
WHERE "name" = $1) AS "t1" ON "s3"."user_groups"."user_id" = "t1"."id") AS "t1" ON "s1"."groups"."id" = "t1"."group_id"`,
wantArgs: []interface{}{"a8m"},
wantArgs: []any{"a8m"},
},
{
name: "schema/M2M/2types/inverse",
@@ -428,7 +428,7 @@ JOIN
(SELECT "s2"."groups"."id"
FROM "s2"."groups"
WHERE "name" = $1) AS "t1" ON "s3"."user_groups"."group_id" = "t1"."id") AS "t1" ON "s1"."users"."id" = "t1"."user_id"`,
wantArgs: []interface{}{"GitHub"},
wantArgs: []any{"GitHub"},
},
}
for _, tt := range tests {
@@ -642,7 +642,7 @@ func TestHasNeighborsWith(t *testing.T) {
selector *sql.Selector
predicate func(*sql.Selector)
wantQuery string
wantArgs []interface{}
wantArgs []any
}{
{
name: "O2O",
@@ -669,7 +669,7 @@ func TestHasNeighborsWith(t *testing.T) {
s.Where(sql.EQ("name", "a8m"))
},
wantQuery: `SELECT * FROM "cards" WHERE "cards"."owner_id" IN (SELECT "users"."id" FROM "users" WHERE "name" = $1)`,
wantArgs: []interface{}{"a8m"},
wantArgs: []any{"a8m"},
},
{
name: "O2M",
@@ -685,7 +685,7 @@ func TestHasNeighborsWith(t *testing.T) {
s.Where(sql.EQ("name", "pedro"))
},
wantQuery: `SELECT * FROM "users" WHERE "last_name" = $1 AND "users"."id" IN (SELECT "pets"."owner_id" FROM "pets" WHERE "name" = $2)`,
wantArgs: []interface{}{"mashraki", "pedro"},
wantArgs: []any{"mashraki", "pedro"},
},
{
name: "M2O",
@@ -701,7 +701,7 @@ func TestHasNeighborsWith(t *testing.T) {
s.Where(sql.EQ("last_name", "mashraki"))
},
wantQuery: `SELECT * FROM "pets" WHERE "name" = $1 AND "pets"."owner_id" IN (SELECT "users"."id" FROM "users" WHERE "last_name" = $2)`,
wantArgs: []interface{}{"pedro", "mashraki"},
wantArgs: []any{"pedro", "mashraki"},
},
{
name: "M2M",
@@ -721,7 +721,7 @@ WHERE "users"."id" IN
(SELECT "user_groups"."user_id"
FROM "user_groups"
JOIN "groups" AS "t1" ON "user_groups"."group_id" = "t1"."id" WHERE "name" = $1)`,
wantArgs: []interface{}{"GitHub"},
wantArgs: []any{"GitHub"},
},
{
name: "M2M/inverse",
@@ -741,7 +741,7 @@ WHERE "groups"."id" IN
(SELECT "user_groups"."group_id"
FROM "user_groups"
JOIN "users" AS "t1" ON "user_groups"."user_id" = "t1"."id" WHERE "name" = $1)`,
wantArgs: []interface{}{"a8m"},
wantArgs: []any{"a8m"},
},
{
name: "M2M/inverse",
@@ -761,7 +761,7 @@ WHERE "groups"."id" IN
(SELECT "user_groups"."group_id"
FROM "user_groups"
JOIN "users" AS "t1" ON "user_groups"."user_id" = "t1"."id" WHERE "name" IS NOT NULL AND "name" = $1)`,
wantArgs: []interface{}{"a8m"},
wantArgs: []any{"a8m"},
},
{
name: "schema/O2O",
@@ -798,7 +798,7 @@ WHERE "groups"."id" IN
s.Where(sql.EQ("name", "pedro"))
},
wantQuery: `SELECT * FROM "s1"."users" WHERE "last_name" = $1 AND "s1"."users"."id" IN (SELECT "s2"."pets"."owner_id" FROM "s2"."pets" WHERE "name" = $2)`,
wantArgs: []interface{}{"mashraki", "pedro"},
wantArgs: []any{"mashraki", "pedro"},
},
{
name: "schema/M2M",
@@ -823,7 +823,7 @@ WHERE "s1"."users"."id" IN
(SELECT "s2"."user_groups"."user_id"
FROM "s2"."user_groups"
JOIN "s3"."groups" AS "t1" ON "s2"."user_groups"."group_id" = "t1"."id" WHERE "name" = $1)`,
wantArgs: []interface{}{"GitHub"},
wantArgs: []any{"GitHub"},
},
{
name: "O2M/selector",
@@ -839,7 +839,7 @@ WHERE "s1"."users"."id" IN
s.Where(sql.EQ("name", "pedro"))
},
wantQuery: `SELECT * FROM (SELECT * FROM "users") AS "users" WHERE "last_name" = $1 AND "users"."id" IN (SELECT "pets"."owner_id" FROM "pets" WHERE "name" = $2)`,
wantArgs: []interface{}{"mashraki", "pedro"},
wantArgs: []any{"mashraki", "pedro"},
},
{
name: "M2O/selector",
@@ -855,7 +855,7 @@ WHERE "s1"."users"."id" IN
s.Where(sql.EQ("last_name", "mashraki"))
},
wantQuery: `SELECT * FROM (SELECT * FROM "pets") AS "pets" WHERE "name" = $1 AND "pets"."owner_id" IN (SELECT "users"."id" FROM "users" WHERE "last_name" = $2)`,
wantArgs: []interface{}{"pedro", "mashraki"},
wantArgs: []any{"pedro", "mashraki"},
},
{
name: "M2M/selector",
@@ -869,7 +869,7 @@ WHERE "s1"."users"."id" IN
s.Where(sql.EQ("name", "GitHub"))
},
wantQuery: `SELECT * FROM (SELECT * FROM "users") AS "users" WHERE "users"."id" IN (SELECT "user_groups"."user_id" FROM "user_groups" JOIN "groups" AS "t1" ON "user_groups"."group_id" = "t1"."id" WHERE "name" = $1)`,
wantArgs: []interface{}{"GitHub"},
wantArgs: []any{"GitHub"},
},
}
for _, tt := range tests {
@@ -1497,8 +1497,8 @@ type user struct {
}
}
func (*user) values(columns []string) ([]interface{}, error) {
values := make([]interface{}, len(columns))
func (*user) values(columns []string) ([]any, error) {
values := make([]any, len(columns))
for i := range columns {
switch c := columns[i]; c {
case "id", "age", "fk1", "fk2":
@@ -1512,7 +1512,7 @@ func (*user) values(columns []string) ([]interface{}, error) {
return values, nil
}
func (u *user) assign(columns []string, values []interface{}) error {
func (u *user) assign(columns []string, values []any) error {
if len(columns) != len(values) {
return fmt.Errorf("mismatch number of values")
}
@@ -2204,12 +2204,12 @@ func TestQueryNodes(t *testing.T) {
Modifiers: []func(*sql.Selector){
func(s *sql.Selector) { s.ForUpdate(sql.WithLockAction(sql.NoWait)) },
},
ScanValues: func(columns []string) ([]interface{}, error) {
ScanValues: func(columns []string) ([]any, error) {
u := &user{}
users = append(users, u)
return u.values(columns)
},
Assign: func(columns []string, values []interface{}) error {
Assign: func(columns []string, values []any) error {
return users[len(users)-1].assign(columns, values)
},
}
@@ -2263,12 +2263,12 @@ func TestQueryNodesSchema(t *testing.T) {
Predicate: func(s *sql.Selector) {
s.Where(sql.LT("age", 40))
},
ScanValues: func(columns []string) ([]interface{}, error) {
ScanValues: func(columns []string) ([]any, error) {
u := &user{}
users = append(users, u)
return u.values(columns)
},
Assign: func(columns []string, values []interface{}) error {
Assign: func(columns []string, values []any) error {
return users[len(users)-1].assign(columns, values)
},
}
@@ -2302,10 +2302,10 @@ func TestQueryEdges(t *testing.T) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues("user_id", 1, 2, 3))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
ScanValues: func() [2]any {
return [2]any{&sql.NullInt64{}, &sql.NullInt64{}}
},
Assign: func(out, in interface{}) error {
Assign: func(out, in any) error {
o, i := out.(*sql.NullInt64), in.(*sql.NullInt64)
edges = append(edges, []int64{o.Int64, i.Int64})
return nil
@@ -2340,10 +2340,10 @@ func TestQueryEdgesSchema(t *testing.T) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues("user_id", 1, 2, 3))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
ScanValues: func() [2]any {
return [2]any{&sql.NullInt64{}, &sql.NullInt64{}}
},
Assign: func(out, in interface{}) error {
Assign: func(out, in any) error {
o, i := out.(*sql.NullInt64), in.(*sql.NullInt64)
edges = append(edges, []int64{o.Int64, i.Int64})
return nil