diff --git a/dialect/dialect.go b/dialect/dialect.go index 79bceeb405..270b0cfe33 100644 --- a/dialect/dialect.go +++ b/dialect/dialect.go @@ -88,6 +88,11 @@ func DebugWithContext(d Driver, logger func(context.Context, ...any)) Driver { return drv } +// Log returns the log function used by this DebugDriver. +func (d *DebugDriver) Log() func(context.Context, ...any) { + return d.log +} + // Exec logs its params and calls the underlying driver Exec method. func (d *DebugDriver) Exec(ctx context.Context, query string, args, v any) error { d.log(ctx, fmt.Sprintf("driver.Exec: query=%v args=%v", query, args)) diff --git a/dialect/sql/driver.go b/dialect/sql/driver.go index 1c4c9bd417..42193b5752 100644 --- a/dialect/sql/driver.go +++ b/dialect/sql/driver.go @@ -14,31 +14,75 @@ import ( "strings" "entgo.io/ent/dialect" + "github.com/ydb-platform/ydb-go-sdk/v3" ) // Driver is a dialect.Driver implementation for SQL based databases. type Driver struct { Conn - dialect string + dialect string + retryExecutor RetryExecutor } // NewDriver creates a new Driver with the given Conn and dialect. -func NewDriver(dialect string, c Conn) *Driver { - return &Driver{dialect: dialect, Conn: c} +func NewDriver( + dialect string, + c Conn, + retryExecutor RetryExecutor, +) *Driver { + return &Driver{ + Conn: c, + dialect: dialect, + retryExecutor: retryExecutor, + } } // Open wraps the database/sql.Open method and returns a dialect.Driver that implements the an ent/dialect.Driver interface. -func Open(dialect, source string) (*Driver, error) { - db, err := sql.Open(dialect, source) +func Open(sqlDialect, dsn string) (*Driver, error) { + var ( + db *sql.DB + err error + ) + + if sqlDialect == dialect.YDB { + nativeDriver, err := ydb.Open(context.Background(), dsn) + if err != nil { + return nil, err + } + + conn, err := ydb.Connector( + nativeDriver, + ydb.WithAutoDeclare(), + ydb.WithTablePathPrefix(nativeDriver.Name()), + ydb.WithQueryService(true), + ) + if err != nil { + return nil, err + } + + db = sql.OpenDB(conn) + } else { + db, err = sql.Open(sqlDialect, dsn) + } + if err != nil { return nil, err } - return NewDriver(dialect, Conn{db, dialect}), nil + + return NewDriver( + sqlDialect, + Conn{db, sqlDialect}, + NewRetryExecutor(sqlDialect, db), + ), nil } // OpenDB wraps the given database/sql.DB method with a Driver. -func OpenDB(dialect string, db *sql.DB) *Driver { - return NewDriver(dialect, Conn{db, dialect}) +func OpenDB(sqlDialect string, db *sql.DB) *Driver { + return NewDriver( + sqlDialect, + Conn{db, sqlDialect}, + NewRetryExecutor(sqlDialect, db), + ) } // DB returns the underlying *sql.DB instance. @@ -74,6 +118,10 @@ func (d *Driver) BeginTx(ctx context.Context, opts *TxOptions) (dialect.Tx, erro }, nil } +func (d *Driver) RetryExecutor() RetryExecutor { + return d.retryExecutor +} + // Close closes the underlying connection. func (d *Driver) Close() error { return d.DB().Close() } diff --git a/dialect/sql/sqlgraph/retry.go b/dialect/sql/retry.go similarity index 59% rename from dialect/sql/sqlgraph/retry.go rename to dialect/sql/retry.go index 449e4dffbd..22fe7ece75 100644 --- a/dialect/sql/sqlgraph/retry.go +++ b/dialect/sql/retry.go @@ -2,10 +2,11 @@ // This source code is licensed under the Apache 2.0 license found // in the LICENSE file in the root directory of this source tree. -package sqlgraph +package sql import ( "context" + "database/sql" "entgo.io/ent/dialect" ) @@ -31,6 +32,18 @@ type RetryExecutor interface { ) error } +// NewRetryExecutor creates a new RetryExecutor with the given database connection +func NewRetryExecutor( + sqlDialect string, + db *sql.DB, +) RetryExecutor { + if sqlDialect == dialect.YDB && db != nil { + return &YDBRetryExecutor{db: db} + } else { + return nil + } +} + // RetryExecutorGetter is an optional interface that drivers can implement to provide // a RetryExecutor for automatic retry handling. // If a driver implements this interface, @@ -41,12 +54,37 @@ type RetryExecutorGetter interface { RetryExecutor() RetryExecutor } -// getRetryExecutor returns the RetryExecutor for the given driver if available. -func getRetryExecutor(drv dialect.Driver) RetryExecutor { - if reg, ok := drv.(RetryExecutorGetter); ok { - return reg.RetryExecutor() +// GetRetryExecutor returns the RetryExecutor for the given driver if available. +// If the driver is wrapped with a DebugDriver, the returned executor will preserve +// debug logging by wrapping the driver passed to callback functions. +func GetRetryExecutor(drv dialect.Driver) RetryExecutor { + drv, logFn := unwrapDebugDriver(drv) + + getter, ok := drv.(RetryExecutorGetter) + if !ok { + return nil + } + + executor := getter.RetryExecutor() + if executor == nil { + return nil + } + + if logFn != nil { + return &debugRetryExecutor{ + RetryExecutor: executor, + log: logFn, + } + } + return executor +} + +// unwrapDebugDriver extracts the underlying driver and log function from a DebugDriver. +func unwrapDebugDriver(drv dialect.Driver) (dialect.Driver, func(context.Context, ...any)) { + if debugDriver, ok := drv.(*dialect.DebugDriver); ok { + return debugDriver.Driver, debugDriver.Log() } - return nil + return drv, nil } // RetryConfig holds retry configuration for sqlgraph operations. diff --git a/dialect/sql/retry_debug.go b/dialect/sql/retry_debug.go new file mode 100644 index 0000000000..3c7ba4e51e --- /dev/null +++ b/dialect/sql/retry_debug.go @@ -0,0 +1,47 @@ +// Copyright 2019-present Facebook Inc. All rights reserved. +// This source code is licensed under the Apache 2.0 license found +// in the LICENSE file in the root directory of this source tree. + +package sql + +import ( + "context" + + "entgo.io/ent/dialect" +) + +// debugRetryExecutor wraps a RetryExecutor to preserve debug logging. +type debugRetryExecutor struct { + RetryExecutor + log func(context.Context, ...any) +} + +// Do executes the operation with debug logging preserved. +func (d *debugRetryExecutor) Do( + ctx context.Context, + fn func(ctx context.Context, drv dialect.Driver) error, + opts ...any, +) error { + return d.RetryExecutor.Do( + ctx, + func(ctx context.Context, drv dialect.Driver) error { + return fn(ctx, dialect.DebugWithContext(drv, d.log)) + }, + opts..., + ) +} + +// DoTx executes the operation within a transaction with debug logging preserved. +func (d *debugRetryExecutor) DoTx( + ctx context.Context, + fn func(ctx context.Context, drv dialect.Driver) error, + opts ...any, +) error { + return d.RetryExecutor.DoTx( + ctx, + func(ctx context.Context, drv dialect.Driver) error { + return fn(ctx, dialect.DebugWithContext(drv, d.log)) + }, + opts..., + ) +} diff --git a/dialect/ydb/retry.go b/dialect/sql/retry_ydb.go similarity index 64% rename from dialect/ydb/retry.go rename to dialect/sql/retry_ydb.go index dc0dde85e0..c2a58b3a0b 100644 --- a/dialect/ydb/retry.go +++ b/dialect/sql/retry_ydb.go @@ -2,31 +2,25 @@ // This source code is licensed under the Apache 2.0 license found // in the LICENSE file in the root directory of this source tree. -package ydb +package sql import ( "context" "database/sql" "entgo.io/ent/dialect" - entSql "entgo.io/ent/dialect/sql" "github.com/ydb-platform/ydb-go-sdk/v3/retry" ) -// RetryExecutor implements sqlgraph.RetryExecutor for YDB -type RetryExecutor struct { +// YDBRetryExecutor implements sqlgraph.YDBRetryExecutor for YDB +type YDBRetryExecutor struct { db *sql.DB } -// NewRetryExecutor creates a new RetryExecutor with the given database connection -func NewRetryExecutor(db *sql.DB) *RetryExecutor { - return &RetryExecutor{db: db} -} - // Do executes a read-only operation with retry support. // It uses ydb-go-sdk's retry.Do which handles YDB-specific retryable errors. // Options should be created using retry.WithIdempotent(), retry.WithLabel(), etc. -func (r *RetryExecutor) Do( +func (r *YDBRetryExecutor) Do( ctx context.Context, fn func(ctx context.Context, drv dialect.Driver) error, opts ...any, @@ -35,7 +29,7 @@ func (r *RetryExecutor) Do( ctx, r.db, func(ctx context.Context, conn *sql.Conn) error { - return fn(ctx, NewRetryDriver(conn)) + return fn(ctx, newConnRetryDriver(conn)) }, retry.WithDoRetryOptions(toRetryOptions(opts)...), ) @@ -44,7 +38,7 @@ func (r *RetryExecutor) Do( // DoTx executes the operation within a transaction with retry support. // It uses ydb-go-sdk's retry.DoTx which handles YDB-specific retryable errors. // Options should be created using retry.WithIdempotent(), retry.WithLabel(), etc. -func (r *RetryExecutor) DoTx( +func (r *YDBRetryExecutor) DoTx( ctx context.Context, fn func(ctx context.Context, drv dialect.Driver) error, opts ...any, @@ -53,7 +47,7 @@ func (r *RetryExecutor) DoTx( ctx, r.db, func(ctx context.Context, tx *sql.Tx) error { - return fn(ctx, NewTxRetryDriver(tx)) + return fn(ctx, newTxRetryDriver(tx)) }, retry.WithDoTxRetryOptions(toRetryOptions(opts)...), ) @@ -70,41 +64,41 @@ func toRetryOptions(opts []any) []retry.Option { return retryOpts } -// RetryDriver is designed for use only in sqlgraph, +// ydbRetryDriver is designed for use only in sqlgraph, // specifically - in retry.DoTx callbacks -type RetryDriver struct { - entSql.Conn +type ydbRetryDriver struct { + Conn } -var _ dialect.Driver = (*RetryDriver)(nil) +var _ dialect.Driver = (*ydbRetryDriver)(nil) -// NewTxRetryDriver creates a new RetryDriver from a transaction. -func NewTxRetryDriver(tx *sql.Tx) *RetryDriver { - return &RetryDriver{ - Conn: entSql.Conn{ExecQuerier: tx}, +// newConnRetryDriver creates a new RetryDriver from a database connection. +func newConnRetryDriver(conn *sql.Conn) *ydbRetryDriver { + return &ydbRetryDriver{ + Conn: Conn{ExecQuerier: conn}, } } -// NewRetryDriver creates a new RetryDriver from a database connection. -func NewRetryDriver(conn *sql.Conn) *RetryDriver { - return &RetryDriver{ - Conn: entSql.Conn{ExecQuerier: conn}, +// newTxRetryDriver creates a new RetryDriver from a transaction. +func newTxRetryDriver(tx *sql.Tx) *ydbRetryDriver { + return &ydbRetryDriver{ + Conn: Conn{ExecQuerier: tx}, } } // sqlgraph creates nested transactions in several methods. // But YDB doesnt support nested transactions. // Therefore, this methods returns no-op tx -func (d *RetryDriver) Tx(ctx context.Context) (dialect.Tx, error) { +func (d *ydbRetryDriver) Tx(ctx context.Context) (dialect.Tx, error) { return dialect.NopTx(d), nil } // Close is a no-op for RetryDriver since retry.DoTx manages the transaction lifecycle. -func (d *RetryDriver) Close() error { +func (d *ydbRetryDriver) Close() error { return nil } // Dialect returns the YDB dialect name. -func (d *RetryDriver) Dialect() string { +func (d *ydbRetryDriver) Dialect() string { return dialect.YDB } diff --git a/dialect/sql/schema/ydb.go b/dialect/sql/schema/ydb.go index df835b415c..95a7494d4a 100644 --- a/dialect/sql/schema/ydb.go +++ b/dialect/sql/schema/ydb.go @@ -6,12 +6,12 @@ package schema import ( "context" + "database/sql" "fmt" "strings" "entgo.io/ent/dialect" entsql "entgo.io/ent/dialect/sql" - entdrv "entgo.io/ent/dialect/ydb" "entgo.io/ent/schema/field" "ariga.io/atlas/sql/migrate" @@ -67,32 +67,29 @@ func (d *YDB) tableExist(ctx context.Context, conn dialect.ExecQuerier, name str // atOpen returns a custom Atlas migrate.Driver for YDB. func (d *YDB) atOpen(conn dialect.ExecQuerier) (migrate.Driver, error) { - ydbDriver := unwrapYDBDriver(conn) - if ydbDriver == nil { - ydbDriver = unwrapYDBDriver(d.Driver) + sqlDB := unwrapDB(conn) + if sqlDB == nil { + sqlDB = unwrapDB(d.Driver) } - if ydbDriver == nil { - return nil, fmt.Errorf("expected dialect/ydb.YDBDriver, but got %T", conn) + if sqlDB == nil { + return nil, fmt.Errorf("ydb: cannot get *sql.DB from %T (driver: %T)", conn, d.Driver) } - - return atlas.Open( - ydbDriver.NativeDriver(), - ydbDriver.DB(), - ) + return atlas.Open(sqlDB) } -func unwrapYDBDriver(driver any) *entdrv.YDBDriver { - switch drv := driver.(type) { - case *entdrv.YDBDriver: - return drv +func unwrapDB(db any) *sql.DB { + switch casted := db.(type) { + case interface{ DB() *sql.DB }: + return casted.DB() case *YDB: - return unwrapYDBDriver(drv.Driver) - case *WriteDriver: - return unwrapYDBDriver(drv.Driver) + return unwrapDB(casted.Driver) case *dialect.DebugDriver: - return unwrapYDBDriver(drv.Driver) + return unwrapDB(casted.Driver) + case *WriteDriver: + return unwrapDB(casted.Driver) + default: + return nil } - return nil } func (d *YDB) atTable(table1 *Table, table2 *schema.Table) { diff --git a/dialect/sql/sqlgraph/graph.go b/dialect/sql/sqlgraph/graph.go index 250867c5a4..c70293bfc2 100644 --- a/dialect/sql/sqlgraph/graph.go +++ b/dialect/sql/sqlgraph/graph.go @@ -776,7 +776,7 @@ type ( // OnConflict []sql.ConflictOption - RetryConfig RetryConfig + RetryConfig sql.RetryConfig } // BatchCreateSpec holds the information for creating @@ -795,7 +795,7 @@ type ( // OnConflict []sql.ConflictOption - RetryConfig RetryConfig + RetryConfig sql.RetryConfig } ) @@ -816,32 +816,60 @@ func (u *CreateSpec) SetField(column string, t field.Type, value driver.Value) { // CreateNode applies the CreateSpec on the graph. The operation creates a new // record in the database, and connects it to other nodes specified in spec.Edges. func CreateNode(ctx context.Context, drv dialect.Driver, spec *CreateSpec) error { - op := func(ctx context.Context, d dialect.Driver) error { - gr := graph{tx: d, builder: sql.Dialect(drv.Dialect())} - cr := &creator{CreateSpec: spec, graph: gr} - return cr.node(ctx, d) - } - return execWithRetryTx(ctx, drv, op, spec.RetryConfig.Options) + return execWithRetryTx( + ctx, + drv, + spec.RetryConfig.Options, + func(ctx context.Context, d dialect.Driver) error { + gr := graph{tx: d, builder: sql.Dialect(drv.Dialect())} + cr := &creator{CreateSpec: spec, graph: gr} + return cr.node(ctx, d) + }, + ) } // BatchCreate applies the BatchCreateSpec on the graph. func BatchCreate(ctx context.Context, drv dialect.Driver, spec *BatchCreateSpec) error { - op := func(ctx context.Context, d dialect.Driver) error { - gr := graph{tx: d, builder: sql.Dialect(drv.Dialect())} - cr := &batchCreator{BatchCreateSpec: spec, graph: gr} - return cr.nodes(ctx, d) - } - return execWithRetryTx(ctx, drv, op, spec.RetryConfig.Options) + return execWithRetryTx( + ctx, + drv, + spec.RetryConfig.Options, + func(ctx context.Context, d dialect.Driver) error { + gr := graph{tx: d, builder: sql.Dialect(drv.Dialect())} + cr := &batchCreator{BatchCreateSpec: spec, graph: gr} + return cr.nodes(ctx, d) + }, + ) } -// execWithRetryTx executes the operation with retry if available, otherwise executes directly. -func execWithRetryTx(ctx context.Context, drv dialect.Driver, op func(context.Context, dialect.Driver) error, opts []any) error { - if retry := getRetryExecutor(drv); retry != nil { +// execWithRetryTx executes the operation with retry +// in a transaction if available, otherwise executes directly. +func execWithRetryTx( + ctx context.Context, + drv dialect.Driver, + opts []any, + op func(context.Context, dialect.Driver) error, +) error { + if retry := sql.GetRetryExecutor(drv); retry != nil { return retry.DoTx(ctx, op, opts...) } return op(ctx, drv) } +// execWithRetry executes the operation with retry if available, otherwise executes directly. +// Use this for read-only operations that don't require a transaction. +func execWithRetry( + ctx context.Context, + drv dialect.Driver, + opts []any, + op func(context.Context, dialect.Driver) error, +) error { + if retry := sql.GetRetryExecutor(drv); retry != nil { + return retry.Do(ctx, op, opts...) + } + return op(ctx, drv) +} + type ( // EdgeMut defines edge mutations. EdgeMut struct { @@ -868,7 +896,7 @@ type ( ScanValues func(columns []string) ([]any, error) Assign func(columns []string, values []any) error - RetryConfig RetryConfig + RetryConfig sql.RetryConfig } ) @@ -924,22 +952,23 @@ func (u *UpdateSpec) ClearField(column string, t field.Type) { // UpdateNode applies the UpdateSpec on one node in the graph. func UpdateNode(ctx context.Context, drv dialect.Driver, spec *UpdateSpec) error { - op := func(ctx context.Context, d dialect.Driver) error { - tx, err := d.Tx(ctx) - if err != nil { - return err - } - gr := graph{tx: tx, builder: sql.Dialect(drv.Dialect())} - cr := &updater{UpdateSpec: spec, graph: gr} - if err := cr.node(ctx, tx); err != nil { - return rollback(tx, err) - } - return tx.Commit() - } - if retry := getRetryExecutor(drv); retry != nil { - return retry.DoTx(ctx, op, spec.RetryConfig.Options...) - } - return op(ctx, drv) + return execWithRetryTx( + ctx, + drv, + spec.RetryConfig.Options, + func(ctx context.Context, d dialect.Driver) error { + tx, err := d.Tx(ctx) + if err != nil { + return err + } + gr := graph{tx: tx, builder: sql.Dialect(drv.Dialect())} + cr := &updater{UpdateSpec: spec, graph: gr} + if err := cr.node(ctx, tx); err != nil { + return rollback(tx, err) + } + return tx.Commit() + }, + ) } // UpdateNodes applies the UpdateSpec on a set of nodes in the graph. @@ -955,13 +984,7 @@ func UpdateNodes(ctx context.Context, drv dialect.Driver, spec *UpdateSpec) (int affected = n return nil } - if retry := getRetryExecutor(drv); retry != nil { - if err := retry.DoTx(ctx, op, spec.RetryConfig.Options...); err != nil { - return 0, err - } - return affected, nil - } - if err := op(ctx, drv); err != nil { + if err := execWithRetryTx(ctx, drv, spec.RetryConfig.Options, op); err != nil { return 0, err } return affected, nil @@ -978,12 +1001,18 @@ func (e *NotFoundError) Error() string { return fmt.Sprintf("record with id %v not found in table %s", e.id, e.table) } +// IsNotFound returns true if the error is a NotFoundError or wraps one. +func IsNotFound(err error) bool { + var e *NotFoundError + return errors.As(err, &e) +} + // DeleteSpec holds the information for delete one // or more nodes in the graph. type DeleteSpec struct { Node *NodeSpec Predicate func(*sql.Selector) - RetryConfig RetryConfig + RetryConfig sql.RetryConfig } // NewDeleteSpec creates a new node deletion spec. @@ -1031,13 +1060,7 @@ func DeleteNodes(ctx context.Context, drv dialect.Driver, spec *DeleteSpec) (int affected = int(n) return nil } - if retry := getRetryExecutor(drv); retry != nil { - if err := retry.DoTx(ctx, op, spec.RetryConfig.Options...); err != nil { - return 0, err - } - return affected, nil - } - if err := op(ctx, drv); err != nil { + if err := execWithRetryTx(ctx, drv, spec.RetryConfig.Options, op); err != nil { return 0, err } return affected, nil @@ -1059,7 +1082,7 @@ type QuerySpec struct { ScanValues func(columns []string) ([]any, error) Assign func(columns []string, values []any) error - RetryConfig RetryConfig + RetryConfig sql.RetryConfig } // NewQuerySpec creates a new node query spec. @@ -1075,15 +1098,16 @@ func NewQuerySpec(table string, columns []string, id *FieldSpec) *QuerySpec { // QueryNodes queries the nodes in the graph query and scans them to the given values. func QueryNodes(ctx context.Context, drv dialect.Driver, spec *QuerySpec) error { - op := func(ctx context.Context, d dialect.Driver) error { - builder := sql.Dialect(drv.Dialect()) - qr := &query{graph: graph{builder: builder}, QuerySpec: spec} - return qr.nodes(ctx, d) - } - if retry := getRetryExecutor(drv); retry != nil { - return retry.Do(ctx, op, spec.RetryConfig.Options...) - } - return op(ctx, drv) + return execWithRetry( + ctx, + drv, + spec.RetryConfig.Options, + func(ctx context.Context, d dialect.Driver) error { + builder := sql.Dialect(drv.Dialect()) + qr := &query{graph: graph{builder: builder}, QuerySpec: spec} + return qr.nodes(ctx, d) + }, + ) } // CountNodes counts the nodes in the given graph query. @@ -1099,13 +1123,7 @@ func CountNodes(ctx context.Context, drv dialect.Driver, spec *QuerySpec) (int, count = n return nil } - if retry := getRetryExecutor(drv); retry != nil { - if err := retry.Do(ctx, op, spec.RetryConfig.Options...); err != nil { - return 0, err - } - return count, nil - } - if err := op(ctx, drv); err != nil { + if err := execWithRetry(ctx, drv, spec.RetryConfig.Options, op); err != nil { return 0, err } return count, nil @@ -1114,10 +1132,11 @@ func CountNodes(ctx context.Context, drv dialect.Driver, spec *QuerySpec) (int, // EdgeQuerySpec holds the information for querying // edges in the graph. type EdgeQuerySpec struct { - Edge *EdgeSpec - Predicate func(*sql.Selector) - ScanValues func() [2]any - Assign func(out, in any) error + Edge *EdgeSpec + Predicate func(*sql.Selector) + ScanValues func() [2]any + Assign func(out, in any) error + RetryConfig sql.RetryConfig } // QueryEdges queries the edges in the graph and scans the result with the given dest function. @@ -1125,32 +1144,39 @@ func QueryEdges(ctx context.Context, drv dialect.Driver, spec *EdgeQuerySpec) er if len(spec.Edge.Columns) != 2 { return fmt.Errorf("sqlgraph: edge query requires 2 columns (out, in)") } - out, in := spec.Edge.Columns[0], spec.Edge.Columns[1] - if spec.Edge.Inverse { - out, in = in, out - } - selector := sql.Dialect(drv.Dialect()). - Select(out, in). - From(sql.Table(spec.Edge.Table).Schema(spec.Edge.Schema)) - if p := spec.Predicate; p != nil { - p(selector) - } - rows := &sql.Rows{} - query, args := selector.Query() - if err := drv.Query(ctx, query, args, rows); err != nil { - return err - } - defer rows.Close() - for rows.Next() { - values := spec.ScanValues() - if err := rows.Scan(values[0], values[1]); err != nil { - return err - } - if err := spec.Assign(values[0], values[1]); err != nil { - return err - } - } - return rows.Err() + return execWithRetry( + ctx, + drv, + spec.RetryConfig.Options, + func(ctx context.Context, d dialect.Driver) error { + out, in := spec.Edge.Columns[0], spec.Edge.Columns[1] + if spec.Edge.Inverse { + out, in = in, out + } + selector := sql.Dialect(drv.Dialect()). + Select(out, in). + From(sql.Table(spec.Edge.Table).Schema(spec.Edge.Schema)) + if p := spec.Predicate; p != nil { + p(selector) + } + rows := &sql.Rows{} + query, args := selector.Query() + if err := d.Query(ctx, query, args, rows); err != nil { + return err + } + defer rows.Close() + for rows.Next() { + values := spec.ScanValues() + if err := rows.Scan(values[0], values[1]); err != nil { + return err + } + if err := spec.Assign(values[0], values[1]); err != nil { + return err + } + } + return rows.Err() + }, + ) } type query struct { @@ -1439,14 +1465,14 @@ func (u *updater) updateTable(ctx context.Context, stmt *sql.UpdateBuilder) (int if stmt.Empty() { return 0, nil } - var ( - res sql.Result - query, args = stmt.Query() - ) - if err := u.tx.Exec(ctx, query, args, &res); err != nil { - return 0, err + // Determine the ID column for RETURNING (needed for YDB). + var idColumn string + if u.Node.ID != nil { + idColumn = u.Node.ID.Column + } else if len(u.Node.CompositeID) > 0 { + idColumn = u.Node.CompositeID[0].Column } - affected, err := res.RowsAffected() + affected, err := execUpdate(ctx, u.tx, stmt, idColumn) if err != nil { return 0, err } diff --git a/dialect/ydb/driver.go b/dialect/ydb/driver.go deleted file mode 100644 index 1a8a6f12df..0000000000 --- a/dialect/ydb/driver.go +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2019-present Facebook Inc. All rights reserved. -// This source code is licensed under the Apache 2.0 license found -// in the LICENSE file in the root directory of this source tree. - -package ydb - -import ( - "context" - "database/sql" - - "entgo.io/ent/dialect" - entSql "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/sql/sqlgraph" - ydb "github.com/ydb-platform/ydb-go-sdk/v3" -) - -// YDBDriver is a [dialect.Driver] implementation for YDB. -type YDBDriver struct { - *entSql.Driver - - nativeDriver *ydb.Driver - retryExecutor *RetryExecutor -} - -var _ sqlgraph.RetryExecutorGetter = (*YDBDriver)(nil) - -func Open(ctx context.Context, dsn string) (*YDBDriver, error) { - nativeDriver, err := ydb.Open(ctx, dsn) - if err != nil { - return nil, err - } - - conn, err := ydb.Connector( - nativeDriver, - ydb.WithAutoDeclare(), - ydb.WithTablePathPrefix(nativeDriver.Name()), - ydb.WithQueryService(true), - ) - if err != nil { - return nil, err - } - - dbSQLDriver := sql.OpenDB(conn) - - return &YDBDriver{ - Driver: entSql.OpenDB(dialect.YDB, dbSQLDriver), - nativeDriver: nativeDriver, - retryExecutor: NewRetryExecutor(dbSQLDriver), - }, nil -} - -func (y *YDBDriver) NativeDriver() *ydb.Driver { - return y.nativeDriver -} - -// RetryExecutor returns the RetryExecutor for this driver. -// This allows sqlgraph to automatically wrap operations with YDB retry logic. -func (y *YDBDriver) RetryExecutor() sqlgraph.RetryExecutor { - return y.retryExecutor -} diff --git a/dialect/ydb/driver_test.go b/dialect/ydb/driver_test.go deleted file mode 100644 index a012925593..0000000000 --- a/dialect/ydb/driver_test.go +++ /dev/null @@ -1,297 +0,0 @@ -// Copyright 2019-present Facebook Inc. All rights reserved. -// This source code is licensed under the Apache 2.0 license found -// in the LICENSE file in the root directory of this source tree. - -package ydb - -import ( - "context" - "fmt" - "testing" - - "entgo.io/ent/dialect" - entSql "entgo.io/ent/dialect/sql" - - "github.com/DATA-DOG/go-sqlmock" - "github.com/stretchr/testify/require" -) - -func TestOpenAndClose(t *testing.T) { - // Given - db, mock, err := sqlmock.New() - require.NoError(t, err) - defer db.Close() - - driver := &YDBDriver{ - Driver: entSql.OpenDB(dialect.YDB, db), - } - - // When - mock.ExpectClose() - err = driver.Close() - - // Then - verify closed - require.NoError(t, err, "should close connection") - require.NoError(t, mock.ExpectationsWereMet()) -} - -func TestExecCreateTable(t *testing.T) { - // Given - db, mock, err := sqlmock.New() - require.NoError(t, err) - defer db.Close() - - ctx := context.Background() - driver := &YDBDriver{Driver: entSql.OpenDB(dialect.YDB, db)} - - // When - mock.ExpectExec("DROP TABLE IF EXISTS test_users"). - WillReturnResult(sqlmock.NewResult(0, 0)) - - mock.ExpectExec("CREATE TABLE test_users"). - WillReturnResult(sqlmock.NewResult(0, 0)) - - _ = driver.Exec(ctx, "DROP TABLE IF EXISTS test_users", []any{}, nil) - err = driver.Exec(ctx, `CREATE TABLE test_users ( - id Int64 NOT NULL, - name Utf8, - age Int32, - PRIMARY KEY (id) - )`, []any{}, nil) - require.NoError(t, err, "CREATE TABLE should execute without err") - - // Then - verify table created - mock.ExpectQuery("SELECT 1 FROM test_users"). - WillReturnRows(sqlmock.NewRows([]string{"1"})) - - var rows entSql.Rows - err = driver.Query(ctx, "SELECT 1 FROM test_users", []any{}, &rows) - require.NoError(t, err, "created table should exist") - rows.Close() - - require.NoError(t, mock.ExpectationsWereMet()) -} - -func TestExecInsert(t *testing.T) { - // Given - db, mock, err := sqlmock.New() - require.NoError(t, err) - defer db.Close() - - ctx := context.Background() - driver := &YDBDriver{Driver: entSql.OpenDB(dialect.YDB, db)} - - // When - mock.ExpectExec("INSERT INTO test_users"). - WillReturnResult(sqlmock.NewResult(1, 1)) - - insertQuery := `INSERT INTO test_users (id, name, age) VALUES (1, 'Alice', 30)` - err = driver.Exec(ctx, insertQuery, []any{}, nil) - require.NoError(t, err, "INSERT data execute without err") - - // Then - verify row count - mock.ExpectQuery("SELECT COUNT\\(\\*\\) AS"). - WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1)) - - var rows entSql.Rows - err = driver.Query(ctx, "SELECT COUNT(*) AS `count` FROM test_users", []any{}, &rows) - require.NoError(t, err, "SELECT COUNT(*) should execute without err") - - require.True(t, rows.Next(), "Result should have at least 1 row") - var count uint64 - err = rows.Scan(&count) - require.NoError(t, err) - require.Equal(t, uint64(1), count, "Table should contain exactly 1 row") - rows.Close() - - require.NoError(t, mock.ExpectationsWereMet()) -} - -func TestExecUpdate(t *testing.T) { - // Given - db, mock, err := sqlmock.New() - require.NoError(t, err) - defer db.Close() - - ctx := context.Background() - drv := &YDBDriver{Driver: entSql.OpenDB(dialect.YDB, db)} - - mock.ExpectExec("INSERT INTO test_users"). - WillReturnResult(sqlmock.NewResult(1, 1)) - - insertDataQuery := "INSERT INTO test_users (id, name, age) VALUES (1, 'Alice', 30)" - require.NoError(t, drv.Exec(ctx, insertDataQuery, []any{}, nil)) - - // When - mock.ExpectExec("UPDATE test_users SET age = 31 WHERE id = 1"). - WillReturnResult(sqlmock.NewResult(0, 1)) - - updateQuery := `UPDATE test_users SET age = 31 WHERE id = 1` - err = drv.Exec(ctx, updateQuery, []any{}, nil) - require.NoError(t, err, "should update data") - - // Then - mock.ExpectQuery("SELECT \\* FROM test_users"). - WillReturnRows(sqlmock.NewRows([]string{"id", "name", "age"}). - AddRow(1, "Alice", 31)) - - var rows entSql.Rows - err = drv.Query(ctx, "SELECT * FROM test_users", []any{}, &rows) - require.NoError(t, err) - - require.True(t, rows.Next()) - var id, age int64 - var name string - err = rows.Scan(&id, &name, &age) - require.NoError(t, err) - require.Equal(t, int64(31), age, "Age should've been changed") - rows.Close() - - require.NoError(t, mock.ExpectationsWereMet()) -} - -func TestExecDelete(t *testing.T) { - // Given - db, mock, err := sqlmock.New() - require.NoError(t, err) - defer db.Close() - - ctx := context.Background() - drv := &YDBDriver{Driver: entSql.OpenDB(dialect.YDB, db)} - - mock.ExpectExec("INSERT INTO test_users"). - WillReturnResult(sqlmock.NewResult(1, 1)) - - insertDataQuery := "INSERT INTO test_users (id, name, age) VALUES (1, 'Alice', 30)" - require.NoError(t, drv.Exec(ctx, insertDataQuery, []any{}, nil)) - - // When - mock.ExpectExec("DELETE FROM test_users WHERE id = 1"). - WillReturnResult(sqlmock.NewResult(0, 1)) - - deleteQuery := `DELETE FROM test_users WHERE id = 1` - err = drv.Exec(ctx, deleteQuery, []any{}, nil) - require.NoError(t, err, "DELETE request should execute without err") - - // Then - mock.ExpectQuery("SELECT COUNT\\(\\*\\)"). - WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(0)) - - var rows entSql.Rows - err = drv.Query(ctx, "SELECT COUNT(*) AS `count` FROM test_users", []any{}, &rows) - require.NoError(t, err) - require.True(t, rows.Next()) - var count uint64 - err = rows.Scan(&count) - require.NoError(t, err) - require.Equal(t, uint64(0), count, "Table should be empty after DELETE") - rows.Close() - - require.NoError(t, mock.ExpectationsWereMet()) -} - -func TestQueryEmptyTable(t *testing.T) { - // Given - db, mock, err := sqlmock.New() - require.NoError(t, err) - defer db.Close() - - ctx := context.Background() - drv := &YDBDriver{Driver: entSql.OpenDB(dialect.YDB, db)} - - // When - mock.ExpectQuery("SELECT \\* FROM test_users"). - WillReturnRows(sqlmock.NewRows([]string{"id", "name", "age"})) - - var rows entSql.Rows - err = drv.Query(ctx, "SELECT * FROM test_users", []any{}, &rows) - - // Then - require.NoError(t, err, "SELECT data should execute without err") - - counter := 0 - for rows.Next() { - counter++ - } - require.Equal(t, 0, counter, "Table should be empty") - rows.Close() - - require.NoError(t, mock.ExpectationsWereMet()) -} - -func TestExecMultipleInserts(t *testing.T) { - // Given - db, mock, err := sqlmock.New() - require.NoError(t, err) - defer db.Close() - - ctx := context.Background() - drv := &YDBDriver{Driver: entSql.OpenDB(dialect.YDB, db)} - - // When - for i := 0; i < 10; i++ { - insertQuery := fmt.Sprintf("INSERT INTO test_users (id, name, age) VALUES (%d, 'User%d', 20)", i, i) - mock.ExpectExec("INSERT INTO test_users"). - WillReturnResult(sqlmock.NewResult(int64(i), 1)) - - err := drv.Exec(ctx, insertQuery, []any{}, nil) - require.NoError(t, err) - } - - // Then - mock.ExpectQuery("SELECT COUNT\\(\\*\\)"). - WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(10)) - - var rows entSql.Rows - err = drv.Query(ctx, "SELECT COUNT(*) AS `count` FROM test_users", []any{}, &rows) - require.NoError(t, err) - require.True(t, rows.Next()) - var count uint64 - err = rows.Scan(&count) - require.NoError(t, err) - require.Equal(t, uint64(10), count, "Table should contain exactly 10 rows") - rows.Close() - - require.NoError(t, mock.ExpectationsWereMet()) -} - -func TestQueryInvalidQuery(t *testing.T) { - // Given - db, mock, err := sqlmock.New() - require.NoError(t, err) - defer db.Close() - - ctx := context.Background() - drv := &YDBDriver{Driver: entSql.OpenDB(dialect.YDB, db)} - - // When - invalidQuery := "SELECT * FROM non_existent_table" - mock.ExpectQuery("SELECT \\* FROM non_existent_table"). - WillReturnError(fmt.Errorf("table not found")) - - var rows entSql.Rows - err = drv.Query(ctx, invalidQuery, []any{}, &rows) - - // Then - require.Error(t, err, "should return error for invalid query") - require.NoError(t, mock.ExpectationsWereMet()) -} - -func TestContextCancellation(t *testing.T) { - // Given - db, _, err := sqlmock.New() - require.NoError(t, err) - defer db.Close() - - ctx := context.Background() - drv := &YDBDriver{Driver: entSql.OpenDB(dialect.YDB, db)} - - // When - cancelCtx, cancel := context.WithCancel(ctx) - cancel() - - // Then - err = drv.Exec(cancelCtx, "SELECT 1", []any{}, nil) - require.Error(t, err, "should return error when context is cancelled") - require.Contains(t, err.Error(), "context canceled") -} diff --git a/entc/gen/storage.go b/entc/gen/storage.go index 6fcde470fa..bbf89356ad 100644 --- a/entc/gen/storage.go +++ b/entc/gen/storage.go @@ -60,7 +60,6 @@ var drivers = []*Storage{ "entgo.io/ent/dialect/sql", "entgo.io/ent/dialect/sql/sqlgraph", "entgo.io/ent/dialect/sql/sqljson", - "entgo.io/ent/dialect/ydb", "entgo.io/ent/schema/field", }, SchemaMode: Unique | Indexes | Cascade | Migrate, diff --git a/entc/gen/template/dialect/sql/feature/retryoptions.tmpl b/entc/gen/template/dialect/sql/feature/retryoptions.tmpl index fa066279da..e817cea5bf 100644 --- a/entc/gen/template/dialect/sql/feature/retryoptions.tmpl +++ b/entc/gen/template/dialect/sql/feature/retryoptions.tmpl @@ -12,35 +12,35 @@ in the LICENSE file in the root directory of this source tree. {{/* Additional fields for the create builder. */}} {{ define "dialect/sql/create/fields/additional/retryoptions" -}} {{- if $.FeatureEnabled "sql/retryoptions" }} - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig {{- end }} {{- end }} {{/* Additional fields for the create_bulk builder. */}} {{ define "dialect/sql/create_bulk/fields/additional/retryoptions" -}} {{- if $.FeatureEnabled "sql/retryoptions" }} - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig {{- end }} {{- end }} {{/* Additional fields for the update builder. */}} {{ define "dialect/sql/update/fields/additional/retryoptions" -}} {{- if $.FeatureEnabled "sql/retryoptions" }} - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig {{- end }} {{- end }} {{/* Additional fields for the query builder. */}} {{ define "dialect/sql/query/fields/additional/retryoptions" -}} {{- if $.FeatureEnabled "sql/retryoptions" }} - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig {{- end }} {{- end }} {{/* Additional fields for the delete builder. */}} {{ define "dialect/sql/delete/fields/additional/retryoptions" -}} {{- if $.FeatureEnabled "sql/retryoptions" }} - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig {{- end }} {{- end }} diff --git a/entc/gen/template/dialect/sql/open.tmpl b/entc/gen/template/dialect/sql/open.tmpl index 9be135d5b2..d64b2417be 100644 --- a/entc/gen/template/dialect/sql/open.tmpl +++ b/entc/gen/template/dialect/sql/open.tmpl @@ -7,15 +7,7 @@ in the LICENSE file in the root directory of this source tree. {{/* gotype: entgo.io/ent/entc/gen.Graph */}} {{ define "dialect/sql/client/open" }} - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/gen/template/dialect/sql/update.tmpl b/entc/gen/template/dialect/sql/update.tmpl index 55bbdd9f85..7ab0f86bf0 100644 --- a/entc/gen/template/dialect/sql/update.tmpl +++ b/entc/gen/template/dialect/sql/update.tmpl @@ -171,7 +171,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) (_node {{ if {{- else }} if _node, err = sqlgraph.UpdateNodes(ctx, {{ $receiver }}.driver, _spec); err != nil { {{- end }} - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{ {{ $.Package }}.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/cascadelete/ent/client.go b/entc/integration/cascadelete/ent/client.go index 554ee80e20..2a7a6da62d 100644 --- a/entc/integration/cascadelete/ent/client.go +++ b/entc/integration/cascadelete/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/cascadelete/ent/comment" "entgo.io/ent/entc/integration/cascadelete/ent/post" "entgo.io/ent/entc/integration/cascadelete/ent/user" @@ -114,15 +113,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/cascadelete/ent/comment_update.go b/entc/integration/cascadelete/ent/comment_update.go index 3709d909b1..5a2c4eb7fe 100644 --- a/entc/integration/cascadelete/ent/comment_update.go +++ b/entc/integration/cascadelete/ent/comment_update.go @@ -156,7 +156,7 @@ func (_u *CommentUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{comment.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -332,7 +332,7 @@ func (_u *CommentUpdateOne) sqlSave(ctx context.Context) (_node *Comment, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{comment.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/cascadelete/ent/post_update.go b/entc/integration/cascadelete/ent/post_update.go index bce5d98f42..440304b7ac 100644 --- a/entc/integration/cascadelete/ent/post_update.go +++ b/entc/integration/cascadelete/ent/post_update.go @@ -233,7 +233,7 @@ func (_u *PostUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{post.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -485,7 +485,7 @@ func (_u *PostUpdateOne) sqlSave(ctx context.Context) (_node *Post, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{post.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/cascadelete/ent/user_update.go b/entc/integration/cascadelete/ent/user_update.go index 86c8e1f392..4012d76085 100644 --- a/entc/integration/cascadelete/ent/user_update.go +++ b/entc/integration/cascadelete/ent/user_update.go @@ -172,7 +172,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -364,7 +364,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/config/ent/client.go b/entc/integration/config/ent/client.go index 1b9dee98cb..9dee134e80 100644 --- a/entc/integration/config/ent/client.go +++ b/entc/integration/config/ent/client.go @@ -18,7 +18,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/config/ent/user" ) @@ -105,15 +104,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/config/ent/user_update.go b/entc/integration/config/ent/user_update.go index daa76b2d3d..0917112e59 100644 --- a/entc/integration/config/ent/user_update.go +++ b/entc/integration/config/ent/user_update.go @@ -125,7 +125,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.ClearField(user.FieldLabel, field.TypeString) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -271,7 +271,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/account_update.go b/entc/integration/customid/ent/account_update.go index 92f0950009..e930bf74df 100644 --- a/entc/integration/customid/ent/account_update.go +++ b/entc/integration/customid/ent/account_update.go @@ -186,7 +186,7 @@ func (_u *AccountUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{account.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -391,7 +391,7 @@ func (_u *AccountUpdateOne) sqlSave(ctx context.Context) (_node *Account, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{account.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/blob_update.go b/entc/integration/customid/ent/blob_update.go index 52287f93d3..de498aae9a 100644 --- a/entc/integration/customid/ent/blob_update.go +++ b/entc/integration/customid/ent/blob_update.go @@ -265,7 +265,7 @@ func (_u *BlobUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{blob.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -550,7 +550,7 @@ func (_u *BlobUpdateOne) sqlSave(ctx context.Context) (_node *Blob, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{blob.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/bloblink_update.go b/entc/integration/customid/ent/bloblink_update.go index 4f7a573319..b4f418ec0c 100644 --- a/entc/integration/customid/ent/bloblink_update.go +++ b/entc/integration/customid/ent/bloblink_update.go @@ -215,7 +215,7 @@ func (_u *BlobLinkUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{bloblink.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -450,7 +450,7 @@ func (_u *BlobLinkUpdateOne) sqlSave(ctx context.Context) (_node *BlobLink, err _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{bloblink.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/car_update.go b/entc/integration/customid/ent/car_update.go index 3da75dc398..69b97be16e 100644 --- a/entc/integration/customid/ent/car_update.go +++ b/entc/integration/customid/ent/car_update.go @@ -235,7 +235,7 @@ func (_u *CarUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{car.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -490,7 +490,7 @@ func (_u *CarUpdateOne) sqlSave(ctx context.Context) (_node *Car, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{car.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/client.go b/entc/integration/customid/ent/client.go index 85427b4f00..1c0bbeceb2 100644 --- a/entc/integration/customid/ent/client.go +++ b/entc/integration/customid/ent/client.go @@ -23,7 +23,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/customid/ent/account" "entgo.io/ent/entc/integration/customid/ent/blob" "entgo.io/ent/entc/integration/customid/ent/bloblink" @@ -174,15 +173,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/customid/ent/device_update.go b/entc/integration/customid/ent/device_update.go index e18f30d5eb..4e2e7baf40 100644 --- a/entc/integration/customid/ent/device_update.go +++ b/entc/integration/customid/ent/device_update.go @@ -210,7 +210,7 @@ func (_u *DeviceUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{device.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -439,7 +439,7 @@ func (_u *DeviceUpdateOne) sqlSave(ctx context.Context) (_node *Device, err erro _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{device.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/doc_update.go b/entc/integration/customid/ent/doc_update.go index a2690acf4f..02aac6296c 100644 --- a/entc/integration/customid/ent/doc_update.go +++ b/entc/integration/customid/ent/doc_update.go @@ -316,7 +316,7 @@ func (_u *DocUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{doc.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -652,7 +652,7 @@ func (_u *DocUpdateOne) sqlSave(ctx context.Context) (_node *Doc, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{doc.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/group_update.go b/entc/integration/customid/ent/group_update.go index d7983c268a..91ec716935 100644 --- a/entc/integration/customid/ent/group_update.go +++ b/entc/integration/customid/ent/group_update.go @@ -155,7 +155,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -330,7 +330,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/intsid_update.go b/entc/integration/customid/ent/intsid_update.go index e30b4a635e..51eb5c883b 100644 --- a/entc/integration/customid/ent/intsid_update.go +++ b/entc/integration/customid/ent/intsid_update.go @@ -209,7 +209,7 @@ func (_u *IntSIDUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{intsid.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -438,7 +438,7 @@ func (_u *IntSIDUpdateOne) sqlSave(ctx context.Context) (_node *IntSID, err erro _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{intsid.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/link_update.go b/entc/integration/customid/ent/link_update.go index 32b34e6496..6112471569 100644 --- a/entc/integration/customid/ent/link_update.go +++ b/entc/integration/customid/ent/link_update.go @@ -83,7 +83,7 @@ func (_u *LinkUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(link.FieldLinkInformation, field.TypeJSON, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{link.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -186,7 +186,7 @@ func (_u *LinkUpdateOne) sqlSave(ctx context.Context) (_node *Link, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{link.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/mixinid_update.go b/entc/integration/customid/ent/mixinid_update.go index 5e1afcab69..96eed2bdb0 100644 --- a/entc/integration/customid/ent/mixinid_update.go +++ b/entc/integration/customid/ent/mixinid_update.go @@ -107,7 +107,7 @@ func (_u *MixinIDUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(mixinid.FieldMixinField, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{mixinid.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -235,7 +235,7 @@ func (_u *MixinIDUpdateOne) sqlSave(ctx context.Context) (_node *MixinID, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{mixinid.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/note_update.go b/entc/integration/customid/ent/note_update.go index e7babf44b2..ac320f157f 100644 --- a/entc/integration/customid/ent/note_update.go +++ b/entc/integration/customid/ent/note_update.go @@ -235,7 +235,7 @@ func (_u *NoteUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{note.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -490,7 +490,7 @@ func (_u *NoteUpdateOne) sqlSave(ctx context.Context) (_node *Note, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{note.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/other_update.go b/entc/integration/customid/ent/other_update.go index 350c40a572..ff7a3df4f1 100644 --- a/entc/integration/customid/ent/other_update.go +++ b/entc/integration/customid/ent/other_update.go @@ -73,7 +73,7 @@ func (_u *OtherUpdate) sqlSave(ctx context.Context) (_node int, err error) { } } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{other.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -167,7 +167,7 @@ func (_u *OtherUpdateOne) sqlSave(ctx context.Context) (_node *Other, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{other.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/pet_update.go b/entc/integration/customid/ent/pet_update.go index 3a5d52c583..93a3ae6f44 100644 --- a/entc/integration/customid/ent/pet_update.go +++ b/entc/integration/customid/ent/pet_update.go @@ -345,7 +345,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -709,7 +709,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/revision_update.go b/entc/integration/customid/ent/revision_update.go index 154dcdefd6..2d005d31fc 100644 --- a/entc/integration/customid/ent/revision_update.go +++ b/entc/integration/customid/ent/revision_update.go @@ -73,7 +73,7 @@ func (_u *RevisionUpdate) sqlSave(ctx context.Context) (_node int, err error) { } } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{revision.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -167,7 +167,7 @@ func (_u *RevisionUpdateOne) sqlSave(ctx context.Context) (_node *Revision, err _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{revision.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/session_update.go b/entc/integration/customid/ent/session_update.go index d9b0605f0c..3529baa1c0 100644 --- a/entc/integration/customid/ent/session_update.go +++ b/entc/integration/customid/ent/session_update.go @@ -129,7 +129,7 @@ func (_u *SessionUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{session.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -277,7 +277,7 @@ func (_u *SessionUpdateOne) sqlSave(ctx context.Context) (_node *Session, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{session.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/token_update.go b/entc/integration/customid/ent/token_update.go index 3611085333..7c0d603fac 100644 --- a/entc/integration/customid/ent/token_update.go +++ b/entc/integration/customid/ent/token_update.go @@ -154,7 +154,7 @@ func (_u *TokenUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{token.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -327,7 +327,7 @@ func (_u *TokenUpdateOne) sqlSave(ctx context.Context) (_node *Token, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{token.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/customid/ent/user_update.go b/entc/integration/customid/ent/user_update.go index c78665c533..ed50c01421 100644 --- a/entc/integration/customid/ent/user_update.go +++ b/entc/integration/customid/ent/user_update.go @@ -372,7 +372,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -763,7 +763,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgefield/ent/car_update.go b/entc/integration/edgefield/ent/car_update.go index b7b73e2c37..0ae3b6f090 100644 --- a/entc/integration/edgefield/ent/car_update.go +++ b/entc/integration/edgefield/ent/car_update.go @@ -181,7 +181,7 @@ func (_u *CarUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{car.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -382,7 +382,7 @@ func (_u *CarUpdateOne) sqlSave(ctx context.Context) (_node *Car, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{car.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgefield/ent/card_update.go b/entc/integration/edgefield/ent/card_update.go index d4acf756c5..6f6608a9c2 100644 --- a/entc/integration/edgefield/ent/card_update.go +++ b/entc/integration/edgefield/ent/card_update.go @@ -160,7 +160,7 @@ func (_u *CardUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -340,7 +340,7 @@ func (_u *CardUpdateOne) sqlSave(ctx context.Context) (_node *Card, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgefield/ent/client.go b/entc/integration/edgefield/ent/client.go index eaf9bcb348..85ad70493c 100644 --- a/entc/integration/edgefield/ent/client.go +++ b/entc/integration/edgefield/ent/client.go @@ -20,7 +20,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/edgefield/ent/car" "entgo.io/ent/entc/integration/edgefield/ent/card" "entgo.io/ent/entc/integration/edgefield/ent/info" @@ -139,15 +138,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/edgefield/ent/info_update.go b/entc/integration/edgefield/ent/info_update.go index 2b8f1bc544..b474b8bf0f 100644 --- a/entc/integration/edgefield/ent/info_update.go +++ b/entc/integration/edgefield/ent/info_update.go @@ -150,7 +150,7 @@ func (_u *InfoUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{info.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -318,7 +318,7 @@ func (_u *InfoUpdateOne) sqlSave(ctx context.Context) (_node *Info, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{info.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgefield/ent/metadata_update.go b/entc/integration/edgefield/ent/metadata_update.go index 2b64eb39d1..b3e9f06a5e 100644 --- a/entc/integration/edgefield/ent/metadata_update.go +++ b/entc/integration/edgefield/ent/metadata_update.go @@ -296,7 +296,7 @@ func (_u *MetadataUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{metadata.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -612,7 +612,7 @@ func (_u *MetadataUpdateOne) sqlSave(ctx context.Context) (_node *Metadata, err _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{metadata.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgefield/ent/node_update.go b/entc/integration/edgefield/ent/node_update.go index 06e313bd49..d91369ba26 100644 --- a/entc/integration/edgefield/ent/node_update.go +++ b/entc/integration/edgefield/ent/node_update.go @@ -214,7 +214,7 @@ func (_u *NodeUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{node.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -449,7 +449,7 @@ func (_u *NodeUpdateOne) sqlSave(ctx context.Context) (_node *Node, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{node.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgefield/ent/pet_update.go b/entc/integration/edgefield/ent/pet_update.go index 312aa37156..d84f709c58 100644 --- a/entc/integration/edgefield/ent/pet_update.go +++ b/entc/integration/edgefield/ent/pet_update.go @@ -134,7 +134,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -288,7 +288,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgefield/ent/post_update.go b/entc/integration/edgefield/ent/post_update.go index 7ebdb4cdd1..52c9241c1e 100644 --- a/entc/integration/edgefield/ent/post_update.go +++ b/entc/integration/edgefield/ent/post_update.go @@ -151,7 +151,7 @@ func (_u *PostUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{post.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -322,7 +322,7 @@ func (_u *PostUpdateOne) sqlSave(ctx context.Context) (_node *Post, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{post.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgefield/ent/rental_update.go b/entc/integration/edgefield/ent/rental_update.go index de755ad991..fa4f996ce6 100644 --- a/entc/integration/edgefield/ent/rental_update.go +++ b/entc/integration/edgefield/ent/rental_update.go @@ -105,7 +105,7 @@ func (_u *RentalUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(rental.FieldDate, field.TypeTime, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{rental.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -230,7 +230,7 @@ func (_u *RentalUpdateOne) sqlSave(ctx context.Context) (_node *Rental, err erro _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{rental.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgefield/ent/user_update.go b/entc/integration/edgefield/ent/user_update.go index 674eaf5812..3e06858d21 100644 --- a/entc/integration/edgefield/ent/user_update.go +++ b/entc/integration/edgefield/ent/user_update.go @@ -570,7 +570,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -1156,7 +1156,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/attachedfile_update.go b/entc/integration/edgeschema/ent/attachedfile_update.go index fae5b0a9a6..b7a72efc00 100644 --- a/entc/integration/edgeschema/ent/attachedfile_update.go +++ b/entc/integration/edgeschema/ent/attachedfile_update.go @@ -221,7 +221,7 @@ func (_u *AttachedFileUpdate) sqlSave(ctx context.Context) (_node int, err error _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{attachedfile.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -460,7 +460,7 @@ func (_u *AttachedFileUpdateOne) sqlSave(ctx context.Context) (_node *AttachedFi _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{attachedfile.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/client.go b/entc/integration/edgeschema/ent/client.go index 3a8ad32449..e7ef36af0f 100644 --- a/entc/integration/edgeschema/ent/client.go +++ b/entc/integration/edgeschema/ent/client.go @@ -20,7 +20,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/edgeschema/ent/attachedfile" "entgo.io/ent/entc/integration/edgeschema/ent/file" "entgo.io/ent/entc/integration/edgeschema/ent/friendship" @@ -171,15 +170,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/edgeschema/ent/file_update.go b/entc/integration/edgeschema/ent/file_update.go index 2d33593f74..03928e49bc 100644 --- a/entc/integration/edgeschema/ent/file_update.go +++ b/entc/integration/edgeschema/ent/file_update.go @@ -172,7 +172,7 @@ func (_u *FileUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{file.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -364,7 +364,7 @@ func (_u *FileUpdateOne) sqlSave(ctx context.Context) (_node *File, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{file.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/friendship_update.go b/entc/integration/edgeschema/ent/friendship_update.go index caf0e0f2ab..456770a6a1 100644 --- a/entc/integration/edgeschema/ent/friendship_update.go +++ b/entc/integration/edgeschema/ent/friendship_update.go @@ -132,7 +132,7 @@ func (_u *FriendshipUpdate) sqlSave(ctx context.Context) (_node int, err error) _spec.SetField(friendship.FieldCreatedAt, field.TypeTime, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{friendship.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -284,7 +284,7 @@ func (_u *FriendshipUpdateOne) sqlSave(ctx context.Context) (_node *Friendship, _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{friendship.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/group_update.go b/entc/integration/edgeschema/ent/group_update.go index 71261d26fa..0a1c383cb5 100644 --- a/entc/integration/edgeschema/ent/group_update.go +++ b/entc/integration/edgeschema/ent/group_update.go @@ -430,7 +430,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -877,7 +877,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/grouptag_update.go b/entc/integration/edgeschema/ent/grouptag_update.go index f18425c559..5e15b0a553 100644 --- a/entc/integration/edgeschema/ent/grouptag_update.go +++ b/entc/integration/edgeschema/ent/grouptag_update.go @@ -197,7 +197,7 @@ func (_u *GroupTagUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{grouptag.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -413,7 +413,7 @@ func (_u *GroupTagUpdateOne) sqlSave(ctx context.Context) (_node *GroupTag, err _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{grouptag.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/process_update.go b/entc/integration/edgeschema/ent/process_update.go index cd9c6adcba..7df34a4da1 100644 --- a/entc/integration/edgeschema/ent/process_update.go +++ b/entc/integration/edgeschema/ent/process_update.go @@ -249,7 +249,7 @@ func (_u *ProcessUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{process.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -517,7 +517,7 @@ func (_u *ProcessUpdateOne) sqlSave(ctx context.Context) (_node *Process, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{process.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/relationship_update.go b/entc/integration/edgeschema/ent/relationship_update.go index 5d21c62a84..35610a3220 100644 --- a/entc/integration/edgeschema/ent/relationship_update.go +++ b/entc/integration/edgeschema/ent/relationship_update.go @@ -284,7 +284,7 @@ func (_u *RelationshipUpdate) sqlSave(ctx context.Context) (_node int, err error _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{relationship.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -589,7 +589,7 @@ func (_u *RelationshipUpdateOne) sqlSave(ctx context.Context) (_node *Relationsh _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{relationship.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/relationshipinfo_update.go b/entc/integration/edgeschema/ent/relationshipinfo_update.go index 7c2b1ca503..620c6615af 100644 --- a/entc/integration/edgeschema/ent/relationshipinfo_update.go +++ b/entc/integration/edgeschema/ent/relationshipinfo_update.go @@ -90,7 +90,7 @@ func (_u *RelationshipInfoUpdate) sqlSave(ctx context.Context) (_node int, err e _spec.SetField(relationshipinfo.FieldText, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{relationshipinfo.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -201,7 +201,7 @@ func (_u *RelationshipInfoUpdateOne) sqlSave(ctx context.Context) (_node *Relati _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{relationshipinfo.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/role_update.go b/entc/integration/edgeschema/ent/role_update.go index 8c146dcb6d..64816a797a 100644 --- a/entc/integration/edgeschema/ent/role_update.go +++ b/entc/integration/edgeschema/ent/role_update.go @@ -202,7 +202,7 @@ func (_u *RoleUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{role.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -423,7 +423,7 @@ func (_u *RoleUpdateOne) sqlSave(ctx context.Context) (_node *Role, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{role.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/roleuser_update.go b/entc/integration/edgeschema/ent/roleuser_update.go index 226e7fd5fc..9590eff01e 100644 --- a/entc/integration/edgeschema/ent/roleuser_update.go +++ b/entc/integration/edgeschema/ent/roleuser_update.go @@ -215,7 +215,7 @@ func (_u *RoleUserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{roleuser.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -450,7 +450,7 @@ func (_u *RoleUserUpdateOne) sqlSave(ctx context.Context) (_node *RoleUser, err _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{roleuser.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/tag_update.go b/entc/integration/edgeschema/ent/tag_update.go index dde23a2c07..f242a901e1 100644 --- a/entc/integration/edgeschema/ent/tag_update.go +++ b/entc/integration/edgeschema/ent/tag_update.go @@ -440,7 +440,7 @@ func (_u *TagUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tag.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -896,7 +896,7 @@ func (_u *TagUpdateOne) sqlSave(ctx context.Context) (_node *Tag, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tag.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/tweet_update.go b/entc/integration/edgeschema/ent/tweet_update.go index abe45843c9..39c15b8e52 100644 --- a/entc/integration/edgeschema/ent/tweet_update.go +++ b/entc/integration/edgeschema/ent/tweet_update.go @@ -545,7 +545,7 @@ func (_u *TweetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tweet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -1106,7 +1106,7 @@ func (_u *TweetUpdateOne) sqlSave(ctx context.Context) (_node *Tweet, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tweet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/tweetlike_update.go b/entc/integration/edgeschema/ent/tweetlike_update.go index e9c7b880df..1053ae710e 100644 --- a/entc/integration/edgeschema/ent/tweetlike_update.go +++ b/entc/integration/edgeschema/ent/tweetlike_update.go @@ -215,7 +215,7 @@ func (_u *TweetLikeUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tweetlike.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -450,7 +450,7 @@ func (_u *TweetLikeUpdateOne) sqlSave(ctx context.Context) (_node *TweetLike, er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tweetlike.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/tweettag_update.go b/entc/integration/edgeschema/ent/tweettag_update.go index 73e657a7b8..c8047cc7bf 100644 --- a/entc/integration/edgeschema/ent/tweettag_update.go +++ b/entc/integration/edgeschema/ent/tweettag_update.go @@ -215,7 +215,7 @@ func (_u *TweetTagUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tweettag.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -448,7 +448,7 @@ func (_u *TweetTagUpdateOne) sqlSave(ctx context.Context) (_node *TweetTag, err _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tweettag.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/user_update.go b/entc/integration/edgeschema/ent/user_update.go index a5bf9b8c6e..d588e013a6 100644 --- a/entc/integration/edgeschema/ent/user_update.go +++ b/entc/integration/edgeschema/ent/user_update.go @@ -897,7 +897,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -1809,7 +1809,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/usergroup_update.go b/entc/integration/edgeschema/ent/usergroup_update.go index abaecec83b..22f1b746f0 100644 --- a/entc/integration/edgeschema/ent/usergroup_update.go +++ b/entc/integration/edgeschema/ent/usergroup_update.go @@ -215,7 +215,7 @@ func (_u *UserGroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{usergroup.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -448,7 +448,7 @@ func (_u *UserGroupUpdateOne) sqlSave(ctx context.Context) (_node *UserGroup, er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{usergroup.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/edgeschema/ent/usertweet_update.go b/entc/integration/edgeschema/ent/usertweet_update.go index d992ee8d45..e283fd16d2 100644 --- a/entc/integration/edgeschema/ent/usertweet_update.go +++ b/entc/integration/edgeschema/ent/usertweet_update.go @@ -215,7 +215,7 @@ func (_u *UserTweetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{usertweet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -448,7 +448,7 @@ func (_u *UserTweetUpdateOne) sqlSave(ctx context.Context) (_node *UserTweet, er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{usertweet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/api_create.go b/entc/integration/ent/api_create.go index 11995cb813..40511ea5bf 100644 --- a/entc/integration/ent/api_create.go +++ b/entc/integration/ent/api_create.go @@ -22,7 +22,7 @@ type APICreate struct { config mutation *APIMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -219,7 +219,7 @@ type APICreateBulk struct { config err error builders []*APICreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/api_delete.go b/entc/integration/ent/api_delete.go index ea896eca93..e4fee7c501 100644 --- a/entc/integration/ent/api_delete.go +++ b/entc/integration/ent/api_delete.go @@ -21,7 +21,7 @@ type APIDelete struct { config hooks []Hook mutation *APIMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the APIDelete builder. diff --git a/entc/integration/ent/api_query.go b/entc/integration/ent/api_query.go index 256d3f8281..a8fa9ae8a5 100644 --- a/entc/integration/ent/api_query.go +++ b/entc/integration/ent/api_query.go @@ -28,7 +28,7 @@ type APIQuery struct { inters []Interceptor predicates []predicate.Api modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/api_update.go b/entc/integration/ent/api_update.go index ad788a6f45..928383bf25 100644 --- a/entc/integration/ent/api_update.go +++ b/entc/integration/ent/api_update.go @@ -24,7 +24,7 @@ type APIUpdate struct { hooks []Hook mutation *APIMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the APIUpdate builder. @@ -90,7 +90,7 @@ func (_u *APIUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{api.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -108,7 +108,7 @@ type APIUpdateOne struct { hooks []Hook mutation *APIMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Mutation returns the APIMutation object of the builder. @@ -201,7 +201,7 @@ func (_u *APIUpdateOne) sqlSave(ctx context.Context) (_node *Api, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{api.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/builder_create.go b/entc/integration/ent/builder_create.go index ce42a6c5c8..c926f3f72d 100644 --- a/entc/integration/ent/builder_create.go +++ b/entc/integration/ent/builder_create.go @@ -22,7 +22,7 @@ type BuilderCreate struct { config mutation *BuilderMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -219,7 +219,7 @@ type BuilderCreateBulk struct { config err error builders []*BuilderCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/builder_delete.go b/entc/integration/ent/builder_delete.go index e2df610c9b..45427b58fc 100644 --- a/entc/integration/ent/builder_delete.go +++ b/entc/integration/ent/builder_delete.go @@ -21,7 +21,7 @@ type BuilderDelete struct { config hooks []Hook mutation *BuilderMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the BuilderDelete builder. diff --git a/entc/integration/ent/builder_query.go b/entc/integration/ent/builder_query.go index 111b69a9d8..d6d02e3e1f 100644 --- a/entc/integration/ent/builder_query.go +++ b/entc/integration/ent/builder_query.go @@ -28,7 +28,7 @@ type BuilderQuery struct { inters []Interceptor predicates []predicate.Builder modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/builder_update.go b/entc/integration/ent/builder_update.go index b543367ef3..d9502522bf 100644 --- a/entc/integration/ent/builder_update.go +++ b/entc/integration/ent/builder_update.go @@ -24,7 +24,7 @@ type BuilderUpdate struct { hooks []Hook mutation *BuilderMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the BuilderUpdate builder. @@ -90,7 +90,7 @@ func (_u *BuilderUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{builder.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -108,7 +108,7 @@ type BuilderUpdateOne struct { hooks []Hook mutation *BuilderMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Mutation returns the BuilderMutation object of the builder. @@ -201,7 +201,7 @@ func (_u *BuilderUpdateOne) sqlSave(ctx context.Context) (_node *Builder, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{builder.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/card_create.go b/entc/integration/ent/card_create.go index eb559b8334..ae150a3579 100644 --- a/entc/integration/ent/card_create.go +++ b/entc/integration/ent/card_create.go @@ -25,7 +25,7 @@ type CardCreate struct { config mutation *CardMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -528,7 +528,7 @@ type CardCreateBulk struct { config err error builders []*CardCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/card_delete.go b/entc/integration/ent/card_delete.go index d6479ec76d..8953497378 100644 --- a/entc/integration/ent/card_delete.go +++ b/entc/integration/ent/card_delete.go @@ -21,7 +21,7 @@ type CardDelete struct { config hooks []Hook mutation *CardMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the CardDelete builder. diff --git a/entc/integration/ent/card_query.go b/entc/integration/ent/card_query.go index b15621ff4b..8af02449f6 100644 --- a/entc/integration/ent/card_query.go +++ b/entc/integration/ent/card_query.go @@ -35,7 +35,7 @@ type CardQuery struct { withFKs bool modifiers []func(*sql.Selector) withNamedSpec map[string]*SpecQuery - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/card_update.go b/entc/integration/ent/card_update.go index 679c383abf..30df6c085a 100644 --- a/entc/integration/ent/card_update.go +++ b/entc/integration/ent/card_update.go @@ -27,7 +27,7 @@ type CardUpdate struct { hooks []Hook mutation *CardMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the CardUpdate builder. @@ -312,7 +312,7 @@ func (_u *CardUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -330,7 +330,7 @@ type CardUpdateOne struct { hooks []Hook mutation *CardMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetUpdateTime sets the "update_time" field. @@ -642,7 +642,7 @@ func (_u *CardUpdateOne) sqlSave(ctx context.Context) (_node *Card, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/client.go b/entc/integration/ent/client.go index 199db87d67..9c603777ea 100644 --- a/entc/integration/ent/client.go +++ b/entc/integration/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/ent/api" "entgo.io/ent/entc/integration/ent/builder" "entgo.io/ent/entc/integration/ent/card" @@ -181,15 +180,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/ent/comment_create.go b/entc/integration/ent/comment_create.go index d06f067950..bd422a6d50 100644 --- a/entc/integration/ent/comment_create.go +++ b/entc/integration/ent/comment_create.go @@ -23,7 +23,7 @@ type CommentCreate struct { config mutation *CommentMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -571,7 +571,7 @@ type CommentCreateBulk struct { config err error builders []*CommentCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/comment_delete.go b/entc/integration/ent/comment_delete.go index f4f2270eb2..93e119c963 100644 --- a/entc/integration/ent/comment_delete.go +++ b/entc/integration/ent/comment_delete.go @@ -21,7 +21,7 @@ type CommentDelete struct { config hooks []Hook mutation *CommentMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the CommentDelete builder. diff --git a/entc/integration/ent/comment_query.go b/entc/integration/ent/comment_query.go index 166542f3a2..c3baf3ad40 100644 --- a/entc/integration/ent/comment_query.go +++ b/entc/integration/ent/comment_query.go @@ -28,7 +28,7 @@ type CommentQuery struct { inters []Interceptor predicates []predicate.Comment modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/comment_update.go b/entc/integration/ent/comment_update.go index acc785dedc..6cb40439ad 100644 --- a/entc/integration/ent/comment_update.go +++ b/entc/integration/ent/comment_update.go @@ -25,7 +25,7 @@ type CommentUpdate struct { hooks []Hook mutation *CommentMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the CommentUpdate builder. @@ -259,7 +259,7 @@ func (_u *CommentUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{comment.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -277,7 +277,7 @@ type CommentUpdateOne struct { hooks []Hook mutation *CommentMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetUniqueInt sets the "unique_int" field. @@ -538,7 +538,7 @@ func (_u *CommentUpdateOne) sqlSave(ctx context.Context) (_node *Comment, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{comment.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/exvaluescan_create.go b/entc/integration/ent/exvaluescan_create.go index f3137aa574..ac8d39e056 100644 --- a/entc/integration/ent/exvaluescan_create.go +++ b/entc/integration/ent/exvaluescan_create.go @@ -24,7 +24,7 @@ type ExValueScanCreate struct { config mutation *ExValueScanMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -612,7 +612,7 @@ type ExValueScanCreateBulk struct { config err error builders []*ExValueScanCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/exvaluescan_delete.go b/entc/integration/ent/exvaluescan_delete.go index 3a6556e16e..3c35359eb4 100644 --- a/entc/integration/ent/exvaluescan_delete.go +++ b/entc/integration/ent/exvaluescan_delete.go @@ -21,7 +21,7 @@ type ExValueScanDelete struct { config hooks []Hook mutation *ExValueScanMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the ExValueScanDelete builder. diff --git a/entc/integration/ent/exvaluescan_query.go b/entc/integration/ent/exvaluescan_query.go index 65590152e2..a7f938c531 100644 --- a/entc/integration/ent/exvaluescan_query.go +++ b/entc/integration/ent/exvaluescan_query.go @@ -28,7 +28,7 @@ type ExValueScanQuery struct { inters []Interceptor predicates []predicate.ExValueScan modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/exvaluescan_update.go b/entc/integration/ent/exvaluescan_update.go index 4e61748b2f..855ad39a59 100644 --- a/entc/integration/ent/exvaluescan_update.go +++ b/entc/integration/ent/exvaluescan_update.go @@ -26,7 +26,7 @@ type ExValueScanUpdate struct { hooks []Hook mutation *ExValueScanMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the ExValueScanUpdate builder. @@ -247,7 +247,7 @@ func (_u *ExValueScanUpdate) sqlSave(ctx context.Context) (_node int, err error) _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{exvaluescan.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -265,7 +265,7 @@ type ExValueScanUpdateOne struct { hooks []Hook mutation *ExValueScanMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetBinary sets the "binary" field. @@ -513,7 +513,7 @@ func (_u *ExValueScanUpdateOne) sqlSave(ctx context.Context) (_node *ExValueScan _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{exvaluescan.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/fieldtype_create.go b/entc/integration/ent/fieldtype_create.go index dcba23b626..9c84c807a4 100644 --- a/entc/integration/ent/fieldtype_create.go +++ b/entc/integration/ent/fieldtype_create.go @@ -28,7 +28,7 @@ type FieldTypeCreate struct { config mutation *FieldTypeMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -4181,7 +4181,7 @@ type FieldTypeCreateBulk struct { config err error builders []*FieldTypeCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/fieldtype_delete.go b/entc/integration/ent/fieldtype_delete.go index 0dd3867853..c08698333c 100644 --- a/entc/integration/ent/fieldtype_delete.go +++ b/entc/integration/ent/fieldtype_delete.go @@ -21,7 +21,7 @@ type FieldTypeDelete struct { config hooks []Hook mutation *FieldTypeMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the FieldTypeDelete builder. diff --git a/entc/integration/ent/fieldtype_query.go b/entc/integration/ent/fieldtype_query.go index ac8b169052..1ea3fa68f8 100644 --- a/entc/integration/ent/fieldtype_query.go +++ b/entc/integration/ent/fieldtype_query.go @@ -29,7 +29,7 @@ type FieldTypeQuery struct { predicates []predicate.FieldType withFKs bool modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/fieldtype_update.go b/entc/integration/ent/fieldtype_update.go index 81890a7dd9..a26206cf23 100644 --- a/entc/integration/ent/fieldtype_update.go +++ b/entc/integration/ent/fieldtype_update.go @@ -31,7 +31,7 @@ type FieldTypeUpdate struct { hooks []Hook mutation *FieldTypeMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the FieldTypeUpdate builder. @@ -1928,7 +1928,7 @@ func (_u *FieldTypeUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{fieldtype.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -1946,7 +1946,7 @@ type FieldTypeUpdateOne struct { hooks []Hook mutation *FieldTypeMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetInt sets the "int" field. @@ -3870,7 +3870,7 @@ func (_u *FieldTypeUpdateOne) sqlSave(ctx context.Context) (_node *FieldType, er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{fieldtype.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/file_create.go b/entc/integration/ent/file_create.go index 6b7c44fcc8..b989f0ae66 100644 --- a/entc/integration/ent/file_create.go +++ b/entc/integration/ent/file_create.go @@ -26,7 +26,7 @@ type FileCreate struct { config mutation *FileMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -818,7 +818,7 @@ type FileCreateBulk struct { config err error builders []*FileCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/file_delete.go b/entc/integration/ent/file_delete.go index 7af494bf69..e3b570ae33 100644 --- a/entc/integration/ent/file_delete.go +++ b/entc/integration/ent/file_delete.go @@ -21,7 +21,7 @@ type FileDelete struct { config hooks []Hook mutation *FileMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the FileDelete builder. diff --git a/entc/integration/ent/file_query.go b/entc/integration/ent/file_query.go index ac61788e95..0cfa86a0f1 100644 --- a/entc/integration/ent/file_query.go +++ b/entc/integration/ent/file_query.go @@ -37,7 +37,7 @@ type FileQuery struct { withFKs bool modifiers []func(*sql.Selector) withNamedField map[string]*FieldTypeQuery - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/file_update.go b/entc/integration/ent/file_update.go index da45d1c6b5..90b25b9939 100644 --- a/entc/integration/ent/file_update.go +++ b/entc/integration/ent/file_update.go @@ -28,7 +28,7 @@ type FileUpdate struct { hooks []Hook mutation *FileMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the FileUpdate builder. @@ -521,7 +521,7 @@ func (_u *FileUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{file.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -539,7 +539,7 @@ type FileUpdateOne struct { hooks []Hook mutation *FileMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetSetID sets the "set_id" field. @@ -1059,7 +1059,7 @@ func (_u *FileUpdateOne) sqlSave(ctx context.Context) (_node *File, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{file.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/filetype_create.go b/entc/integration/ent/filetype_create.go index 04bc53ab60..7acd4c3bce 100644 --- a/entc/integration/ent/filetype_create.go +++ b/entc/integration/ent/filetype_create.go @@ -23,7 +23,7 @@ type FileTypeCreate struct { config mutation *FileTypeMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -413,7 +413,7 @@ type FileTypeCreateBulk struct { config err error builders []*FileTypeCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/filetype_delete.go b/entc/integration/ent/filetype_delete.go index a95d2f4df1..aed5948604 100644 --- a/entc/integration/ent/filetype_delete.go +++ b/entc/integration/ent/filetype_delete.go @@ -21,7 +21,7 @@ type FileTypeDelete struct { config hooks []Hook mutation *FileTypeMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the FileTypeDelete builder. diff --git a/entc/integration/ent/filetype_query.go b/entc/integration/ent/filetype_query.go index 3823927bd2..720c82a824 100644 --- a/entc/integration/ent/filetype_query.go +++ b/entc/integration/ent/filetype_query.go @@ -32,7 +32,7 @@ type FileTypeQuery struct { withFiles *FileQuery modifiers []func(*sql.Selector) withNamedFiles map[string]*FileQuery - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/filetype_update.go b/entc/integration/ent/filetype_update.go index 10cf3c1996..7a9d983507 100644 --- a/entc/integration/ent/filetype_update.go +++ b/entc/integration/ent/filetype_update.go @@ -25,7 +25,7 @@ type FileTypeUpdate struct { hooks []Hook mutation *FileTypeMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the FileTypeUpdate builder. @@ -241,7 +241,7 @@ func (_u *FileTypeUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{filetype.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -259,7 +259,7 @@ type FileTypeUpdateOne struct { hooks []Hook mutation *FileTypeMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetName sets the "name" field. @@ -502,7 +502,7 @@ func (_u *FileTypeUpdateOne) sqlSave(ctx context.Context) (_node *FileType, err _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{filetype.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/goods_create.go b/entc/integration/ent/goods_create.go index ce57d59b77..dbe0c88b5e 100644 --- a/entc/integration/ent/goods_create.go +++ b/entc/integration/ent/goods_create.go @@ -22,7 +22,7 @@ type GoodsCreate struct { config mutation *GoodsMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -219,7 +219,7 @@ type GoodsCreateBulk struct { config err error builders []*GoodsCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/goods_delete.go b/entc/integration/ent/goods_delete.go index f9e49134df..95d1cefec2 100644 --- a/entc/integration/ent/goods_delete.go +++ b/entc/integration/ent/goods_delete.go @@ -21,7 +21,7 @@ type GoodsDelete struct { config hooks []Hook mutation *GoodsMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the GoodsDelete builder. diff --git a/entc/integration/ent/goods_query.go b/entc/integration/ent/goods_query.go index c28b06688d..467114a544 100644 --- a/entc/integration/ent/goods_query.go +++ b/entc/integration/ent/goods_query.go @@ -28,7 +28,7 @@ type GoodsQuery struct { inters []Interceptor predicates []predicate.Goods modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/goods_update.go b/entc/integration/ent/goods_update.go index 37732b6254..70c2a2f242 100644 --- a/entc/integration/ent/goods_update.go +++ b/entc/integration/ent/goods_update.go @@ -24,7 +24,7 @@ type GoodsUpdate struct { hooks []Hook mutation *GoodsMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the GoodsUpdate builder. @@ -90,7 +90,7 @@ func (_u *GoodsUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{goods.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -108,7 +108,7 @@ type GoodsUpdateOne struct { hooks []Hook mutation *GoodsMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Mutation returns the GoodsMutation object of the builder. @@ -201,7 +201,7 @@ func (_u *GoodsUpdateOne) sqlSave(ctx context.Context) (_node *Goods, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{goods.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/group_create.go b/entc/integration/ent/group_create.go index 8d2be28c49..e8d46a90ad 100644 --- a/entc/integration/ent/group_create.go +++ b/entc/integration/ent/group_create.go @@ -26,7 +26,7 @@ type GroupCreate struct { config mutation *GroupMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -633,7 +633,7 @@ type GroupCreateBulk struct { config err error builders []*GroupCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/group_delete.go b/entc/integration/ent/group_delete.go index 353ed4e359..c1cbe6a2ff 100644 --- a/entc/integration/ent/group_delete.go +++ b/entc/integration/ent/group_delete.go @@ -21,7 +21,7 @@ type GroupDelete struct { config hooks []Hook mutation *GroupMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the GroupDelete builder. diff --git a/entc/integration/ent/group_query.go b/entc/integration/ent/group_query.go index 99c333cd9c..233675c2c8 100644 --- a/entc/integration/ent/group_query.go +++ b/entc/integration/ent/group_query.go @@ -40,7 +40,7 @@ type GroupQuery struct { withNamedFiles map[string]*FileQuery withNamedBlocked map[string]*UserQuery withNamedUsers map[string]*UserQuery - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/group_update.go b/entc/integration/ent/group_update.go index 1fb546a0c2..d7919dd516 100644 --- a/entc/integration/ent/group_update.go +++ b/entc/integration/ent/group_update.go @@ -28,7 +28,7 @@ type GroupUpdate struct { hooks []Hook mutation *GroupMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the GroupUpdate builder. @@ -522,7 +522,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -540,7 +540,7 @@ type GroupUpdateOne struct { hooks []Hook mutation *GroupMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetActive sets the "active" field. @@ -1061,7 +1061,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/groupinfo_create.go b/entc/integration/ent/groupinfo_create.go index 8162668e19..10fb463642 100644 --- a/entc/integration/ent/groupinfo_create.go +++ b/entc/integration/ent/groupinfo_create.go @@ -23,7 +23,7 @@ type GroupInfoCreate struct { config mutation *GroupInfoMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -365,7 +365,7 @@ type GroupInfoCreateBulk struct { config err error builders []*GroupInfoCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/groupinfo_delete.go b/entc/integration/ent/groupinfo_delete.go index 9be9235d12..4beaaa1dc0 100644 --- a/entc/integration/ent/groupinfo_delete.go +++ b/entc/integration/ent/groupinfo_delete.go @@ -21,7 +21,7 @@ type GroupInfoDelete struct { config hooks []Hook mutation *GroupInfoMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the GroupInfoDelete builder. diff --git a/entc/integration/ent/groupinfo_query.go b/entc/integration/ent/groupinfo_query.go index 16bc6bc9b3..534fdec199 100644 --- a/entc/integration/ent/groupinfo_query.go +++ b/entc/integration/ent/groupinfo_query.go @@ -32,7 +32,7 @@ type GroupInfoQuery struct { withGroups *GroupQuery modifiers []func(*sql.Selector) withNamedGroups map[string]*GroupQuery - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/groupinfo_update.go b/entc/integration/ent/groupinfo_update.go index d464deded5..84804c05c3 100644 --- a/entc/integration/ent/groupinfo_update.go +++ b/entc/integration/ent/groupinfo_update.go @@ -25,7 +25,7 @@ type GroupInfoUpdate struct { hooks []Hook mutation *GroupInfoMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the GroupInfoUpdate builder. @@ -216,7 +216,7 @@ func (_u *GroupInfoUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{groupinfo.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -234,7 +234,7 @@ type GroupInfoUpdateOne struct { hooks []Hook mutation *GroupInfoMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetDesc sets the "desc" field. @@ -452,7 +452,7 @@ func (_u *GroupInfoUpdateOne) sqlSave(ctx context.Context) (_node *GroupInfo, er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{groupinfo.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/item_create.go b/entc/integration/ent/item_create.go index b5a7dcd441..25fcbbab0a 100644 --- a/entc/integration/ent/item_create.go +++ b/entc/integration/ent/item_create.go @@ -23,7 +23,7 @@ type ItemCreate struct { config mutation *ItemMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -338,7 +338,7 @@ type ItemCreateBulk struct { config err error builders []*ItemCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/item_delete.go b/entc/integration/ent/item_delete.go index 2fc36cc402..0589a45b60 100644 --- a/entc/integration/ent/item_delete.go +++ b/entc/integration/ent/item_delete.go @@ -21,7 +21,7 @@ type ItemDelete struct { config hooks []Hook mutation *ItemMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the ItemDelete builder. diff --git a/entc/integration/ent/item_query.go b/entc/integration/ent/item_query.go index 55761a6193..b0f0a503b9 100644 --- a/entc/integration/ent/item_query.go +++ b/entc/integration/ent/item_query.go @@ -28,7 +28,7 @@ type ItemQuery struct { inters []Interceptor predicates []predicate.Item modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/item_update.go b/entc/integration/ent/item_update.go index 80c3fcafb0..e38cbf0762 100644 --- a/entc/integration/ent/item_update.go +++ b/entc/integration/ent/item_update.go @@ -24,7 +24,7 @@ type ItemUpdate struct { hooks []Hook mutation *ItemMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the ItemUpdate builder. @@ -129,7 +129,7 @@ func (_u *ItemUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{item.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -147,7 +147,7 @@ type ItemUpdateOne struct { hooks []Hook mutation *ItemMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetText sets the "text" field. @@ -279,7 +279,7 @@ func (_u *ItemUpdateOne) sqlSave(ctx context.Context) (_node *Item, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{item.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/license_create.go b/entc/integration/ent/license_create.go index 82a8a5f50b..dcf6b262ff 100644 --- a/entc/integration/ent/license_create.go +++ b/entc/integration/ent/license_create.go @@ -23,7 +23,7 @@ type LicenseCreate struct { config mutation *LicenseMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -330,7 +330,7 @@ type LicenseCreateBulk struct { config err error builders []*LicenseCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/license_delete.go b/entc/integration/ent/license_delete.go index deb737343e..a5eb96cf39 100644 --- a/entc/integration/ent/license_delete.go +++ b/entc/integration/ent/license_delete.go @@ -21,7 +21,7 @@ type LicenseDelete struct { config hooks []Hook mutation *LicenseMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the LicenseDelete builder. diff --git a/entc/integration/ent/license_query.go b/entc/integration/ent/license_query.go index b6488048e7..6c44d53753 100644 --- a/entc/integration/ent/license_query.go +++ b/entc/integration/ent/license_query.go @@ -28,7 +28,7 @@ type LicenseQuery struct { inters []Interceptor predicates []predicate.License modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/license_update.go b/entc/integration/ent/license_update.go index 85551abd7b..7000b4b0b9 100644 --- a/entc/integration/ent/license_update.go +++ b/entc/integration/ent/license_update.go @@ -25,7 +25,7 @@ type LicenseUpdate struct { hooks []Hook mutation *LicenseMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the LicenseUpdate builder. @@ -109,7 +109,7 @@ func (_u *LicenseUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{license.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -127,7 +127,7 @@ type LicenseUpdateOne struct { hooks []Hook mutation *LicenseMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetUpdateTime sets the "update_time" field. @@ -238,7 +238,7 @@ func (_u *LicenseUpdateOne) sqlSave(ctx context.Context) (_node *License, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{license.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/node_create.go b/entc/integration/ent/node_create.go index cd1d4f23b4..413d951bd7 100644 --- a/entc/integration/ent/node_create.go +++ b/entc/integration/ent/node_create.go @@ -23,7 +23,7 @@ type NodeCreate struct { config mutation *NodeMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -424,7 +424,7 @@ type NodeCreateBulk struct { config err error builders []*NodeCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/node_delete.go b/entc/integration/ent/node_delete.go index dee9b0ba35..d92900c1a3 100644 --- a/entc/integration/ent/node_delete.go +++ b/entc/integration/ent/node_delete.go @@ -21,7 +21,7 @@ type NodeDelete struct { config hooks []Hook mutation *NodeMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the NodeDelete builder. diff --git a/entc/integration/ent/node_query.go b/entc/integration/ent/node_query.go index c39f0b82a2..e8ef5e909a 100644 --- a/entc/integration/ent/node_query.go +++ b/entc/integration/ent/node_query.go @@ -32,7 +32,7 @@ type NodeQuery struct { withNext *NodeQuery withFKs bool modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/node_update.go b/entc/integration/ent/node_update.go index 0f22c31517..9abd19022d 100644 --- a/entc/integration/ent/node_update.go +++ b/entc/integration/ent/node_update.go @@ -25,7 +25,7 @@ type NodeUpdate struct { hooks []Hook mutation *NodeMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the NodeUpdate builder. @@ -262,7 +262,7 @@ func (_u *NodeUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{node.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -280,7 +280,7 @@ type NodeUpdateOne struct { hooks []Hook mutation *NodeMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetValue sets the "value" field. @@ -544,7 +544,7 @@ func (_u *NodeUpdateOne) sqlSave(ctx context.Context) (_node *Node, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{node.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/pc_create.go b/entc/integration/ent/pc_create.go index 6285b1e040..d79c7b453a 100644 --- a/entc/integration/ent/pc_create.go +++ b/entc/integration/ent/pc_create.go @@ -22,7 +22,7 @@ type PCCreate struct { config mutation *PCMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -219,7 +219,7 @@ type PCCreateBulk struct { config err error builders []*PCCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/pc_delete.go b/entc/integration/ent/pc_delete.go index 6b90014579..a96dee3753 100644 --- a/entc/integration/ent/pc_delete.go +++ b/entc/integration/ent/pc_delete.go @@ -21,7 +21,7 @@ type PCDelete struct { config hooks []Hook mutation *PCMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the PCDelete builder. diff --git a/entc/integration/ent/pc_query.go b/entc/integration/ent/pc_query.go index 3ab0ef4610..c5a0449843 100644 --- a/entc/integration/ent/pc_query.go +++ b/entc/integration/ent/pc_query.go @@ -28,7 +28,7 @@ type PCQuery struct { inters []Interceptor predicates []predicate.PC modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/pc_update.go b/entc/integration/ent/pc_update.go index 728a59a72d..4a28a9b895 100644 --- a/entc/integration/ent/pc_update.go +++ b/entc/integration/ent/pc_update.go @@ -24,7 +24,7 @@ type PCUpdate struct { hooks []Hook mutation *PCMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the PCUpdate builder. @@ -90,7 +90,7 @@ func (_u *PCUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pc.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -108,7 +108,7 @@ type PCUpdateOne struct { hooks []Hook mutation *PCMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Mutation returns the PCMutation object of the builder. @@ -201,7 +201,7 @@ func (_u *PCUpdateOne) sqlSave(ctx context.Context) (_node *PC, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pc.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/pet_create.go b/entc/integration/ent/pet_create.go index 208c2e4a75..802090e351 100644 --- a/entc/integration/ent/pet_create.go +++ b/entc/integration/ent/pet_create.go @@ -25,7 +25,7 @@ type PetCreate struct { config mutation *PetMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -630,7 +630,7 @@ type PetCreateBulk struct { config err error builders []*PetCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/pet_delete.go b/entc/integration/ent/pet_delete.go index 8cf51235a2..5980b6b33f 100644 --- a/entc/integration/ent/pet_delete.go +++ b/entc/integration/ent/pet_delete.go @@ -21,7 +21,7 @@ type PetDelete struct { config hooks []Hook mutation *PetMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the PetDelete builder. diff --git a/entc/integration/ent/pet_query.go b/entc/integration/ent/pet_query.go index b751e89919..079c842357 100644 --- a/entc/integration/ent/pet_query.go +++ b/entc/integration/ent/pet_query.go @@ -32,7 +32,7 @@ type PetQuery struct { withOwner *UserQuery withFKs bool modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/pet_update.go b/entc/integration/ent/pet_update.go index 86d42e92e2..2e25572f65 100644 --- a/entc/integration/ent/pet_update.go +++ b/entc/integration/ent/pet_update.go @@ -27,7 +27,7 @@ type PetUpdate struct { hooks []Hook mutation *PetMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the PetUpdate builder. @@ -340,7 +340,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -358,7 +358,7 @@ type PetUpdateOne struct { hooks []Hook mutation *PetMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetAge sets the "age" field. @@ -698,7 +698,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/spec_create.go b/entc/integration/ent/spec_create.go index 354231971f..912f417eab 100644 --- a/entc/integration/ent/spec_create.go +++ b/entc/integration/ent/spec_create.go @@ -23,7 +23,7 @@ type SpecCreate struct { config mutation *SpecMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -251,7 +251,7 @@ type SpecCreateBulk struct { config err error builders []*SpecCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/spec_delete.go b/entc/integration/ent/spec_delete.go index 4fd2627533..9d82b2738a 100644 --- a/entc/integration/ent/spec_delete.go +++ b/entc/integration/ent/spec_delete.go @@ -21,7 +21,7 @@ type SpecDelete struct { config hooks []Hook mutation *SpecMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the SpecDelete builder. diff --git a/entc/integration/ent/spec_query.go b/entc/integration/ent/spec_query.go index 50b972e1cf..e9a30d2e32 100644 --- a/entc/integration/ent/spec_query.go +++ b/entc/integration/ent/spec_query.go @@ -32,7 +32,7 @@ type SpecQuery struct { withCard *CardQuery modifiers []func(*sql.Selector) withNamedCard map[string]*CardQuery - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/spec_update.go b/entc/integration/ent/spec_update.go index d0ce335f44..4273961e5e 100644 --- a/entc/integration/ent/spec_update.go +++ b/entc/integration/ent/spec_update.go @@ -25,7 +25,7 @@ type SpecUpdate struct { hooks []Hook mutation *SpecMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the SpecUpdate builder. @@ -172,7 +172,7 @@ func (_u *SpecUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{spec.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -190,7 +190,7 @@ type SpecUpdateOne struct { hooks []Hook mutation *SpecMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // AddCardIDs adds the "card" edge to the Card entity by IDs. @@ -364,7 +364,7 @@ func (_u *SpecUpdateOne) sqlSave(ctx context.Context) (_node *Spec, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{spec.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/task_create.go b/entc/integration/ent/task_create.go index d06d1ac267..2477a0d4ff 100644 --- a/entc/integration/ent/task_create.go +++ b/entc/integration/ent/task_create.go @@ -24,7 +24,7 @@ type TaskCreate struct { config mutation *TaskMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -690,7 +690,7 @@ type TaskCreateBulk struct { config err error builders []*TaskCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/task_delete.go b/entc/integration/ent/task_delete.go index ce2900fac8..f5e4556c00 100644 --- a/entc/integration/ent/task_delete.go +++ b/entc/integration/ent/task_delete.go @@ -22,7 +22,7 @@ type TaskDelete struct { config hooks []Hook mutation *TaskMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the TaskDelete builder. diff --git a/entc/integration/ent/task_query.go b/entc/integration/ent/task_query.go index bdd6ec5540..275f112f6a 100644 --- a/entc/integration/ent/task_query.go +++ b/entc/integration/ent/task_query.go @@ -28,7 +28,7 @@ type TaskQuery struct { inters []Interceptor predicates []predicate.Task modifiers []func(*sql.Selector) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/task_update.go b/entc/integration/ent/task_update.go index 88d8a2b4e2..408311b561 100644 --- a/entc/integration/ent/task_update.go +++ b/entc/integration/ent/task_update.go @@ -25,7 +25,7 @@ type TaskUpdate struct { hooks []Hook mutation *TaskMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the TaskUpdate builder. @@ -295,7 +295,7 @@ func (_u *TaskUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{enttask.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -313,7 +313,7 @@ type TaskUpdateOne struct { hooks []Hook mutation *TaskMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetPriority sets the "priority" field. @@ -610,7 +610,7 @@ func (_u *TaskUpdateOne) sqlSave(ctx context.Context) (_node *Task, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{enttask.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/ent/user_create.go b/entc/integration/ent/user_create.go index e9dcb84db3..8daaae3572 100644 --- a/entc/integration/ent/user_create.go +++ b/entc/integration/ent/user_create.go @@ -26,7 +26,7 @@ type UserCreate struct { config mutation *UserMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } @@ -1281,7 +1281,7 @@ type UserCreateBulk struct { config err error builders []*UserCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig conflict []sql.ConflictOption } diff --git a/entc/integration/ent/user_delete.go b/entc/integration/ent/user_delete.go index f995536f25..51f59cf9f4 100644 --- a/entc/integration/ent/user_delete.go +++ b/entc/integration/ent/user_delete.go @@ -21,7 +21,7 @@ type UserDelete struct { config hooks []Hook mutation *UserMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the UserDelete builder. diff --git a/entc/integration/ent/user_query.go b/entc/integration/ent/user_query.go index 0927a941b3..5bb10ff36d 100644 --- a/entc/integration/ent/user_query.go +++ b/entc/integration/ent/user_query.go @@ -52,7 +52,7 @@ type UserQuery struct { withNamedFollowers map[string]*UserQuery withNamedFollowing map[string]*UserQuery withNamedChildren map[string]*UserQuery - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/entc/integration/ent/user_update.go b/entc/integration/ent/user_update.go index 6620c6344b..d6020c711d 100644 --- a/entc/integration/ent/user_update.go +++ b/entc/integration/ent/user_update.go @@ -28,7 +28,7 @@ type UserUpdate struct { hooks []Hook mutation *UserMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the UserUpdate builder. @@ -1197,7 +1197,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddModifiers(_u.modifiers...) _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -1215,7 +1215,7 @@ type UserUpdateOne struct { hooks []Hook mutation *UserMutation modifiers []func(*sql.UpdateBuilder) - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetOptionalInt sets the "optional_int" field. @@ -2411,7 +2411,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/go.mod b/entc/integration/go.mod index 7b1caee556..b3bb11c531 100644 --- a/entc/integration/go.mod +++ b/entc/integration/go.mod @@ -50,4 +50,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace ariga.io/atlas => github.com/LostImagin4tion/atlas v0.0.33 +replace ariga.io/atlas => github.com/LostImagin4tion/atlas v0.0.34 diff --git a/entc/integration/go.sum b/entc/integration/go.sum index 48b6a96115..680a4f10dd 100644 --- a/entc/integration/go.sum +++ b/entc/integration/go.sum @@ -5,8 +5,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/LostImagin4tion/atlas v0.0.33 h1:RgcQhGG0MZDwheuFRiZu47ihFRDhtcYmbAT6KU3J3v0= -github.com/LostImagin4tion/atlas v0.0.33/go.mod h1:FtOd0Ry45l3FeDVGVm8tf2SFWg3vHDztylE0eE3EWQ8= +github.com/LostImagin4tion/atlas v0.0.34 h1:xCEZMtvTWwbuSU0TVQTsc60sKffIJxqjh/VIvRKcN5c= +github.com/LostImagin4tion/atlas v0.0.34/go.mod h1:FtOd0Ry45l3FeDVGVm8tf2SFWg3vHDztylE0eE3EWQ8= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= diff --git a/entc/integration/hooks/ent/card_update.go b/entc/integration/hooks/ent/card_update.go index 20a7366810..1d2377e8fb 100644 --- a/entc/integration/hooks/ent/card_update.go +++ b/entc/integration/hooks/ent/card_update.go @@ -215,7 +215,7 @@ func (_u *CardUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -449,7 +449,7 @@ func (_u *CardUpdateOne) sqlSave(ctx context.Context) (_node *Card, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/hooks/ent/client.go b/entc/integration/hooks/ent/client.go index d963edd315..4b4c2dd21a 100644 --- a/entc/integration/hooks/ent/client.go +++ b/entc/integration/hooks/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/hooks/ent/card" "entgo.io/ent/entc/integration/hooks/ent/pet" "entgo.io/ent/entc/integration/hooks/ent/user" @@ -114,15 +113,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/hooks/ent/pet_update.go b/entc/integration/hooks/ent/pet_update.go index 26a02eec54..4c895a0bd1 100644 --- a/entc/integration/hooks/ent/pet_update.go +++ b/entc/integration/hooks/ent/pet_update.go @@ -181,7 +181,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -381,7 +381,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/hooks/ent/user_update.go b/entc/integration/hooks/ent/user_update.go index 2964b4129c..193cd31944 100644 --- a/entc/integration/hooks/ent/user_update.go +++ b/entc/integration/hooks/ent/user_update.go @@ -495,7 +495,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -1009,7 +1009,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/idtype/ent/client.go b/entc/integration/idtype/ent/client.go index 93a3e0181e..54927ecec6 100644 --- a/entc/integration/idtype/ent/client.go +++ b/entc/integration/idtype/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/idtype/ent/user" ) @@ -106,15 +105,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/idtype/ent/user_update.go b/entc/integration/idtype/ent/user_update.go index 1aecd20142..0ff440e743 100644 --- a/entc/integration/idtype/ent/user_update.go +++ b/entc/integration/idtype/ent/user_update.go @@ -306,7 +306,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -633,7 +633,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/integration_test.go b/entc/integration/integration_test.go index 6bdf330b34..2044e9fc03 100644 --- a/entc/integration/integration_test.go +++ b/entc/integration/integration_test.go @@ -361,7 +361,7 @@ func Upsert(t *testing.T, client *ent.Client) { err := client.User.Create().SetName("Mashraki").SetAge(30).SetPhone("0000").Exec(ctx) require.True(t, ent.IsConstraintError(err), "phone field is unique") err = client.User.Create().SetName("Mashraki").SetAge(30).SetPhone("0000").OnConflict().Exec(ctx) - require.EqualError(t, err, "ent: missing options for UserCreate.OnConflict") + require.ErrorContains(t, err, "ent: missing options for UserCreate.OnConflict") client.User.Create(). SetName("Mashraki"). @@ -1299,8 +1299,8 @@ func Relation(t *testing.T, client *ent.Client) { require.Error(err, "name validator failed") var checkerr schema.CheckError require.True(errors.As(err, &checkerr)) - require.EqualError(err, `ent: validator failed for field "Group.name": last name must begin with uppercase`) - require.EqualError(checkerr, "last name must begin with uppercase") + require.ErrorContains(err, `ent: validator failed for field "Group.name": last name must begin with uppercase`) + require.ErrorContains(checkerr, "last name must begin with uppercase") err = client.Group.Create().SetInfo(info).SetType("pass").SetName("Github20").SetExpire(time.Now().Add(time.Hour)).Exec(ctx) require.Error(err, "name validator failed") err = client.Group.Create().SetInfo(info).SetType("pass").SetName("Github").SetMaxUsers(-1).SetExpire(time.Now().Add(time.Hour)).Exec(ctx) @@ -1310,15 +1310,15 @@ func Relation(t *testing.T, client *ent.Client) { err = client.Group.UpdateOne(grp).SetMaxUsers(-10).Exec(ctx) require.Error(err, "max_users validator failed") _, err = client.Group.Query().Select("unknown_field").String(ctx) - require.EqualError(err, "ent: invalid field \"unknown_field\" for query") + require.ErrorContains(err, "ent: invalid field \"unknown_field\" for query") _, err = client.Group.Query().GroupBy("unknown_field").String(ctx) - require.EqualError(err, "ent: invalid field \"unknown_field\" for query") + require.ErrorContains(err, "ent: invalid field \"unknown_field\" for query") _, err = client.User.Query().Order(ent.Asc("invalid")).Only(ctx) - require.EqualError(err, "ent: unknown column \"invalid\" for table \"users\"") + require.ErrorContains(err, "ent: unknown column \"invalid\" for table \"users\"") _, err = client.User.Query().Order(ent.Asc("invalid")).QueryFollowing().Only(ctx) - require.EqualError(err, "ent: unknown column \"invalid\" for table \"users\"") + require.ErrorContains(err, "ent: unknown column \"invalid\" for table \"users\"") _, err = client.User.Query().GroupBy("name").Aggregate(ent.Sum("invalid")).String(ctx) - require.EqualError(err, "ent: unknown column \"invalid\" for table \"users\"") + require.ErrorContains(err, "ent: unknown column \"invalid\" for table \"users\"") t.Log("query using edge-with predicate") require.Len(usr.QueryGroups().Where(group.HasInfoWith(groupinfo.Desc("group info"))).AllX(ctx), 1) diff --git a/entc/integration/json/ent/client.go b/entc/integration/json/ent/client.go index a9e54fe3c7..2bf861dbb5 100644 --- a/entc/integration/json/ent/client.go +++ b/entc/integration/json/ent/client.go @@ -18,7 +18,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/json/ent/user" ) @@ -105,15 +104,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/json/ent/user_update.go b/entc/integration/json/ent/user_update.go index a9c6c5c68c..840aef8a1c 100644 --- a/entc/integration/json/ent/user_update.go +++ b/entc/integration/json/ent/user_update.go @@ -441,7 +441,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { } _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -898,7 +898,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv1/car_update.go b/entc/integration/migrate/entv1/car_update.go index f2f677ae90..f3c207af5c 100644 --- a/entc/integration/migrate/entv1/car_update.go +++ b/entc/integration/migrate/entv1/car_update.go @@ -128,7 +128,7 @@ func (_u *CarUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{car.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -276,7 +276,7 @@ func (_u *CarUpdateOne) sqlSave(ctx context.Context) (_node *Car, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{car.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv1/client.go b/entc/integration/migrate/entv1/client.go index 7e75175637..f8ca5ecbc1 100644 --- a/entc/integration/migrate/entv1/client.go +++ b/entc/integration/migrate/entv1/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/migrate/entv1/car" "entgo.io/ent/entc/integration/migrate/entv1/conversion" "entgo.io/ent/entc/integration/migrate/entv1/customtype" @@ -118,15 +117,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/migrate/entv1/conversion_update.go b/entc/integration/migrate/entv1/conversion_update.go index dae6d6d908..b374661d00 100644 --- a/entc/integration/migrate/entv1/conversion_update.go +++ b/entc/integration/migrate/entv1/conversion_update.go @@ -387,7 +387,7 @@ func (_u *ConversionUpdate) sqlSave(ctx context.Context) (_node int, err error) _spec.ClearField(conversion.FieldUint64ToString, field.TypeUint64) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{conversion.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -795,7 +795,7 @@ func (_u *ConversionUpdateOne) sqlSave(ctx context.Context) (_node *Conversion, _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{conversion.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv1/customtype_update.go b/entc/integration/migrate/entv1/customtype_update.go index b2440d4cca..58b17c87a9 100644 --- a/entc/integration/migrate/entv1/customtype_update.go +++ b/entc/integration/migrate/entv1/customtype_update.go @@ -99,7 +99,7 @@ func (_u *CustomTypeUpdate) sqlSave(ctx context.Context) (_node int, err error) _spec.ClearField(customtype.FieldCustom, field.TypeString) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{customtype.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -219,7 +219,7 @@ func (_u *CustomTypeUpdateOne) sqlSave(ctx context.Context) (_node *CustomType, _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{customtype.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv1/user_update.go b/entc/integration/migrate/entv1/user_update.go index 8d8ab0e41c..1663c6fd5f 100644 --- a/entc/integration/migrate/entv1/user_update.go +++ b/entc/integration/migrate/entv1/user_update.go @@ -623,7 +623,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -1266,7 +1266,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv2/blog_update.go b/entc/integration/migrate/entv2/blog_update.go index 7316741baf..41971b661f 100644 --- a/entc/integration/migrate/entv2/blog_update.go +++ b/entc/integration/migrate/entv2/blog_update.go @@ -182,7 +182,7 @@ func (_u *BlogUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{blog.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -384,7 +384,7 @@ func (_u *BlogUpdateOne) sqlSave(ctx context.Context) (_node *Blog, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{blog.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv2/car_update.go b/entc/integration/migrate/entv2/car_update.go index 8f8d659c30..95a4febce4 100644 --- a/entc/integration/migrate/entv2/car_update.go +++ b/entc/integration/migrate/entv2/car_update.go @@ -157,7 +157,7 @@ func (_u *CarUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{car.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -334,7 +334,7 @@ func (_u *CarUpdateOne) sqlSave(ctx context.Context) (_node *Car, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{car.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv2/client.go b/entc/integration/migrate/entv2/client.go index 2c1b3777c9..24e0f7b29c 100644 --- a/entc/integration/migrate/entv2/client.go +++ b/entc/integration/migrate/entv2/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/migrate/entv2/blog" "entgo.io/ent/entc/integration/migrate/entv2/car" "entgo.io/ent/entc/integration/migrate/entv2/conversion" @@ -138,15 +137,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/migrate/entv2/conversion_update.go b/entc/integration/migrate/entv2/conversion_update.go index 49386998a8..dc93925e3c 100644 --- a/entc/integration/migrate/entv2/conversion_update.go +++ b/entc/integration/migrate/entv2/conversion_update.go @@ -307,7 +307,7 @@ func (_u *ConversionUpdate) sqlSave(ctx context.Context) (_node int, err error) _spec.ClearField(conversion.FieldUint64ToString, field.TypeString) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{conversion.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -635,7 +635,7 @@ func (_u *ConversionUpdateOne) sqlSave(ctx context.Context) (_node *Conversion, _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{conversion.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv2/customtype_update.go b/entc/integration/migrate/entv2/customtype_update.go index 917529dba2..a0d90094ff 100644 --- a/entc/integration/migrate/entv2/customtype_update.go +++ b/entc/integration/migrate/entv2/customtype_update.go @@ -152,7 +152,7 @@ func (_u *CustomTypeUpdate) sqlSave(ctx context.Context) (_node int, err error) _spec.ClearField(customtype.FieldTz3, field.TypeTime) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{customtype.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -324,7 +324,7 @@ func (_u *CustomTypeUpdateOne) sqlSave(ctx context.Context) (_node *CustomType, _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{customtype.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv2/group_update.go b/entc/integration/migrate/entv2/group_update.go index 256ab44faf..3b3e0a72dc 100644 --- a/entc/integration/migrate/entv2/group_update.go +++ b/entc/integration/migrate/entv2/group_update.go @@ -73,7 +73,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { } } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -167,7 +167,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv2/media_update.go b/entc/integration/migrate/entv2/media_update.go index ed0ea4ea73..6f20c61800 100644 --- a/entc/integration/migrate/entv2/media_update.go +++ b/entc/integration/migrate/entv2/media_update.go @@ -151,7 +151,7 @@ func (_u *MediaUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.ClearField(media.FieldText, field.TypeString) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{media.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -323,7 +323,7 @@ func (_u *MediaUpdateOne) sqlSave(ctx context.Context) (_node *Media, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{media.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv2/pet_update.go b/entc/integration/migrate/entv2/pet_update.go index 40df7a4714..330b9e6cf0 100644 --- a/entc/integration/migrate/entv2/pet_update.go +++ b/entc/integration/migrate/entv2/pet_update.go @@ -154,7 +154,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -328,7 +328,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv2/user_update.go b/entc/integration/migrate/entv2/user_update.go index b5e57efb88..cbe351c7d0 100644 --- a/entc/integration/migrate/entv2/user_update.go +++ b/entc/integration/migrate/entv2/user_update.go @@ -770,7 +770,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -1557,7 +1557,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/entv2/zoo_update.go b/entc/integration/migrate/entv2/zoo_update.go index 41ae967e3c..790d2e6187 100644 --- a/entc/integration/migrate/entv2/zoo_update.go +++ b/entc/integration/migrate/entv2/zoo_update.go @@ -73,7 +73,7 @@ func (_u *ZooUpdate) sqlSave(ctx context.Context) (_node int, err error) { } } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{zoo.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -167,7 +167,7 @@ func (_u *ZooUpdateOne) sqlSave(ctx context.Context) (_node *Zoo, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{zoo.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/migrate_test.go b/entc/integration/migrate/migrate_test.go index c4c0b3b59e..7816f9ae8f 100644 --- a/entc/integration/migrate/migrate_test.go +++ b/entc/integration/migrate/migrate_test.go @@ -856,7 +856,11 @@ func fillNulls(dbdialect string) schema.ApplyHook { // There are three ways to UPDATE the NULL values to "Unknown" in this stage. // Append a custom migrate.Change to the plan, execute an SQL statement directly // on the dialect.ExecQuerier, or use the ent.Client used by the project. - drv := sql.NewDriver(dbdialect, sql.Conn{ExecQuerier: conn.(*sql.Tx)}) + drv := sql.NewDriver( + dbdialect, + sql.Conn{ExecQuerier: conn.(*sql.Tx)}, + sql.NewRetryExecutor(dbdialect, nil), + ) client := entv2.NewClient(entv2.Driver(drv)) if err := client.User. Update(). diff --git a/entc/integration/migrate/versioned/client.go b/entc/integration/migrate/versioned/client.go index d5afb29b91..5583848196 100644 --- a/entc/integration/migrate/versioned/client.go +++ b/entc/integration/migrate/versioned/client.go @@ -18,7 +18,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/migrate/versioned/group" "entgo.io/ent/entc/integration/migrate/versioned/user" ) @@ -109,15 +108,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/migrate/versioned/group_update.go b/entc/integration/migrate/versioned/group_update.go index b639195a98..fe7f83aa5a 100644 --- a/entc/integration/migrate/versioned/group_update.go +++ b/entc/integration/migrate/versioned/group_update.go @@ -90,7 +90,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(group.FieldName, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -201,7 +201,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/migrate/versioned/user_update.go b/entc/integration/migrate/versioned/user_update.go index ffb0ff85c3..58eac24b62 100644 --- a/entc/integration/migrate/versioned/user_update.go +++ b/entc/integration/migrate/versioned/user_update.go @@ -156,7 +156,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.ClearField(user.FieldAddress, field.TypeString) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -333,7 +333,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/multischema/ent/client.go b/entc/integration/multischema/ent/client.go index 8e1bcbc8ab..dc40291cbf 100644 --- a/entc/integration/multischema/ent/client.go +++ b/entc/integration/multischema/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/multischema/ent/friendship" "entgo.io/ent/entc/integration/multischema/ent/group" "entgo.io/ent/entc/integration/multischema/ent/parent" @@ -130,15 +129,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/multischema/ent/friendship_update.go b/entc/integration/multischema/ent/friendship_update.go index 66dde137ed..5692c086ce 100644 --- a/entc/integration/multischema/ent/friendship_update.go +++ b/entc/integration/multischema/ent/friendship_update.go @@ -143,7 +143,7 @@ func (_u *FriendshipUpdate) sqlSave(ctx context.Context) (_node int, err error) ctx = internal.NewSchemaConfigContext(ctx, _u.schemaConfig) _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{friendship.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -305,7 +305,7 @@ func (_u *FriendshipUpdateOne) sqlSave(ctx context.Context) (_node *Friendship, _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{friendship.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/multischema/ent/group_update.go b/entc/integration/multischema/ent/group_update.go index 88e8c5d53f..1a9e29a891 100644 --- a/entc/integration/multischema/ent/group_update.go +++ b/entc/integration/multischema/ent/group_update.go @@ -186,7 +186,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { ctx = internal.NewSchemaConfigContext(ctx, _u.schemaConfig) _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -391,7 +391,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/multischema/ent/parent_update.go b/entc/integration/multischema/ent/parent_update.go index 94ad8d241b..88c39d5a31 100644 --- a/entc/integration/multischema/ent/parent_update.go +++ b/entc/integration/multischema/ent/parent_update.go @@ -115,7 +115,7 @@ func (_u *ParentUpdate) sqlSave(ctx context.Context) (_node int, err error) { ctx = internal.NewSchemaConfigContext(ctx, _u.schemaConfig) _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{parent.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -250,7 +250,7 @@ func (_u *ParentUpdateOne) sqlSave(ctx context.Context) (_node *Parent, err erro _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{parent.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/multischema/ent/pet_update.go b/entc/integration/multischema/ent/pet_update.go index 2748bf6db3..6f66938b24 100644 --- a/entc/integration/multischema/ent/pet_update.go +++ b/entc/integration/multischema/ent/pet_update.go @@ -164,7 +164,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { ctx = internal.NewSchemaConfigContext(ctx, _u.schemaConfig) _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -347,7 +347,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/multischema/ent/user_update.go b/entc/integration/multischema/ent/user_update.go index 645d4f4006..f79e0467c4 100644 --- a/entc/integration/multischema/ent/user_update.go +++ b/entc/integration/multischema/ent/user_update.go @@ -717,7 +717,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { ctx = internal.NewSchemaConfigContext(ctx, _u.schemaConfig) _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -1450,7 +1450,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/multischema/versioned/client.go b/entc/integration/multischema/versioned/client.go index 4fc86d49ae..5c487bf289 100644 --- a/entc/integration/multischema/versioned/client.go +++ b/entc/integration/multischema/versioned/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/multischema/versioned/friendship" "entgo.io/ent/entc/integration/multischema/versioned/group" "entgo.io/ent/entc/integration/multischema/versioned/pet" @@ -123,15 +122,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/multischema/versioned/friendship_update.go b/entc/integration/multischema/versioned/friendship_update.go index e457f36f90..65088a2de2 100644 --- a/entc/integration/multischema/versioned/friendship_update.go +++ b/entc/integration/multischema/versioned/friendship_update.go @@ -143,7 +143,7 @@ func (_u *FriendshipUpdate) sqlSave(ctx context.Context) (_node int, err error) ctx = internal.NewSchemaConfigContext(ctx, _u.schemaConfig) _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{friendship.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -305,7 +305,7 @@ func (_u *FriendshipUpdateOne) sqlSave(ctx context.Context) (_node *Friendship, _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{friendship.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/multischema/versioned/group_update.go b/entc/integration/multischema/versioned/group_update.go index cabcc525c8..0e53fb3edf 100644 --- a/entc/integration/multischema/versioned/group_update.go +++ b/entc/integration/multischema/versioned/group_update.go @@ -186,7 +186,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { ctx = internal.NewSchemaConfigContext(ctx, _u.schemaConfig) _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -391,7 +391,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/multischema/versioned/pet_update.go b/entc/integration/multischema/versioned/pet_update.go index 8558b557c8..a5dc00c714 100644 --- a/entc/integration/multischema/versioned/pet_update.go +++ b/entc/integration/multischema/versioned/pet_update.go @@ -164,7 +164,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { ctx = internal.NewSchemaConfigContext(ctx, _u.schemaConfig) _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -347,7 +347,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/multischema/versioned/user_update.go b/entc/integration/multischema/versioned/user_update.go index 6f03c5080f..fae66e6e56 100644 --- a/entc/integration/multischema/versioned/user_update.go +++ b/entc/integration/multischema/versioned/user_update.go @@ -620,7 +620,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { ctx = internal.NewSchemaConfigContext(ctx, _u.schemaConfig) _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -1257,7 +1257,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/privacy/ent/client.go b/entc/integration/privacy/ent/client.go index cac43ddb40..1b04e73291 100644 --- a/entc/integration/privacy/ent/client.go +++ b/entc/integration/privacy/ent/client.go @@ -21,7 +21,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/privacy/ent/task" "entgo.io/ent/entc/integration/privacy/ent/team" "entgo.io/ent/entc/integration/privacy/ent/user" @@ -124,15 +123,7 @@ func HTTPClient(v *http.Client) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/privacy/ent/task_update.go b/entc/integration/privacy/ent/task_update.go index 1b4d68bbec..da1538b263 100644 --- a/entc/integration/privacy/ent/task_update.go +++ b/entc/integration/privacy/ent/task_update.go @@ -315,7 +315,7 @@ func (_u *TaskUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{task.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -648,7 +648,7 @@ func (_u *TaskUpdateOne) sqlSave(ctx context.Context) (_node *Task, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{task.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/privacy/ent/team_update.go b/entc/integration/privacy/ent/team_update.go index 14ec9bc5f0..27e0f4d31e 100644 --- a/entc/integration/privacy/ent/team_update.go +++ b/entc/integration/privacy/ent/team_update.go @@ -267,7 +267,7 @@ func (_u *TeamUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{team.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -553,7 +553,7 @@ func (_u *TeamUpdateOne) sqlSave(ctx context.Context) (_node *Team, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{team.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/privacy/ent/user_update.go b/entc/integration/privacy/ent/user_update.go index 39dcf6f7a9..9077f2b0ec 100644 --- a/entc/integration/privacy/ent/user_update.go +++ b/entc/integration/privacy/ent/user_update.go @@ -273,7 +273,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -565,7 +565,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/template/ent/client.go b/entc/integration/template/ent/client.go index 306c44f2cd..53b649d131 100644 --- a/entc/integration/template/ent/client.go +++ b/entc/integration/template/ent/client.go @@ -20,7 +20,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/entc/integration/template/ent/group" "entgo.io/ent/entc/integration/template/ent/pet" "entgo.io/ent/entc/integration/template/ent/user" @@ -128,15 +127,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/entc/integration/template/ent/group_update.go b/entc/integration/template/ent/group_update.go index d6c4a378d9..171d46aeda 100644 --- a/entc/integration/template/ent/group_update.go +++ b/entc/integration/template/ent/group_update.go @@ -100,7 +100,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddField(group.FieldMaxUsers, field.TypeInt, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -221,7 +221,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/template/ent/pet_update.go b/entc/integration/template/ent/pet_update.go index e6ce0b1534..99b4f4ebca 100644 --- a/entc/integration/template/ent/pet_update.go +++ b/entc/integration/template/ent/pet_update.go @@ -182,7 +182,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -383,7 +383,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/entc/integration/template/ent/user_update.go b/entc/integration/template/ent/user_update.go index 2568ab7fc4..41785f204b 100644 --- a/entc/integration/template/ent/user_update.go +++ b/entc/integration/template/ent/user_update.go @@ -253,7 +253,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -526,7 +526,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/compositetypes/ent/client.go b/examples/compositetypes/ent/client.go index 6efaac3f20..111ea08388 100644 --- a/examples/compositetypes/ent/client.go +++ b/examples/compositetypes/ent/client.go @@ -14,7 +14,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/compositetypes/ent/user" ) @@ -101,15 +100,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/compositetypes/ent/user_update.go b/examples/compositetypes/ent/user_update.go index 94ae237943..c912340f5a 100644 --- a/examples/compositetypes/ent/user_update.go +++ b/examples/compositetypes/ent/user_update.go @@ -79,7 +79,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldAddress, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -182,7 +182,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/domaintypes/ent/client.go b/examples/domaintypes/ent/client.go index 5f9a38bb02..2cdd5ab688 100644 --- a/examples/domaintypes/ent/client.go +++ b/examples/domaintypes/ent/client.go @@ -14,7 +14,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/domaintypes/ent/user" ) @@ -101,15 +100,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/domaintypes/ent/user_update.go b/examples/domaintypes/ent/user_update.go index 0d5c45d56b..54dd7440c3 100644 --- a/examples/domaintypes/ent/user_update.go +++ b/examples/domaintypes/ent/user_update.go @@ -86,7 +86,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldPostalCode, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -197,7 +197,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/edgeindex/ent/city_update.go b/examples/edgeindex/ent/city_update.go index 8c699557a0..3312f09b2b 100644 --- a/examples/edgeindex/ent/city_update.go +++ b/examples/edgeindex/ent/city_update.go @@ -172,7 +172,7 @@ func (_u *CityUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{city.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -364,7 +364,7 @@ func (_u *CityUpdateOne) sqlSave(ctx context.Context) (_node *City, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{city.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/edgeindex/ent/client.go b/examples/edgeindex/ent/client.go index 14decdaa89..e29d298e53 100644 --- a/examples/edgeindex/ent/client.go +++ b/examples/edgeindex/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/edgeindex/ent/city" "entgo.io/ent/examples/edgeindex/ent/street" ) @@ -110,15 +109,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/edgeindex/ent/street_update.go b/examples/edgeindex/ent/street_update.go index a873b6a451..0ffeda9aae 100644 --- a/examples/edgeindex/ent/street_update.go +++ b/examples/edgeindex/ent/street_update.go @@ -145,7 +145,7 @@ func (_u *StreetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{street.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -310,7 +310,7 @@ func (_u *StreetUpdateOne) sqlSave(ctx context.Context) (_node *Street, err erro _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{street.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/encryptfield/ent/client.go b/examples/encryptfield/ent/client.go index 858ec80a64..d6b576a4a4 100644 --- a/examples/encryptfield/ent/client.go +++ b/examples/encryptfield/ent/client.go @@ -18,7 +18,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/encryptfield/ent/user" "gocloud.dev/secrets" ) @@ -114,15 +113,7 @@ func SecretsKeeper(v *secrets.Keeper) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/encryptfield/ent/user_update.go b/examples/encryptfield/ent/user_update.go index feb05ea113..b14269ec6a 100644 --- a/examples/encryptfield/ent/user_update.go +++ b/examples/encryptfield/ent/user_update.go @@ -116,7 +116,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldNickname, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -253,7 +253,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/entcpkg/ent/client.go b/examples/entcpkg/ent/client.go index 166e4a68e8..b7b79e5e99 100644 --- a/examples/entcpkg/ent/client.go +++ b/examples/entcpkg/ent/client.go @@ -21,7 +21,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/entcpkg/ent/user" ) @@ -124,15 +123,7 @@ func Writer(v io.Writer) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/entcpkg/ent/user_update.go b/examples/entcpkg/ent/user_update.go index b261f4dad6..b3431f8d3c 100644 --- a/examples/entcpkg/ent/user_update.go +++ b/examples/entcpkg/ent/user_update.go @@ -135,7 +135,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.ClearField(user.FieldAge, field.TypeInt) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -291,7 +291,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/enumtypes/ent/client.go b/examples/enumtypes/ent/client.go index ffdd2ec8c0..49481310f8 100644 --- a/examples/enumtypes/ent/client.go +++ b/examples/enumtypes/ent/client.go @@ -14,7 +14,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/enumtypes/ent/user" ) @@ -101,15 +100,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/enumtypes/ent/user_update.go b/examples/enumtypes/ent/user_update.go index ceea7339a1..f27d6958f7 100644 --- a/examples/enumtypes/ent/user_update.go +++ b/examples/enumtypes/ent/user_update.go @@ -99,7 +99,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldStatus, field.TypeEnum, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -223,7 +223,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/extensions/ent/client.go b/examples/extensions/ent/client.go index 698414bc64..7779fa3a25 100644 --- a/examples/extensions/ent/client.go +++ b/examples/extensions/ent/client.go @@ -14,7 +14,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/extensions/ent/user" ) @@ -101,15 +100,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/extensions/ent/user_update.go b/examples/extensions/ent/user_update.go index 8bf932553b..7590d70ad4 100644 --- a/examples/extensions/ent/user_update.go +++ b/examples/extensions/ent/user_update.go @@ -78,7 +78,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldLocation, field.TypeBytes, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -181,7 +181,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/fs/ent/client.go b/examples/fs/ent/client.go index 9dd4076549..e4e3ccc00a 100644 --- a/examples/fs/ent/client.go +++ b/examples/fs/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/fs/ent/file" ) @@ -106,15 +105,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/fs/ent/file_update.go b/examples/fs/ent/file_update.go index 93f62564ff..9b5fd09b92 100644 --- a/examples/fs/ent/file_update.go +++ b/examples/fs/ent/file_update.go @@ -248,7 +248,7 @@ func (_u *FileUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{file.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -517,7 +517,7 @@ func (_u *FileUpdateOne) sqlSave(ctx context.Context) (_node *File, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{file.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/functionalidx/ent/client.go b/examples/functionalidx/ent/client.go index a09fe0c34b..4252d58b29 100644 --- a/examples/functionalidx/ent/client.go +++ b/examples/functionalidx/ent/client.go @@ -14,7 +14,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/functionalidx/ent/user" ) @@ -101,15 +100,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/functionalidx/ent/user_update.go b/examples/functionalidx/ent/user_update.go index 98c80838b0..4a8bfdaec7 100644 --- a/examples/functionalidx/ent/user_update.go +++ b/examples/functionalidx/ent/user_update.go @@ -86,7 +86,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldName, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -197,7 +197,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/go.mod b/examples/go.mod index 13d183ff1c..56ecf157a6 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -50,4 +50,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace ariga.io/atlas => github.com/LostImagin4tion/atlas v0.0.33 +replace ariga.io/atlas => github.com/LostImagin4tion/atlas v0.0.34 diff --git a/examples/go.sum b/examples/go.sum index e84eec833f..355d0d85e7 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -449,8 +449,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.1/go.mod h1:n3KDPrdaY2p9Nr0B1allAdjYArwIpXQcitNbsS/Qiok= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/LostImagin4tion/atlas v0.0.33 h1:RgcQhGG0MZDwheuFRiZu47ihFRDhtcYmbAT6KU3J3v0= -github.com/LostImagin4tion/atlas v0.0.33/go.mod h1:FtOd0Ry45l3FeDVGVm8tf2SFWg3vHDztylE0eE3EWQ8= +github.com/LostImagin4tion/atlas v0.0.34 h1:xCEZMtvTWwbuSU0TVQTsc60sKffIJxqjh/VIvRKcN5c= +github.com/LostImagin4tion/atlas v0.0.34/go.mod h1:FtOd0Ry45l3FeDVGVm8tf2SFWg3vHDztylE0eE3EWQ8= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= diff --git a/examples/jsonencode/ent/card_update.go b/examples/jsonencode/ent/card_update.go index 8bf90f7a58..10e9beae09 100644 --- a/examples/jsonencode/ent/card_update.go +++ b/examples/jsonencode/ent/card_update.go @@ -90,7 +90,7 @@ func (_u *CardUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(card.FieldNumber, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -201,7 +201,7 @@ func (_u *CardUpdateOne) sqlSave(ctx context.Context) (_node *Card, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/jsonencode/ent/client.go b/examples/jsonencode/ent/client.go index 2414de9cf1..22d485921d 100644 --- a/examples/jsonencode/ent/client.go +++ b/examples/jsonencode/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/jsonencode/ent/card" "entgo.io/ent/examples/jsonencode/ent/pet" "entgo.io/ent/examples/jsonencode/ent/user" @@ -114,15 +113,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/jsonencode/ent/pet_update.go b/examples/jsonencode/ent/pet_update.go index eae40a1039..9a382820b5 100644 --- a/examples/jsonencode/ent/pet_update.go +++ b/examples/jsonencode/ent/pet_update.go @@ -183,7 +183,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -386,7 +386,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/jsonencode/ent/user_update.go b/examples/jsonencode/ent/user_update.go index fd527dc2b1..55b27fdebd 100644 --- a/examples/jsonencode/ent/user_update.go +++ b/examples/jsonencode/ent/user_update.go @@ -199,7 +199,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -418,7 +418,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/m2m2types/ent/client.go b/examples/m2m2types/ent/client.go index 6622a651ee..006739841f 100644 --- a/examples/m2m2types/ent/client.go +++ b/examples/m2m2types/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/m2m2types/ent/group" "entgo.io/ent/examples/m2m2types/ent/user" ) @@ -110,15 +109,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/m2m2types/ent/group_update.go b/examples/m2m2types/ent/group_update.go index 36b5fffafc..ebf7f7560e 100644 --- a/examples/m2m2types/ent/group_update.go +++ b/examples/m2m2types/ent/group_update.go @@ -172,7 +172,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -364,7 +364,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/m2m2types/ent/user_update.go b/examples/m2m2types/ent/user_update.go index 3c64135966..f438a108a4 100644 --- a/examples/m2m2types/ent/user_update.go +++ b/examples/m2m2types/ent/user_update.go @@ -199,7 +199,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -418,7 +418,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/m2mbidi/ent/client.go b/examples/m2mbidi/ent/client.go index 844fa092af..33bd37734d 100644 --- a/examples/m2mbidi/ent/client.go +++ b/examples/m2mbidi/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/m2mbidi/ent/user" ) @@ -106,15 +105,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/m2mbidi/ent/user_update.go b/examples/m2mbidi/ent/user_update.go index e4ed61b23f..ecb52cf9bd 100644 --- a/examples/m2mbidi/ent/user_update.go +++ b/examples/m2mbidi/ent/user_update.go @@ -198,7 +198,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -417,7 +417,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/m2mrecur/ent/client.go b/examples/m2mrecur/ent/client.go index a091524684..cfe203599c 100644 --- a/examples/m2mrecur/ent/client.go +++ b/examples/m2mrecur/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/m2mrecur/ent/user" ) @@ -106,15 +105,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/m2mrecur/ent/user_update.go b/examples/m2mrecur/ent/user_update.go index 16b2e8b7d5..e459d45ee1 100644 --- a/examples/m2mrecur/ent/user_update.go +++ b/examples/m2mrecur/ent/user_update.go @@ -279,7 +279,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -579,7 +579,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/migration/ent/card_update.go b/examples/migration/ent/card_update.go index 56b6590815..1e1c0b3126 100644 --- a/examples/migration/ent/card_update.go +++ b/examples/migration/ent/card_update.go @@ -299,7 +299,7 @@ func (_u *CardUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -616,7 +616,7 @@ func (_u *CardUpdateOne) sqlSave(ctx context.Context) (_node *Card, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/migration/ent/client.go b/examples/migration/ent/client.go index 4e9a791272..1c9e618d05 100644 --- a/examples/migration/ent/client.go +++ b/examples/migration/ent/client.go @@ -20,7 +20,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/migration/ent/card" "entgo.io/ent/examples/migration/ent/payment" "entgo.io/ent/examples/migration/ent/pet" @@ -127,15 +126,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/migration/ent/payment_update.go b/examples/migration/ent/payment_update.go index 2a317186ae..b7790634bd 100644 --- a/examples/migration/ent/payment_update.go +++ b/examples/migration/ent/payment_update.go @@ -250,7 +250,7 @@ func (_u *PaymentUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{payment.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -519,7 +519,7 @@ func (_u *PaymentUpdateOne) sqlSave(ctx context.Context) (_node *Payment, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{payment.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/migration/ent/pet_update.go b/examples/migration/ent/pet_update.go index 3d47cb2cab..68826c8c76 100644 --- a/examples/migration/ent/pet_update.go +++ b/examples/migration/ent/pet_update.go @@ -268,7 +268,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -555,7 +555,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/migration/ent/session_update.go b/examples/migration/ent/session_update.go index dc0387bc66..9107139bc3 100644 --- a/examples/migration/ent/session_update.go +++ b/examples/migration/ent/session_update.go @@ -240,7 +240,7 @@ func (_u *SessionUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{session.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -498,7 +498,7 @@ func (_u *SessionUpdateOne) sqlSave(ctx context.Context) (_node *Session, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{session.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/migration/ent/sessiondevice_update.go b/examples/migration/ent/sessiondevice_update.go index 6402849898..10cb43d66c 100644 --- a/examples/migration/ent/sessiondevice_update.go +++ b/examples/migration/ent/sessiondevice_update.go @@ -274,7 +274,7 @@ func (_u *SessionDeviceUpdate) sqlSave(ctx context.Context) (_node int, err erro _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{sessiondevice.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -566,7 +566,7 @@ func (_u *SessionDeviceUpdateOne) sqlSave(ctx context.Context) (_node *SessionDe _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{sessiondevice.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/migration/ent/user_update.go b/examples/migration/ent/user_update.go index bda5dc1b95..b1d57b99e2 100644 --- a/examples/migration/ent/user_update.go +++ b/examples/migration/ent/user_update.go @@ -246,7 +246,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -511,7 +511,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/o2m2types/ent/client.go b/examples/o2m2types/ent/client.go index ba285138f6..b40c9d15af 100644 --- a/examples/o2m2types/ent/client.go +++ b/examples/o2m2types/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/o2m2types/ent/pet" "entgo.io/ent/examples/o2m2types/ent/user" ) @@ -110,15 +109,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/o2m2types/ent/pet_update.go b/examples/o2m2types/ent/pet_update.go index a484ea730b..c7a7268749 100644 --- a/examples/o2m2types/ent/pet_update.go +++ b/examples/o2m2types/ent/pet_update.go @@ -145,7 +145,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -310,7 +310,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/o2m2types/ent/user_update.go b/examples/o2m2types/ent/user_update.go index 408e640503..10f36051e2 100644 --- a/examples/o2m2types/ent/user_update.go +++ b/examples/o2m2types/ent/user_update.go @@ -199,7 +199,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -418,7 +418,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/o2mrecur/ent/client.go b/examples/o2mrecur/ent/client.go index 61e5ee76b8..d9af9f9fe0 100644 --- a/examples/o2mrecur/ent/client.go +++ b/examples/o2mrecur/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/o2mrecur/ent/node" ) @@ -106,15 +105,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/o2mrecur/ent/node_update.go b/examples/o2mrecur/ent/node_update.go index 7813961463..8ae3520f69 100644 --- a/examples/o2mrecur/ent/node_update.go +++ b/examples/o2mrecur/ent/node_update.go @@ -241,7 +241,7 @@ func (_u *NodeUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{node.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -503,7 +503,7 @@ func (_u *NodeUpdateOne) sqlSave(ctx context.Context) (_node *Node, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{node.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/o2o2types/ent/card_update.go b/examples/o2o2types/ent/card_update.go index d216f6d845..ac75d00515 100644 --- a/examples/o2o2types/ent/card_update.go +++ b/examples/o2o2types/ent/card_update.go @@ -166,7 +166,7 @@ func (_u *CardUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -351,7 +351,7 @@ func (_u *CardUpdateOne) sqlSave(ctx context.Context) (_node *Card, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{card.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/o2o2types/ent/client.go b/examples/o2o2types/ent/client.go index 1a229c421f..47eeb4ff79 100644 --- a/examples/o2o2types/ent/client.go +++ b/examples/o2o2types/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/o2o2types/ent/card" "entgo.io/ent/examples/o2o2types/ent/user" ) @@ -110,15 +109,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/o2o2types/ent/user_update.go b/examples/o2o2types/ent/user_update.go index 8a5a8920c0..e76a716526 100644 --- a/examples/o2o2types/ent/user_update.go +++ b/examples/o2o2types/ent/user_update.go @@ -172,7 +172,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -364,7 +364,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/o2obidi/ent/client.go b/examples/o2obidi/ent/client.go index 6481b24719..7bf54a7b49 100644 --- a/examples/o2obidi/ent/client.go +++ b/examples/o2obidi/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/o2obidi/ent/user" ) @@ -106,15 +105,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/o2obidi/ent/user_update.go b/examples/o2obidi/ent/user_update.go index 3657ededa7..c0962e0d75 100644 --- a/examples/o2obidi/ent/user_update.go +++ b/examples/o2obidi/ent/user_update.go @@ -171,7 +171,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -363,7 +363,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/o2orecur/ent/client.go b/examples/o2orecur/ent/client.go index e3bfd1e0a0..d59c8fb164 100644 --- a/examples/o2orecur/ent/client.go +++ b/examples/o2orecur/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/o2orecur/ent/node" ) @@ -106,15 +105,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/o2orecur/ent/node_update.go b/examples/o2orecur/ent/node_update.go index db6e813034..cc0133510b 100644 --- a/examples/o2orecur/ent/node_update.go +++ b/examples/o2orecur/ent/node_update.go @@ -214,7 +214,7 @@ func (_u *NodeUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{node.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -449,7 +449,7 @@ func (_u *NodeUpdateOne) sqlSave(ctx context.Context) (_node *Node, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{node.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/privacyadmin/ent/client.go b/examples/privacyadmin/ent/client.go index ddf6e09ea9..56563164ba 100644 --- a/examples/privacyadmin/ent/client.go +++ b/examples/privacyadmin/ent/client.go @@ -18,7 +18,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/privacyadmin/ent/user" ) @@ -105,15 +104,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/privacyadmin/ent/user_update.go b/examples/privacyadmin/ent/user_update.go index 526e1fd08c..ccf51929e1 100644 --- a/examples/privacyadmin/ent/user_update.go +++ b/examples/privacyadmin/ent/user_update.go @@ -90,7 +90,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldName, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -201,7 +201,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/privacytenant/ent/client.go b/examples/privacytenant/ent/client.go index 3049f613d8..7cfa81c1e6 100644 --- a/examples/privacytenant/ent/client.go +++ b/examples/privacytenant/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/privacytenant/ent/group" "entgo.io/ent/examples/privacytenant/ent/tenant" "entgo.io/ent/examples/privacytenant/ent/user" @@ -114,15 +113,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/privacytenant/ent/group_update.go b/examples/privacytenant/ent/group_update.go index b4ffba47d1..d02fc9eb11 100644 --- a/examples/privacytenant/ent/group_update.go +++ b/examples/privacytenant/ent/group_update.go @@ -183,7 +183,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -386,7 +386,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/privacytenant/ent/tenant_update.go b/examples/privacytenant/ent/tenant_update.go index e46a1cd759..a33d88454d 100644 --- a/examples/privacytenant/ent/tenant_update.go +++ b/examples/privacytenant/ent/tenant_update.go @@ -103,7 +103,7 @@ func (_u *TenantUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(tenant.FieldName, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tenant.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -227,7 +227,7 @@ func (_u *TenantUpdateOne) sqlSave(ctx context.Context) (_node *Tenant, err erro _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tenant.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/privacytenant/ent/user_update.go b/examples/privacytenant/ent/user_update.go index d489b9798d..453e2e1b21 100644 --- a/examples/privacytenant/ent/user_update.go +++ b/examples/privacytenant/ent/user_update.go @@ -213,7 +213,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -445,7 +445,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/rls/ent/client.go b/examples/rls/ent/client.go index 844735ece7..9b9f04b01d 100644 --- a/examples/rls/ent/client.go +++ b/examples/rls/ent/client.go @@ -14,7 +14,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/rls/ent/tenant" "entgo.io/ent/examples/rls/ent/user" ) @@ -105,15 +104,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/rls/ent/tenant_update.go b/examples/rls/ent/tenant_update.go index ffd43c936b..1fd12dafce 100644 --- a/examples/rls/ent/tenant_update.go +++ b/examples/rls/ent/tenant_update.go @@ -86,7 +86,7 @@ func (_u *TenantUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(tenant.FieldName, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tenant.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -197,7 +197,7 @@ func (_u *TenantUpdateOne) sqlSave(ctx context.Context) (_node *Tenant, err erro _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{tenant.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/rls/ent/user_update.go b/examples/rls/ent/user_update.go index febb12153f..1be46f91b1 100644 --- a/examples/rls/ent/user_update.go +++ b/examples/rls/ent/user_update.go @@ -113,7 +113,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.AddField(user.FieldTenantID, field.TypeInt, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -251,7 +251,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/start/ent/car_update.go b/examples/start/ent/car_update.go index cff4720038..81160059ca 100644 --- a/examples/start/ent/car_update.go +++ b/examples/start/ent/car_update.go @@ -163,7 +163,7 @@ func (_u *CarUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{car.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -345,7 +345,7 @@ func (_u *CarUpdateOne) sqlSave(ctx context.Context) (_node *Car, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{car.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/start/ent/client.go b/examples/start/ent/client.go index 07c0d8ded0..87fe18a838 100644 --- a/examples/start/ent/client.go +++ b/examples/start/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/start/ent/car" "entgo.io/ent/examples/start/ent/group" "entgo.io/ent/examples/start/ent/user" @@ -114,15 +113,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/start/ent/group_update.go b/examples/start/ent/group_update.go index 6c7ac2484e..8172853be3 100644 --- a/examples/start/ent/group_update.go +++ b/examples/start/ent/group_update.go @@ -185,7 +185,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -390,7 +390,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/start/ent/user_update.go b/examples/start/ent/user_update.go index 62bc3fa48a..22fdbd3673 100644 --- a/examples/start/ent/user_update.go +++ b/examples/start/ent/user_update.go @@ -294,7 +294,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -607,7 +607,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/traversal/ent/client.go b/examples/traversal/ent/client.go index 61d53840eb..8cdf6e4df4 100644 --- a/examples/traversal/ent/client.go +++ b/examples/traversal/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/traversal/ent/group" "entgo.io/ent/examples/traversal/ent/pet" "entgo.io/ent/examples/traversal/ent/user" @@ -114,15 +113,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/traversal/ent/group_update.go b/examples/traversal/ent/group_update.go index f3f03010c2..79b7d56527 100644 --- a/examples/traversal/ent/group_update.go +++ b/examples/traversal/ent/group_update.go @@ -226,7 +226,7 @@ func (_u *GroupUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -472,7 +472,7 @@ func (_u *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error) _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{group.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/traversal/ent/pet_update.go b/examples/traversal/ent/pet_update.go index 887c4616ed..0bb15d2fa1 100644 --- a/examples/traversal/ent/pet_update.go +++ b/examples/traversal/ent/pet_update.go @@ -226,7 +226,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -472,7 +472,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/traversal/ent/user_update.go b/examples/traversal/ent/user_update.go index 918a18c783..6a52c2e60b 100644 --- a/examples/traversal/ent/user_update.go +++ b/examples/traversal/ent/user_update.go @@ -443,7 +443,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.Edges.Add = append(_spec.Edges.Add, edge) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -905,7 +905,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/triggers/ent/client.go b/examples/triggers/ent/client.go index 441a83a35a..d746d4c277 100644 --- a/examples/triggers/ent/client.go +++ b/examples/triggers/ent/client.go @@ -14,7 +14,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/triggers/ent/user" "entgo.io/ent/examples/triggers/ent/userauditlog" ) @@ -105,15 +104,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/triggers/ent/user_update.go b/examples/triggers/ent/user_update.go index b52b5c1cf7..2e60ec9618 100644 --- a/examples/triggers/ent/user_update.go +++ b/examples/triggers/ent/user_update.go @@ -86,7 +86,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldName, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -197,7 +197,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/triggers/ent/userauditlog_update.go b/examples/triggers/ent/userauditlog_update.go index 87c1e8a233..2a50a3b97e 100644 --- a/examples/triggers/ent/userauditlog_update.go +++ b/examples/triggers/ent/userauditlog_update.go @@ -155,7 +155,7 @@ func (_u *UserAuditLogUpdate) sqlSave(ctx context.Context) (_node int, err error _spec.ClearField(userauditlog.FieldNewValue, field.TypeString) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{userauditlog.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -335,7 +335,7 @@ func (_u *UserAuditLogUpdateOne) sqlSave(ctx context.Context) (_node *UserAuditL _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{userauditlog.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/version/ent/client.go b/examples/version/ent/client.go index 09d70f04f1..36254a4059 100644 --- a/examples/version/ent/client.go +++ b/examples/version/ent/client.go @@ -18,7 +18,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/version/ent/user" ) @@ -105,15 +104,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/version/ent/user_update.go b/examples/version/ent/user_update.go index 7d2e021e88..1c639856ff 100644 --- a/examples/version/ent/user_update.go +++ b/examples/version/ent/user_update.go @@ -130,7 +130,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldStatus, field.TypeEnum, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -281,7 +281,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/viewcomposite/ent/client.go b/examples/viewcomposite/ent/client.go index ff92994b59..6506dc312c 100644 --- a/examples/viewcomposite/ent/client.go +++ b/examples/viewcomposite/ent/client.go @@ -14,7 +14,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/viewcomposite/ent/pet" "entgo.io/ent/examples/viewcomposite/ent/user" ) @@ -111,15 +110,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/viewcomposite/ent/pet_update.go b/examples/viewcomposite/ent/pet_update.go index c183e086a1..e2206af2c9 100644 --- a/examples/viewcomposite/ent/pet_update.go +++ b/examples/viewcomposite/ent/pet_update.go @@ -86,7 +86,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(pet.FieldName, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -197,7 +197,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/viewcomposite/ent/user_update.go b/examples/viewcomposite/ent/user_update.go index 7dfa709faa..edfa9a7bf8 100644 --- a/examples/viewcomposite/ent/user_update.go +++ b/examples/viewcomposite/ent/user_update.go @@ -120,7 +120,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldPrivateInfo, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -265,7 +265,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/viewschema/ent/client.go b/examples/viewschema/ent/client.go index e0f2bde1d8..4f90deb307 100644 --- a/examples/viewschema/ent/client.go +++ b/examples/viewschema/ent/client.go @@ -14,7 +14,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/viewschema/ent/pet" "entgo.io/ent/examples/viewschema/ent/user" ) @@ -111,15 +110,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/viewschema/ent/pet_update.go b/examples/viewschema/ent/pet_update.go index 804ca24d9e..10b318abf9 100644 --- a/examples/viewschema/ent/pet_update.go +++ b/examples/viewschema/ent/pet_update.go @@ -86,7 +86,7 @@ func (_u *PetUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(pet.FieldName, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -197,7 +197,7 @@ func (_u *PetUpdateOne) sqlSave(ctx context.Context) (_node *Pet, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{pet.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/viewschema/ent/user_update.go b/examples/viewschema/ent/user_update.go index 350c21b3f3..309f92cf5c 100644 --- a/examples/viewschema/ent/user_update.go +++ b/examples/viewschema/ent/user_update.go @@ -120,7 +120,7 @@ func (_u *UserUpdate) sqlSave(ctx context.Context) (_node int, err error) { _spec.SetField(user.FieldPrivateInfo, field.TypeString, value) } if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -265,7 +265,7 @@ func (_u *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error) { _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{user.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/ydb/ent/client.go b/examples/ydb/ent/client.go index d378e901b7..a261dc8fb0 100644 --- a/examples/ydb/ent/client.go +++ b/examples/ydb/ent/client.go @@ -19,7 +19,6 @@ import ( "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "entgo.io/ent/dialect/ydb" "entgo.io/ent/examples/ydb/ent/episode" "entgo.io/ent/examples/ydb/ent/season" "entgo.io/ent/examples/ydb/ent/series" @@ -114,15 +113,7 @@ func Driver(driver dialect.Driver) Option { func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { switch driverName { case dialect.MySQL, dialect.Postgres, dialect.SQLite, dialect.YDB: - var ( - drv dialect.Driver - err error - ) - if driverName == dialect.YDB { - drv, err = ydb.Open(context.Background(), dataSourceName) - } else { - drv, err = sql.Open(driverName, dataSourceName) - } + drv, err := sql.Open(driverName, dataSourceName) if err != nil { return nil, err } diff --git a/examples/ydb/ent/episode_create.go b/examples/ydb/ent/episode_create.go index 0cb9c190c2..8f2f4b2e7a 100644 --- a/examples/ydb/ent/episode_create.go +++ b/examples/ydb/ent/episode_create.go @@ -12,6 +12,7 @@ import ( "fmt" "time" + "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/ydb/ent/episode" "entgo.io/ent/examples/ydb/ent/season" @@ -23,7 +24,7 @@ type EpisodeCreate struct { config mutation *EpisodeMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetSeasonID sets the "season_id" field. @@ -179,7 +180,7 @@ type EpisodeCreateBulk struct { config err error builders []*EpisodeCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Save creates the Episode entities in the database. diff --git a/examples/ydb/ent/episode_delete.go b/examples/ydb/ent/episode_delete.go index 2720770e34..240aac844f 100644 --- a/examples/ydb/ent/episode_delete.go +++ b/examples/ydb/ent/episode_delete.go @@ -21,7 +21,7 @@ type EpisodeDelete struct { config hooks []Hook mutation *EpisodeMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the EpisodeDelete builder. diff --git a/examples/ydb/ent/episode_query.go b/examples/ydb/ent/episode_query.go index 7c7a3d5830..162f0abf45 100644 --- a/examples/ydb/ent/episode_query.go +++ b/examples/ydb/ent/episode_query.go @@ -28,7 +28,7 @@ type EpisodeQuery struct { inters []Interceptor predicates []predicate.Episode withSeason *SeasonQuery - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/examples/ydb/ent/episode_update.go b/examples/ydb/ent/episode_update.go index 16cd9f1359..0b844a353a 100644 --- a/examples/ydb/ent/episode_update.go +++ b/examples/ydb/ent/episode_update.go @@ -25,7 +25,7 @@ type EpisodeUpdate struct { config hooks []Hook mutation *EpisodeMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the EpisodeUpdate builder. @@ -188,7 +188,7 @@ func (_u *EpisodeUpdate) sqlSave(ctx context.Context) (_node int, err error) { } _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{episode.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -205,7 +205,7 @@ type EpisodeUpdateOne struct { fields []string hooks []Hook mutation *EpisodeMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetSeasonID sets the "season_id" field. @@ -395,7 +395,7 @@ func (_u *EpisodeUpdateOne) sqlSave(ctx context.Context) (_node *Episode, err er _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{episode.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/ydb/ent/season_create.go b/examples/ydb/ent/season_create.go index bb49606788..07270e036f 100644 --- a/examples/ydb/ent/season_create.go +++ b/examples/ydb/ent/season_create.go @@ -12,6 +12,7 @@ import ( "fmt" "time" + "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/ydb/ent/episode" "entgo.io/ent/examples/ydb/ent/season" @@ -24,7 +25,7 @@ type SeasonCreate struct { config mutation *SeasonMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetSeriesID sets the "series_id" field. @@ -224,7 +225,7 @@ type SeasonCreateBulk struct { config err error builders []*SeasonCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Save creates the Season entities in the database. diff --git a/examples/ydb/ent/season_delete.go b/examples/ydb/ent/season_delete.go index 89a1d5ee9c..8817be5b13 100644 --- a/examples/ydb/ent/season_delete.go +++ b/examples/ydb/ent/season_delete.go @@ -21,7 +21,7 @@ type SeasonDelete struct { config hooks []Hook mutation *SeasonMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the SeasonDelete builder. diff --git a/examples/ydb/ent/season_query.go b/examples/ydb/ent/season_query.go index 34a45ed74b..67900aa04b 100644 --- a/examples/ydb/ent/season_query.go +++ b/examples/ydb/ent/season_query.go @@ -31,7 +31,7 @@ type SeasonQuery struct { predicates []predicate.Season withSeries *SeriesQuery withEpisodes *EpisodeQuery - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/examples/ydb/ent/season_update.go b/examples/ydb/ent/season_update.go index b9f44283dd..81b6b402cd 100644 --- a/examples/ydb/ent/season_update.go +++ b/examples/ydb/ent/season_update.go @@ -26,7 +26,7 @@ type SeasonUpdate struct { config hooks []Hook mutation *SeasonMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the SeasonUpdate builder. @@ -287,7 +287,7 @@ func (_u *SeasonUpdate) sqlSave(ctx context.Context) (_node int, err error) { } _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{season.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -304,7 +304,7 @@ type SeasonUpdateOne struct { fields []string hooks []Hook mutation *SeasonMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetSeriesID sets the "series_id" field. @@ -592,7 +592,7 @@ func (_u *SeasonUpdateOne) sqlSave(ctx context.Context) (_node *Season, err erro _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{season.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/examples/ydb/ent/series_create.go b/examples/ydb/ent/series_create.go index 6d4352e662..5d56ef3b6d 100644 --- a/examples/ydb/ent/series_create.go +++ b/examples/ydb/ent/series_create.go @@ -12,6 +12,7 @@ import ( "fmt" "time" + "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/ydb/ent/season" "entgo.io/ent/examples/ydb/ent/series" @@ -23,7 +24,7 @@ type SeriesCreate struct { config mutation *SeriesMutation hooks []Hook - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetTitle sets the "title" field. @@ -194,7 +195,7 @@ type SeriesCreateBulk struct { config err error builders []*SeriesCreate - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Save creates the Series entities in the database. diff --git a/examples/ydb/ent/series_delete.go b/examples/ydb/ent/series_delete.go index a66adf80f7..45b6bd9ffb 100644 --- a/examples/ydb/ent/series_delete.go +++ b/examples/ydb/ent/series_delete.go @@ -21,7 +21,7 @@ type SeriesDelete struct { config hooks []Hook mutation *SeriesMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the SeriesDelete builder. diff --git a/examples/ydb/ent/series_query.go b/examples/ydb/ent/series_query.go index c3c484ba5b..76a915fada 100644 --- a/examples/ydb/ent/series_query.go +++ b/examples/ydb/ent/series_query.go @@ -29,7 +29,7 @@ type SeriesQuery struct { inters []Interceptor predicates []predicate.Series withSeasons *SeasonQuery - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig // intermediate query (i.e. traversal path). sql *sql.Selector path func(context.Context) (*sql.Selector, error) diff --git a/examples/ydb/ent/series_update.go b/examples/ydb/ent/series_update.go index 9c53f19fc0..e7cae45802 100644 --- a/examples/ydb/ent/series_update.go +++ b/examples/ydb/ent/series_update.go @@ -25,7 +25,7 @@ type SeriesUpdate struct { config hooks []Hook mutation *SeriesMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // Where appends a list predicates to the SeriesUpdate builder. @@ -238,7 +238,7 @@ func (_u *SeriesUpdate) sqlSave(ctx context.Context) (_node int, err error) { } _spec.RetryConfig = _u.retryConfig if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{series.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} @@ -255,7 +255,7 @@ type SeriesUpdateOne struct { fields []string hooks []Hook mutation *SeriesMutation - retryConfig sqlgraph.RetryConfig + retryConfig sql.RetryConfig } // SetTitle sets the "title" field. @@ -495,7 +495,7 @@ func (_u *SeriesUpdateOne) sqlSave(ctx context.Context) (_node *Series, err erro _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { - if _, ok := err.(*sqlgraph.NotFoundError); ok { + if sqlgraph.IsNotFound(err) { err = &NotFoundError{series.Label} } else if sqlgraph.IsConstraintError(err) { err = &ConstraintError{msg: err.Error(), wrap: err} diff --git a/go.mod b/go.mod index c3d32e35ae..a41b9692b7 100644 --- a/go.mod +++ b/go.mod @@ -64,4 +64,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace ariga.io/atlas => github.com/LostImagin4tion/atlas v0.0.33 +replace ariga.io/atlas => github.com/LostImagin4tion/atlas v0.0.34 diff --git a/go.sum b/go.sum index 5f73949be5..cc10301608 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/LostImagin4tion/atlas v0.0.33 h1:RgcQhGG0MZDwheuFRiZu47ihFRDhtcYmbAT6KU3J3v0= -github.com/LostImagin4tion/atlas v0.0.33/go.mod h1:FtOd0Ry45l3FeDVGVm8tf2SFWg3vHDztylE0eE3EWQ8= +github.com/LostImagin4tion/atlas v0.0.34 h1:xCEZMtvTWwbuSU0TVQTsc60sKffIJxqjh/VIvRKcN5c= +github.com/LostImagin4tion/atlas v0.0.34/go.mod h1:FtOd0Ry45l3FeDVGVm8tf2SFWg3vHDztylE0eE3EWQ8= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=