diff --git a/dialect/dialect.go b/dialect/dialect.go index cf6f72e82..09e5f278f 100644 --- a/dialect/dialect.go +++ b/dialect/dialect.go @@ -20,10 +20,10 @@ const ( type ExecQuerier interface { // Exec executes a query that doesn't return rows. For example, in SQL, INSERT or UPDATE. // It scans the result into the pointer v. In SQL, you it's usually sql.Result. - Exec(ctx context.Context, query string, args interface{}, v interface{}) error + Exec(ctx context.Context, query string, args, v interface{}) error // Query executes a query that returns rows, typically a SELECT in SQL. // It scans the result into the pointer v. In SQL, you it's usually *sql.Rows. - Query(ctx context.Context, query string, args interface{}, v interface{}) error + Query(ctx context.Context, query string, args, v interface{}) error } // Driver is the interface that wraps all necessary operations for ent clients. @@ -61,13 +61,13 @@ func Debug(d Driver, logger ...func(...interface{})) Driver { } // Exec logs its params and calls the underlying driver Exec method. -func (d *DebugDriver) Exec(ctx context.Context, query string, args interface{}, v interface{}) error { +func (d *DebugDriver) Exec(ctx context.Context, query string, args, v interface{}) error { d.log(fmt.Sprintf("driver.Exec: query=%v args=%v", query, args)) return d.Driver.Exec(ctx, query, args, v) } // Query logs its params and calls the underlying driver Query method. -func (d *DebugDriver) Query(ctx context.Context, query string, args interface{}, v interface{}) error { +func (d *DebugDriver) Query(ctx context.Context, query string, args, v interface{}) error { d.log(fmt.Sprintf("driver.Query: query=%v args=%v", query, args)) return d.Driver.Query(ctx, query, args, v) } @@ -91,13 +91,13 @@ type DebugTx struct { } // Exec logs its params and calls the underlying transaction Exec method. -func (d *DebugTx) Exec(ctx context.Context, query string, args interface{}, v interface{}) error { +func (d *DebugTx) Exec(ctx context.Context, query string, args, v interface{}) error { d.log(fmt.Sprintf("Tx(%s).Exec: query=%v args=%v", d.id, query, args)) return d.Tx.Exec(ctx, query, args, v) } // Query logs its params and calls the underlying transaction Query method. -func (d *DebugTx) Query(ctx context.Context, query string, args interface{}, v interface{}) error { +func (d *DebugTx) Query(ctx context.Context, query string, args, v interface{}) error { d.log(fmt.Sprintf("Tx(%s).Query: query=%v args=%v", d.id, query, args)) return d.Tx.Query(ctx, query, args, v) } diff --git a/dialect/gremlin/driver.go b/dialect/gremlin/driver.go index afe771b5b..63408baa4 100644 --- a/dialect/gremlin/driver.go +++ b/dialect/gremlin/driver.go @@ -23,7 +23,7 @@ func NewDriver(c *Client) *Driver { func (Driver) Dialect() string { return dialect.Neptune } // Exec implements the dialect.Exec method. -func (c *Driver) Exec(ctx context.Context, query string, args interface{}, v interface{}) error { +func (c *Driver) Exec(ctx context.Context, query string, args, v interface{}) error { vr, ok := v.(*Response) if !ok { return fmt.Errorf("dialect/gremlin: invalid type %T. expect *gremlin.Response", v) @@ -41,7 +41,7 @@ func (c *Driver) Exec(ctx context.Context, query string, args interface{}, v int } // Query implements the dialect.Query method. -func (c *Driver) Query(ctx context.Context, query string, args interface{}, v interface{}) error { +func (c *Driver) Query(ctx context.Context, query string, args, v interface{}) error { return c.Exec(ctx, query, args, v) } diff --git a/dialect/sql/driver.go b/dialect/sql/driver.go index 25574b261..773c72caf 100644 --- a/dialect/sql/driver.go +++ b/dialect/sql/driver.go @@ -82,7 +82,7 @@ type conn struct { } // Exec implements the dialect.Exec method. -func (c *conn) Exec(ctx context.Context, query string, args interface{}, v interface{}) error { +func (c *conn) Exec(ctx context.Context, query string, args, v interface{}) error { vr, ok := v.(*sql.Result) if !ok { return fmt.Errorf("dialect/sql: invalid type %T. expect *sql.Result", v) @@ -100,7 +100,7 @@ func (c *conn) Exec(ctx context.Context, query string, args interface{}, v inter } // Exec implements the dialect.Query method. -func (c *conn) Query(ctx context.Context, query string, args interface{}, v interface{}) error { +func (c *conn) Query(ctx context.Context, query string, args, v interface{}) error { vr, ok := v.(*Rows) if !ok { return fmt.Errorf("dialect/sql: invalid type %T. expect *sql.Rows", v) diff --git a/entc/gen/bindata.go b/entc/gen/bindata.go index 0028f9a51..78f5c7617 100644 --- a/entc/gen/bindata.go +++ b/entc/gen/bindata.go @@ -1,4 +1,4 @@ -// Code generated by go-bindata. (@generated) DO NOT EDIT. +// Package gen Code generated by go-bindata. (@generated) DO NOT EDIT. // sources: // template/base.tmpl // template/builder/create.tmpl @@ -85,21 +85,32 @@ type bindataFileInfo struct { modTime time.Time } +// Name return file name func (fi bindataFileInfo) Name() string { return fi.name } + +// Size return file size func (fi bindataFileInfo) Size() int64 { return fi.size } + +// Mode return file mode func (fi bindataFileInfo) Mode() os.FileMode { return fi.mode } + +// Mode return file modify time func (fi bindataFileInfo) ModTime() time.Time { return fi.modTime } + +// IsDir return file whether a directory func (fi bindataFileInfo) IsDir() bool { - return false + return fi.mode&os.ModeDir != 0 } + +// Sys return file is sys mode func (fi bindataFileInfo) Sys() interface{} { return nil } @@ -119,7 +130,7 @@ func templateBaseTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/base.tmpl", size: 5021, mode: os.FileMode(420), modTime: time.Unix(1564913315, 0)} + info := bindataFileInfo{name: "template/base.tmpl", size: 5021, mode: os.FileMode(420), modTime: time.Unix(1565007749, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -139,7 +150,7 @@ func templateBuilderCreateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/builder/create.tmpl", size: 2829, mode: os.FileMode(420), modTime: time.Unix(1565106398, 0)} + info := bindataFileInfo{name: "template/builder/create.tmpl", size: 2829, mode: os.FileMode(420), modTime: time.Unix(1565164684, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -159,7 +170,7 @@ func templateBuilderDeleteTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/builder/delete.tmpl", size: 2044, mode: os.FileMode(420), modTime: time.Unix(1565106398, 0)} + info := bindataFileInfo{name: "template/builder/delete.tmpl", size: 2044, mode: os.FileMode(420), modTime: time.Unix(1565162769, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -179,7 +190,7 @@ func templateBuilderQueryTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/builder/query.tmpl", size: 13220, mode: os.FileMode(420), modTime: time.Unix(1565165343, 0)} + info := bindataFileInfo{name: "template/builder/query.tmpl", size: 13220, mode: os.FileMode(420), modTime: time.Unix(1565178244, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -199,7 +210,7 @@ func templateBuilderSetterTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/builder/setter.tmpl", size: 3040, mode: os.FileMode(420), modTime: time.Unix(1565180155, 0)} + info := bindataFileInfo{name: "template/builder/setter.tmpl", size: 3040, mode: os.FileMode(420), modTime: time.Unix(1565187546, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -219,7 +230,7 @@ func templateBuilderUpdateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/builder/update.tmpl", size: 7364, mode: os.FileMode(420), modTime: time.Unix(1565106398, 0)} + info := bindataFileInfo{name: "template/builder/update.tmpl", size: 7364, mode: os.FileMode(420), modTime: time.Unix(1565164684, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -239,7 +250,7 @@ func templateClientTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/client.tmpl", size: 4327, mode: os.FileMode(420), modTime: time.Unix(1565202608, 0)} + info := bindataFileInfo{name: "template/client.tmpl", size: 4327, mode: os.FileMode(420), modTime: time.Unix(1565253333, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -259,7 +270,7 @@ func templateConfigTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/config.tmpl", size: 1077, mode: os.FileMode(420), modTime: time.Unix(1564913322, 0)} + info := bindataFileInfo{name: "template/config.tmpl", size: 1077, mode: os.FileMode(420), modTime: time.Unix(1565007749, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -279,7 +290,7 @@ func templateContextTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/context.tmpl", size: 523, mode: os.FileMode(420), modTime: time.Unix(1564913326, 0)} + info := bindataFileInfo{name: "template/context.tmpl", size: 523, mode: os.FileMode(420), modTime: time.Unix(1565007749, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -299,7 +310,7 @@ func templateDialectGremlinByTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/by.tmpl", size: 1679, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/by.tmpl", size: 1679, mode: os.FileMode(420), modTime: time.Unix(1564494654, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -319,7 +330,7 @@ func templateDialectGremlinCreateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/create.tmpl", size: 2567, mode: os.FileMode(420), modTime: time.Unix(1558503319, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/create.tmpl", size: 2567, mode: os.FileMode(420), modTime: time.Unix(1560858191, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -339,7 +350,7 @@ func templateDialectGremlinDecodeTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/decode.tmpl", size: 1924, mode: os.FileMode(420), modTime: time.Unix(1565180189, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/decode.tmpl", size: 1924, mode: os.FileMode(420), modTime: time.Unix(1565187546, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -359,7 +370,7 @@ func templateDialectGremlinDeleteTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/delete.tmpl", size: 541, mode: os.FileMode(420), modTime: time.Unix(1563979564, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/delete.tmpl", size: 541, mode: os.FileMode(420), modTime: time.Unix(1564440681, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -379,7 +390,7 @@ func templateDialectGremlinErrorsTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/errors.tmpl", size: 1608, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/errors.tmpl", size: 1608, mode: os.FileMode(420), modTime: time.Unix(1564494654, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -399,7 +410,7 @@ func templateDialectGremlinGroupTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/group.tmpl", size: 1151, mode: os.FileMode(420), modTime: time.Unix(1558503319, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/group.tmpl", size: 1151, mode: os.FileMode(420), modTime: time.Unix(1560858192, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -419,7 +430,7 @@ func templateDialectGremlinMetaTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/meta.tmpl", size: 508, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/meta.tmpl", size: 508, mode: os.FileMode(420), modTime: time.Unix(1564494654, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -439,7 +450,7 @@ func templateDialectGremlinPredicateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/predicate.tmpl", size: 3117, mode: os.FileMode(420), modTime: time.Unix(1565183614, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/predicate.tmpl", size: 3117, mode: os.FileMode(420), modTime: time.Unix(1565187546, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -459,7 +470,7 @@ func templateDialectGremlinQueryTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/query.tmpl", size: 3733, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/query.tmpl", size: 3733, mode: os.FileMode(420), modTime: time.Unix(1564494654, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -479,7 +490,7 @@ func templateDialectGremlinUpdateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/update.tmpl", size: 4741, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/update.tmpl", size: 4741, mode: os.FileMode(420), modTime: time.Unix(1564494654, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -499,7 +510,7 @@ func templateDialectSqlByTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/by.tmpl", size: 753, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/sql/by.tmpl", size: 753, mode: os.FileMode(420), modTime: time.Unix(1564494654, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -519,7 +530,7 @@ func templateDialectSqlCreateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/create.tmpl", size: 6066, mode: os.FileMode(420), modTime: time.Unix(1565180278, 0)} + info := bindataFileInfo{name: "template/dialect/sql/create.tmpl", size: 6066, mode: os.FileMode(420), modTime: time.Unix(1565187546, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -539,7 +550,7 @@ func templateDialectSqlDecodeTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/decode.tmpl", size: 1991, mode: os.FileMode(420), modTime: time.Unix(1565180221, 0)} + info := bindataFileInfo{name: "template/dialect/sql/decode.tmpl", size: 1991, mode: os.FileMode(420), modTime: time.Unix(1565187546, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -559,7 +570,7 @@ func templateDialectSqlDeleteTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/delete.tmpl", size: 489, mode: os.FileMode(420), modTime: time.Unix(1563979564, 0)} + info := bindataFileInfo{name: "template/dialect/sql/delete.tmpl", size: 489, mode: os.FileMode(420), modTime: time.Unix(1564440681, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -579,7 +590,7 @@ func templateDialectSqlErrorsTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/errors.tmpl", size: 771, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/sql/errors.tmpl", size: 771, mode: os.FileMode(420), modTime: time.Unix(1564494654, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -599,7 +610,7 @@ func templateDialectSqlGroupTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/group.tmpl", size: 835, mode: os.FileMode(420), modTime: time.Unix(1558503319, 0)} + info := bindataFileInfo{name: "template/dialect/sql/group.tmpl", size: 835, mode: os.FileMode(420), modTime: time.Unix(1560858192, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -619,7 +630,7 @@ func templateDialectSqlMetaTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/meta.tmpl", size: 1586, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/sql/meta.tmpl", size: 1586, mode: os.FileMode(420), modTime: time.Unix(1564494654, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -639,7 +650,7 @@ func templateDialectSqlPredicateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/predicate.tmpl", size: 4330, mode: os.FileMode(420), modTime: time.Unix(1565183595, 0)} + info := bindataFileInfo{name: "template/dialect/sql/predicate.tmpl", size: 4330, mode: os.FileMode(420), modTime: time.Unix(1565187546, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -659,7 +670,7 @@ func templateDialectSqlQueryTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/query.tmpl", size: 6186, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/sql/query.tmpl", size: 6186, mode: os.FileMode(420), modTime: time.Unix(1564498182, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -679,7 +690,7 @@ func templateDialectSqlUpdateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/update.tmpl", size: 11354, mode: os.FileMode(420), modTime: time.Unix(1565180203, 0)} + info := bindataFileInfo{name: "template/dialect/sql/update.tmpl", size: 11354, mode: os.FileMode(420), modTime: time.Unix(1565187546, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -699,7 +710,7 @@ func templateEntTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/ent.tmpl", size: 3369, mode: os.FileMode(420), modTime: time.Unix(1565180140, 0)} + info := bindataFileInfo{name: "template/ent.tmpl", size: 3369, mode: os.FileMode(420), modTime: time.Unix(1565187546, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -719,7 +730,7 @@ func templateExampleTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/example.tmpl", size: 2204, mode: os.FileMode(420), modTime: time.Unix(1564913333, 0)} + info := bindataFileInfo{name: "template/example.tmpl", size: 2204, mode: os.FileMode(420), modTime: time.Unix(1565007749, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -739,7 +750,7 @@ func templateHeaderTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/header.tmpl", size: 240, mode: os.FileMode(420), modTime: time.Unix(1564913919, 0)} + info := bindataFileInfo{name: "template/header.tmpl", size: 240, mode: os.FileMode(420), modTime: time.Unix(1565007749, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -759,7 +770,7 @@ func templateImportTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/import.tmpl", size: 506, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/import.tmpl", size: 506, mode: os.FileMode(420), modTime: time.Unix(1564494654, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -779,7 +790,7 @@ func templateMetaTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/meta.tmpl", size: 2162, mode: os.FileMode(420), modTime: time.Unix(1564915819, 0)} + info := bindataFileInfo{name: "template/meta.tmpl", size: 2162, mode: os.FileMode(420), modTime: time.Unix(1565007749, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -799,7 +810,7 @@ func templateMigrateMigrateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/migrate/migrate.tmpl", size: 1041, mode: os.FileMode(420), modTime: time.Unix(1565523579, 0)} + info := bindataFileInfo{name: "template/migrate/migrate.tmpl", size: 1041, mode: os.FileMode(420), modTime: time.Unix(1565532395, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -819,7 +830,7 @@ func templateMigrateSchemaTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/migrate/schema.tmpl", size: 2708, mode: os.FileMode(420), modTime: time.Unix(1565180603, 0)} + info := bindataFileInfo{name: "template/migrate/schema.tmpl", size: 2708, mode: os.FileMode(420), modTime: time.Unix(1565187546, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -839,12 +850,12 @@ func templatePredicateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/predicate.tmpl", size: 967, mode: os.FileMode(420), modTime: time.Unix(1564915823, 0)} + info := bindataFileInfo{name: "template/predicate.tmpl", size: 967, mode: os.FileMode(420), modTime: time.Unix(1565007749, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _templateTxTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x57\x4d\x8f\xe3\x36\x0f\x3e\xdb\xbf\x82\x6f\x30\x78\x11\x0f\xbc\x76\xcf\x01\xe6\x34\xdb\x43\x2f\x03\xb4\x9b\xa2\x7b\xdb\x55\x24\x26\x16\x6a\x4b\xa9\x4c\x27\x0a\x8c\xfc\xf7\x82\x92\xbf\x32\xc9\x6e\x3f\x80\x5e\x76\x62\x89\x22\x1f\x92\x0f\x1f\x69\xfb\x1e\x14\xee\xb5\x41\x58\x91\x5f\xc1\xf5\x9a\xa6\x7d\x0f\x84\xcd\xb1\x16\x84\xb0\xaa\x50\x28\x74\x2b\x78\x0a\x5b\xba\x39\x5a\x47\xb0\x4e\x93\x95\xb4\x86\xd0\xd3\x2a\x4d\x56\xed\xc5\xc8\x55\x9a\x26\xab\xfd\x4e\x96\x68\xa8\x54\x5a\xd4\x28\x69\x95\x66\x69\x5a\x96\xb0\xf5\xa0\x5b\x10\x40\x4e\x98\x56\x48\xd2\xd6\x88\x1a\x64\xad\xd1\x10\x50\x25\x88\xb7\xa5\x43\x41\xa8\x60\x77\x01\x29\xea\x5a\x9b\x03\xbc\x06\x8b\x62\xeb\xd7\x59\x91\xd2\xe5\x88\xec\xa9\x25\xd7\x49\x82\x3e\x4d\xa4\x35\x7b\x7d\x48\x93\xbe\x07\x27\xcc\x01\xe1\xe9\x4b\x0e\x4f\x06\x36\x2f\xf0\x54\xbc\x59\x85\x2d\x7c\xb8\x5e\xd3\x24\x29\x4b\xe8\x7b\x78\x32\xc5\x9b\x68\x10\xae\x57\x0e\x47\x15\x8e\x08\xf6\xd6\x81\x36\x84\x8e\xa1\x99\x03\x9c\x35\x55\x61\xff\xf6\xd0\xae\xd3\xb5\x42\xd7\x16\x69\x92\xdc\xee\x3c\xdf\x7c\x46\xd4\x01\x16\x1a\xc5\x65\xbb\x86\x2a\xbc\xda\xa6\xd1\x04\x32\xfc\x89\x00\x16\x05\x29\xd2\x7d\x67\x24\xac\xc9\xc3\xf3\xd6\x67\x83\xf5\x3a\x03\x74\xce\x3a\x4e\xd7\x21\x75\xce\x00\xf9\x22\x26\x5e\x28\xa7\x4f\xe8\x8a\xf5\x33\xf9\x8f\xe1\x67\x56\x90\x2f\xc6\x83\x43\xd4\x5f\x6c\x5d\xef\x84\xfc\x1d\xdc\xf0\xe3\x2f\x23\x8f\x27\xfe\x45\xec\xf9\xe8\x98\x73\xac\x70\x3c\xce\x14\x78\x5d\x34\x7d\xa7\x8d\x6a\x81\x2c\xc8\xce\xb9\xb0\xfa\x9d\x72\x84\x73\xeb\x0c\x9e\x07\x0f\x33\xa8\xff\xc7\x95\x3e\x4d\x06\x46\x6c\x66\x9c\x79\x9a\x24\x9f\x64\x85\x8d\xd8\x40\xa3\x0f\x4e\x10\x16\x6f\x78\x8e\x4b\x6b\xf2\x43\x1e\x59\x1e\x7b\xfa\x7d\x1a\xdd\x76\x7d\x03\x6f\x78\x7e\xd0\xf8\xf5\x14\x7c\xf4\xca\x2c\x08\x1e\x02\x13\xfa\xbe\x7c\x86\xbd\x76\x2d\x81\xb1\x0a\x03\xfb\x94\x95\x80\x5e\x34\xc7\x1a\xe1\xb9\xbc\x5e\xd3\xbe\xff\x00\x4f\xd1\x68\xf3\x02\xda\x28\xf4\x13\x98\x1f\xc2\x24\x96\x25\x8c\xa5\x87\xb3\x13\xc7\xd8\xd6\x83\x3e\xa1\x81\x61\xfc\x8a\xad\x8f\x5c\x16\x60\xec\x71\x5a\x1d\x0e\x69\x8e\xd6\xa0\x21\x11\xeb\xcd\x73\x5a\x21\x68\x85\x22\xcc\x87\x85\xb6\x3b\x86\x69\x5f\xb4\xa5\x0d\x0e\x6d\x47\x20\x94\xe2\x59\x11\xe6\x02\xe8\xc9\x09\x90\x9c\x0c\xd9\x00\x63\x1e\x95\xb2\x84\xdf\x2a\x34\x20\xc6\xb5\x30\xdc\xc1\xfd\x40\x21\x9e\xee\x1c\x34\xc1\x01\x87\xa9\x68\xb9\x9c\x8b\x1c\xb4\x69\x49\x18\x89\xc5\x62\x8a\x84\x51\x33\xb5\x85\xc3\x90\x21\x97\x92\x1d\x84\x61\x66\x89\x19\x71\x04\x73\xde\xe9\x5a\x74\xd0\x74\x2d\x05\x18\x60\x0d\xb2\x4f\xbb\xe7\xcd\x06\xb4\x01\xeb\x18\x23\x73\x32\xc6\xb1\x6e\x1a\x9c\xfb\xb9\x29\x4b\x3e\xfd\xd3\x1e\x04\xc8\xda\xb6\xa8\x96\xdb\x5c\x44\x6c\x76\xa8\x14\xaa\xe0\xd9\xe0\x10\x08\x0e\x68\xd0\x05\xb1\x43\x43\x9a\x34\xb6\xf9\x84\x30\xac\x5c\xd8\xaf\x38\x1e\x6b\x8d\x3c\x34\x7f\x74\xe8\x2e\x79\x48\x6f\x60\xc9\x26\x68\x53\x20\xc8\xc8\xbe\xe2\x67\xb6\xfa\xfc\xf9\x33\x97\x93\x3d\x85\x53\x70\xd6\x75\x0d\x3b\x04\xf4\x28\x3b\x42\x15\x88\x53\x39\xdb\x1d\xa2\xc6\xa9\x81\x42\x95\x96\xd5\xa4\xc1\x54\x31\x03\xee\x53\x7d\xb3\x84\x71\x76\x27\xee\xe9\x16\x8c\x25\x38\x58\x67\x3b\xe2\x6b\xa4\x15\x7b\x1c\xd4\x7a\x32\x9a\x35\x3b\x44\x9f\xa3\x22\xb4\x24\x5c\x0c\x79\x53\x5c\xd8\x3b\xdb\x14\x69\xa2\xdc\xe9\x1d\x71\xa3\x0f\x3f\x6a\x78\x67\x14\xba\xfa\xc2\x5c\xbc\x01\x9c\x90\x5f\x70\x68\x90\x23\x83\xe7\xad\x1f\xb2\xe4\xc2\x1a\x3c\xbf\xbb\x94\x06\x52\x46\xf5\x09\xe6\x6b\x49\x1e\x86\xcb\xae\x78\x8d\x7f\x73\xb8\xc7\x95\xc1\x2c\x86\x79\x54\xce\x8c\x33\x26\x1f\xbe\x78\x8e\x95\x3b\x15\xd1\x61\x96\x26\x7a\x1f\x96\xff\xf7\x02\x46\xd7\x6c\x38\xea\x99\xd1\x75\x38\xc1\x7a\x31\x69\xdc\xe8\xb9\x27\xcf\xf2\x16\x00\x6c\xf8\x9f\x6b\xce\x07\x86\xfc\xb6\x7e\x92\xda\xf7\xf5\x64\x8d\x38\xa2\x63\x45\x1d\xf1\x92\x05\x71\xb2\x5a\x8d\x33\x65\xdd\x3c\x52\x61\x4a\xd9\x25\xf7\xe1\xf1\x50\x15\xf0\xa9\xb2\x5d\xad\x98\x5d\x6c\x8e\x0a\xac\xa9\x2f\x7c\x81\x3f\xb6\x5f\x48\xfa\x0c\x82\xeb\x71\x5b\xdc\x0c\xd6\x73\xe3\xe6\x4a\xc2\x74\x07\x85\x8c\x21\x66\xfc\x31\x5a\xde\xa4\x3d\x9c\x1e\xa7\xed\xef\x72\xed\x11\xba\xc1\xfd\x3a\x63\x0a\x33\xc7\x16\x30\x0a\x6e\xe7\x6c\x30\x5e\x78\xb6\xc5\xf8\xda\x61\x45\x0a\xb2\x30\xba\x5e\xf8\x0d\x66\xf3\x05\x0b\x73\xeb\xe1\xe6\xb1\x30\x3b\x8a\xdf\xdf\x54\xb8\xa0\x8d\xbf\xde\xaa\xdb\xd7\xed\xf8\x1a\xf8\xfa\x48\xda\xbe\xf1\x0c\x58\xa2\x7c\xf7\x06\xb9\x87\x39\xf1\x65\x02\x3a\xa9\xe5\x3f\x86\x3a\xfa\xba\x05\xfb\x6d\xf5\xbd\x83\x7b\xff\x70\xb9\x07\xfc\xa3\x47\x39\x5e\x41\xbe\xe0\xaf\xc7\x8d\xe7\x9d\xc7\x93\x1f\x65\x35\xd2\x21\x07\xe1\x0e\x6d\x4c\x71\x2f\x24\xf6\xd7\x1c\x4e\xcb\xcf\x87\x4f\xa8\x21\x30\xbb\xcf\x47\x6d\x67\x3f\x39\x9c\xc6\x77\x53\xd0\xf2\x19\x67\xf8\x7c\x0c\x34\x6c\xfd\x87\x48\x27\xff\x0f\xa1\x9e\x84\x83\x2f\xef\x5f\x16\x2f\xcb\xae\xac\x8d\xae\xb3\xf0\x7f\x8a\xe1\x31\xfc\x67\x00\x00\x00\xff\xff\x47\x53\x48\x06\x71\x0c\x00\x00") +var _templateTxTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x57\x4d\x8f\xdb\x36\x13\x3e\x4b\xbf\x62\x5e\x63\xf1\xc2\x5a\x38\x52\xcf\x06\xf6\xb4\xe9\xa1\x97\x05\xda\xb8\x68\x6e\x09\x4d\x8e\x6d\xa2\x12\xe9\x52\x23\x9b\x86\xe0\xff\x5e\x0c\x49\x7d\x78\xed\xa4\x1f\xe8\x25\x6b\x91\xf3\xf1\xcc\xf0\x99\x87\x4c\xdf\x83\xc2\x9d\x36\x08\x0b\xf2\x0b\xb8\x5e\xf3\xbc\xef\x81\xb0\x39\xd6\x82\x10\x16\x07\x14\x0a\xdd\x02\x9e\xc2\x96\x6e\x8e\xd6\x11\x2c\xf3\x6c\x21\xad\x21\xf4\xb4\xc8\xb3\x45\x7b\x31\x72\x91\xe7\xd9\x62\xb7\x95\x15\x1a\xaa\x94\x16\x35\x4a\x5a\xe4\x45\x9e\x57\x15\x6c\x3c\xe8\x16\x04\x90\x13\xa6\x15\x92\xb4\x35\xa2\x06\x59\x6b\x34\x04\x74\x10\xc4\xdb\xd2\xa1\x20\x54\xb0\xbd\x80\x14\x75\xad\xcd\x1e\x5e\x83\x45\xb9\xf1\xcb\xa2\xcc\xe9\x72\x44\x8e\xd4\x92\xeb\x24\x41\x9f\x67\xd2\x9a\x9d\xde\xe7\x59\xdf\x83\x13\x66\x8f\xf0\xf4\x65\x05\x4f\x06\xd6\x2f\xf0\x54\xbe\x59\x85\x2d\x7c\xb8\x5e\xf3\x2c\xab\x2a\xe8\x7b\x78\x32\xe5\x9b\x68\x10\xae\x57\x4e\x47\x07\x1c\x10\xec\xac\x03\x6d\x08\x1d\x43\x33\x7b\x38\x6b\x3a\x84\xfd\x5b\xa7\x6d\xa7\x6b\x85\xae\x2d\xf3\x2c\xbb\xdd\x79\xbe\xf9\x8c\xa8\x03\x2c\x34\x8a\xdb\x76\x0d\x5d\x78\xb5\x4d\xa3\x09\x64\xf8\x13\x01\xcc\x1a\x52\xe6\xbb\xce\x48\x58\x92\x87\xe7\x8d\x2f\x92\xf5\xb2\x00\x74\xce\x3a\x2e\xd7\x21\x75\xce\x00\xf9\x32\x16\x5e\x2a\xa7\x4f\xe8\xca\xe5\x33\xf9\x8f\xe1\x67\x51\x92\x2f\x07\xc7\x94\xf5\x17\x5b\xd7\x5b\x21\x7f\x07\x97\x7e\xfc\x65\xe6\xc1\xe3\x5f\xe4\x9e\x5c\x87\x9a\x63\x87\xa3\x3b\x53\xe0\x75\x76\xe8\x5b\x6d\x54\x0b\x64\x41\x76\xce\x85\xd5\xef\xb4\x23\xf8\x2d\x0b\x78\x4e\x11\x26\x50\xff\x8f\x2b\x7d\x9e\x25\x46\xac\x27\x9c\xab\x3c\xcb\x3e\xc9\x03\x36\x62\x0d\x8d\xde\x3b\x41\x58\xbe\xe1\x39\x2e\x2d\xc9\xa7\x3a\x8a\x55\x3c\xd3\xef\xd3\xe8\xf6\xd4\xd7\xf0\x86\xe7\x07\x07\xbf\x1c\x93\x0f\x51\x99\x05\x21\x42\x60\x42\xdf\x57\xcf\xb0\xd3\xae\x25\x30\x56\x61\x60\x9f\xb2\x12\xd0\x8b\xe6\x58\x23\x3c\x57\xd7\x6b\xde\xf7\x1f\xe0\x29\x1a\xad\x5f\x40\x1b\x85\x7e\x04\xf3\x43\x98\xc4\xaa\x82\xa1\xf5\x70\x76\xe2\x18\x8f\x75\xaf\x4f\x68\x20\x8d\x5f\xb9\xf1\x91\xcb\x02\x8c\x3d\x8e\xab\xc9\x49\x73\xb6\x06\x0d\x89\xd8\x6f\x9e\xd3\x03\x82\x56\x28\xc2\x7c\x58\x68\xbb\x63\x98\xf6\xd9\xb1\xb4\x21\xa0\xed\x08\x84\x52\x3c\x2b\xc2\x5c\x00\x3d\x39\x01\x92\x8b\x21\x1b\x60\x4c\xa3\x52\x55\xf0\xdb\x01\x0d\x88\x61\x2d\x0c\x77\x08\x9f\x28\xc4\xd3\xbd\x02\x4d\xb0\xc7\x34\x15\x2d\xb7\x73\x56\x83\x36\x2d\x09\x23\xb1\x9c\x4d\x91\x30\x6a\xa2\xb6\x70\x18\x2a\xe4\x56\x72\x80\x30\xcc\x2c\x31\x03\x8e\x60\xce\x3b\x5d\x8b\x0e\x9a\xae\xa5\x00\x03\xac\x41\x8e\x69\x77\xbc\xd9\x80\x36\x60\x1d\x63\x64\x4e\xc6\x3c\xd6\x8d\x83\x73\x3f\x37\x55\xc5\xde\x3f\xed\x40\x80\xac\x6d\x8b\x6a\xbe\xcd\x4d\xc4\x66\x8b\x4a\xa1\x0a\x91\x0d\xa6\x44\xb0\x47\x83\x2e\x88\x1d\x1a\xd2\xa4\xb1\x5d\x8d\x08\xc3\xca\x85\xe3\x8a\xe3\xb1\xd6\xc8\x43\xf3\x47\x87\xee\xb2\x0a\xe5\x25\x96\xac\x83\x36\x05\x82\x0c\xec\x2b\x7f\x66\xab\xcf\x9f\x3f\x73\x3b\x39\x52\xf0\x82\xb3\xae\x6b\xd8\x22\xa0\x47\xd9\x11\xaa\x40\x9c\x83\xb3\xdd\x3e\x6a\x9c\x4a\x14\x3a\x68\x79\x18\x35\x98\x0e\xcc\x80\xfb\x52\xdf\x2c\x61\x9c\xdd\x91\x7b\xba\x05\x63\x09\xf6\xd6\xd9\x8e\xf8\x1a\x69\xc5\x0e\x93\x5a\x8f\x46\x93\x66\x87\xec\x53\x56\x84\x96\x84\x8b\x29\x6f\x9a\x0b\x3b\x67\x9b\x32\xcf\x94\x3b\xbd\x23\x6e\x8c\xe1\x07\x0d\xef\x8c\x42\x57\x5f\x98\x8b\x37\x80\x33\xf2\x33\x0e\x25\x39\x32\x78\xde\xf8\x54\x25\x37\xd6\xe0\xf9\xdd\xa5\x94\x48\x19\xd5\x27\x98\x2f\x25\x79\x48\x97\x5d\xf9\x1a\xff\xae\xe0\x1e\x57\x01\x93\x18\xae\xa2\x72\x16\x5c\x31\xf9\xf0\xc5\x73\xac\xdc\xa9\x8c\x01\x8b\x3c\xd3\xbb\xb0\xfc\xbf\x17\x30\xba\x66\xc3\x41\xcf\x8c\xae\x83\x07\xeb\xc5\xa8\x71\x43\xe4\x9e\x3c\xcb\x5b\x00\xb0\xe6\x7f\xae\x2b\x76\x48\xf5\x6d\xfc\x28\xb5\xef\xfb\xc9\x1a\x71\x44\xc7\x8a\x3a\xe0\x25\x0b\xe2\x64\xb5\x1a\x66\xca\xba\x69\xa4\xc2\x94\x72\x48\x3e\x87\xc7\x43\x55\xc2\xa7\x83\xed\x6a\xc5\xec\x62\x73\x54\x60\x4d\x7d\xe1\x0b\xfc\xb1\xfd\x4c\xd2\x27\x10\xdc\x8f\xdb\xe6\x16\xb0\x9c\x0e\x6e\xea\x24\x8c\x77\x50\xa8\x18\x62\xc5\x1f\xa3\xe5\x4d\xd9\xc9\x7b\x98\xb6\xbf\xcb\xb5\x47\xe8\x52\xf8\x65\xc1\x14\x66\x8e\xcd\x60\x94\x7c\x9c\x93\xc1\x70\xe1\xd9\x16\xe3\x6b\x87\x15\x29\xc8\xc2\x10\x7a\x16\x37\x98\x4d\x17\x2c\x4c\x47\x0f\x37\x8f\x85\x29\x50\xfc\xfe\xa6\xc2\x05\x6d\xfc\xf5\x56\xdd\xbe\x6e\x86\xd7\xc0\xd7\x47\xd2\xf6\x8d\x67\xc0\x1c\xe5\xbb\x37\xc8\x3d\xcc\x91\x2f\x23\xd0\x51\x2d\xff\x31\xd4\x21\xd6\x2d\xd8\x6f\xab\xef\x1d\xdc\xfb\x87\xcb\x3d\xe0\x1f\x3d\xca\xe1\x0a\xf2\x25\x7f\x3d\x3e\x78\xde\x79\x3c\xf9\x51\x56\x23\x1d\x56\x20\xdc\xbe\x5d\xc1\x29\x56\xb9\x13\x12\xfb\xeb\xc3\x67\x53\x4a\xc6\x21\x57\x83\x9e\x27\xdf\xe1\xad\x14\xf4\x7b\xc2\x16\x3e\x1f\x83\x0b\x5b\xff\x31\xba\x31\xe6\x43\x78\x27\xe1\xe0\xcb\xfb\x17\xc4\xcb\xbc\xfb\x4b\xa3\xeb\x22\xfc\xdf\x21\x3d\x7a\xff\x0c\x00\x00\xff\xff\x0c\xfe\x25\x80\x59\x0c\x00\x00") func templateTxTmplBytes() ([]byte, error) { return bindataRead( @@ -859,7 +870,7 @@ func templateTxTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/tx.tmpl", size: 3185, mode: os.FileMode(420), modTime: time.Unix(1564913364, 0)} + info := bindataFileInfo{name: "template/tx.tmpl", size: 3161, mode: os.FileMode(420), modTime: time.Unix(1565533921, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -879,7 +890,7 @@ func templateWhereTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/where.tmpl", size: 4681, mode: os.FileMode(420), modTime: time.Unix(1565182337, 0)} + info := bindataFileInfo{name: "template/where.tmpl", size: 4681, mode: os.FileMode(420), modTime: time.Unix(1565187546, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/entc/gen/template/tx.tmpl b/entc/gen/template/tx.tmpl index 1c10b55a4..5dae4dda7 100644 --- a/entc/gen/template/tx.tmpl +++ b/entc/gen/template/tx.tmpl @@ -88,12 +88,12 @@ func (*txDriver) Commit() error { return nil } func (*txDriver) Rollback() error { return nil } // Exec calls tx.Exec. -func (tx *txDriver) Exec(ctx context.Context, query string, args interface{}, v interface{}) error { +func (tx *txDriver) Exec(ctx context.Context, query string, args, v interface{}) error { return tx.tx.Exec(ctx, query, args, v) } // Query calls tx.Query. -func (tx *txDriver) Query(ctx context.Context, query string, args interface{}, v interface{}) error { +func (tx *txDriver) Query(ctx context.Context, query string, args, v interface{}) error { return tx.tx.Query(ctx, query, args, v) } diff --git a/entc/integration/ent/tx.go b/entc/integration/ent/tx.go index 202e971cb..cbae53482 100644 --- a/entc/integration/ent/tx.go +++ b/entc/integration/ent/tx.go @@ -105,12 +105,12 @@ func (*txDriver) Commit() error { return nil } func (*txDriver) Rollback() error { return nil } // Exec calls tx.Exec. -func (tx *txDriver) Exec(ctx context.Context, query string, args interface{}, v interface{}) error { +func (tx *txDriver) Exec(ctx context.Context, query string, args, v interface{}) error { return tx.tx.Exec(ctx, query, args, v) } // Query calls tx.Query. -func (tx *txDriver) Query(ctx context.Context, query string, args interface{}, v interface{}) error { +func (tx *txDriver) Query(ctx context.Context, query string, args, v interface{}) error { return tx.tx.Query(ctx, query, args, v) } diff --git a/entc/integration/migrate/entv1/tx.go b/entc/integration/migrate/entv1/tx.go index 7a76e6a2b..734e1bf3e 100644 --- a/entc/integration/migrate/entv1/tx.go +++ b/entc/integration/migrate/entv1/tx.go @@ -81,12 +81,12 @@ func (*txDriver) Commit() error { return nil } func (*txDriver) Rollback() error { return nil } // Exec calls tx.Exec. -func (tx *txDriver) Exec(ctx context.Context, query string, args interface{}, v interface{}) error { +func (tx *txDriver) Exec(ctx context.Context, query string, args, v interface{}) error { return tx.tx.Exec(ctx, query, args, v) } // Query calls tx.Query. -func (tx *txDriver) Query(ctx context.Context, query string, args interface{}, v interface{}) error { +func (tx *txDriver) Query(ctx context.Context, query string, args, v interface{}) error { return tx.tx.Query(ctx, query, args, v) } diff --git a/entc/integration/migrate/entv2/tx.go b/entc/integration/migrate/entv2/tx.go index e4f74a916..3ed0aa12b 100644 --- a/entc/integration/migrate/entv2/tx.go +++ b/entc/integration/migrate/entv2/tx.go @@ -87,12 +87,12 @@ func (*txDriver) Commit() error { return nil } func (*txDriver) Rollback() error { return nil } // Exec calls tx.Exec. -func (tx *txDriver) Exec(ctx context.Context, query string, args interface{}, v interface{}) error { +func (tx *txDriver) Exec(ctx context.Context, query string, args, v interface{}) error { return tx.tx.Exec(ctx, query, args, v) } // Query calls tx.Query. -func (tx *txDriver) Query(ctx context.Context, query string, args interface{}, v interface{}) error { +func (tx *txDriver) Query(ctx context.Context, query string, args, v interface{}) error { return tx.tx.Query(ctx, query, args, v) }