From 844f63015d84957241f2169b4c79cf243e90a5d5 Mon Sep 17 00:00:00 2001 From: Ciaran Liedeman <3578740+cliedeman@users.noreply.github.com> Date: Wed, 26 May 2021 19:17:12 +0200 Subject: [PATCH] entc/gen: remove internal rollback function from templates (#1602) --- entc/gen/internal/bindata.go | 4 ++-- entc/gen/template/dialect/sql/errors.tmpl | 10 ---------- entc/integration/cascadelete/ent/ent.go | 12 ------------ entc/integration/config/ent/ent.go | 12 ------------ entc/integration/customid/ent/ent.go | 12 ------------ entc/integration/edgefield/ent/ent.go | 12 ------------ entc/integration/ent/ent.go | 12 ------------ entc/integration/hooks/ent/ent.go | 12 ------------ entc/integration/idtype/ent/ent.go | 12 ------------ entc/integration/json/ent/ent.go | 12 ------------ entc/integration/migrate/entv1/ent.go | 12 ------------ entc/integration/migrate/entv2/ent.go | 12 ------------ entc/integration/multischema/ent/ent.go | 12 ------------ entc/integration/privacy/ent/ent.go | 12 ------------ entc/integration/template/ent/ent.go | 12 ------------ examples/edgeindex/ent/ent.go | 12 ------------ examples/entcpkg/ent/ent.go | 12 ------------ examples/fs/ent/ent.go | 12 ------------ examples/m2m2types/ent/ent.go | 12 ------------ examples/m2mbidi/ent/ent.go | 12 ------------ examples/m2mrecur/ent/ent.go | 12 ------------ examples/o2m2types/ent/ent.go | 12 ------------ examples/o2mrecur/ent/ent.go | 12 ------------ examples/o2o2types/ent/ent.go | 12 ------------ examples/o2obidi/ent/ent.go | 12 ------------ examples/o2orecur/ent/ent.go | 12 ------------ examples/privacyadmin/ent/ent.go | 12 ------------ examples/privacytenant/ent/ent.go | 12 ------------ examples/start/ent/ent.go | 12 ------------ examples/traversal/ent/ent.go | 12 ------------ 30 files changed, 2 insertions(+), 348 deletions(-) diff --git a/entc/gen/internal/bindata.go b/entc/gen/internal/bindata.go index a545eae57..683a4b444 100644 --- a/entc/gen/internal/bindata.go +++ b/entc/gen/internal/bindata.go @@ -732,7 +732,7 @@ func templateDialectSqlEntqlTmpl() (*asset, error) { return a, nil } -var _templateDialectSqlErrorsTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x52\xdd\x6a\xe3\x3c\x14\xbc\xae\x9e\x62\xbe\x40\x3f\xe2\x90\xb5\xbb\xbd\xdb\x94\x5c\x94\x90\x5d\x02\x65\x61\xb7\x7d\x01\x47\x3e\xb2\x45\x54\xc9\x3d\x92\xf3\x83\xf1\xbb\x2f\xb2\x62\x08\x65\xf7\x22\x10\xcd\xcc\xf9\x99\x39\xee\xfb\x62\x21\x36\xae\xbd\xb0\xae\x9b\x80\xc7\x87\xaf\xdf\xbe\xb4\x4c\x9e\x6c\xc0\xf7\x52\xd2\xde\xb9\x03\x76\x56\xe6\x78\x36\x06\xa3\xc8\x23\xf2\x7c\xa4\x2a\x17\x6f\x8d\xf6\xf0\xae\x63\x49\x90\xae\x22\x68\x0f\xa3\x25\x59\x4f\x15\x3a\x5b\x11\x23\x34\x84\xe7\xb6\x94\x0d\xe1\x31\x7f\x98\x58\x28\xd7\xd9\x4a\x68\x3b\xf2\x2f\xbb\xcd\xf6\xe7\xeb\x16\x4a\x1b\xc2\x15\x63\xe7\x02\x2a\xcd\x24\x83\xe3\x0b\x9c\x42\xb8\x19\x16\x98\x28\x17\x8b\x62\x18\x84\x88\x1e\x50\xbb\x70\x69\x69\x05\xb2\xa1\x76\xb9\x76\x05\xd9\x10\x7f\xb2\xa8\xc9\xe6\x3f\xb8\x6c\x1b\xdc\xc8\x65\xe7\x83\x7b\x07\x31\x3b\xf6\x28\x6d\x35\xfd\x6d\x4a\x5b\x19\x62\x0f\xe5\x18\xfe\xc3\xa0\xd2\xa5\x21\x19\x7c\xaa\xee\x7b\x54\xa4\xb4\x25\xcc\xae\x44\xe1\x3f\x4c\x91\x8a\x67\x18\x06\xa1\x3a\x2b\xa1\xfd\xeb\xaf\x97\x8d\xb3\x3e\x70\xa9\x6d\xd8\x46\x7a\x4e\xcc\x69\x4a\x86\xf9\xe2\x13\xb9\xc4\xde\x39\x93\xa1\x17\x77\x5a\xc5\xb9\x75\xdc\x38\xdf\xf9\xbf\x34\x19\x55\x77\x4c\xa1\x63\x8b\xff\x3f\x09\x7a\x62\xce\x93\x34\x5b\xc6\x71\xc3\x12\x81\x3b\x12\x77\x83\x98\x6a\xac\x36\x4b\xa8\xd2\x78\x12\x83\x10\x45\x01\x76\xc6\xec\x4b\x79\x80\x2c\x8d\xf1\x08\xe7\xfc\xf7\x84\xc4\x68\x4e\x5c\xb6\x7e\x3c\x4a\xad\x8f\x64\x93\x09\x9c\x74\x68\xae\x97\xba\x6a\x13\xae\x15\xae\x5f\x50\x9e\xc2\x98\xf8\x79\x38\x4f\x69\xe6\x6f\xe7\x71\xb9\x29\x8f\x54\x99\xcc\x73\xc4\x57\xeb\xdb\x2d\xe6\xd9\x53\x82\xff\x5b\xc7\xe5\x47\xff\xf1\xb9\x86\x7a\x0f\xc9\xad\x9a\xcf\xee\x4f\x2b\xdc\x1f\x67\x63\xe3\xe5\xa8\xcf\x46\xd7\x5a\x25\xc4\x1d\x62\xdb\x7f\x9d\x26\x7b\x8a\x82\x9b\x64\x89\xf9\x36\xb4\xf8\x1c\xef\x4f\xb6\x8a\x77\xfe\x13\x00\x00\xff\xff\x11\x71\x9b\x0e\x3a\x03\x00\x00") +var _templateDialectSqlErrorsTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x90\xc1\x6a\xdc\x30\x10\x86\xcf\xab\xa7\xf8\xc9\xa1\x64\x97\xad\x9d\xe6\xd6\xde\xc2\xb2\x2d\x0b\xa1\x50\xd2\x17\x70\xa4\xb1\x2d\xaa\xce\x38\x33\xe3\xc2\x62\xfc\xee\xc5\xeb\x2c\x84\x90\x83\x40\xe8\xfb\x7e\xfd\x23\x4d\x53\xbd\x0b\x07\x19\xce\x9a\xbb\xde\x71\x7f\xf7\xe5\xeb\xe7\x41\xc9\x88\x1d\xdf\x9b\x48\xcf\x22\x7f\x70\xe2\x58\xe1\xa1\x14\x5c\x24\xc3\xc2\xf5\x1f\xa5\x2a\xfc\xee\xb3\xc1\x64\xd4\x48\x88\x92\x08\xd9\x50\x72\x24\x36\x4a\x18\x39\x91\xc2\x7b\xc2\xc3\xd0\xc4\x9e\x70\x5f\xdd\x5d\x29\x5a\x19\x39\x85\xcc\x17\xfe\x78\x3a\x1c\x7f\x3e\x1d\xd1\xe6\x42\x78\x3d\x53\x11\x47\xca\x4a\xd1\x45\xcf\x90\x16\xfe\xa6\xcc\x95\xa8\x0a\xbb\x7a\x9e\x43\x58\xde\x80\x4e\xfc\x3c\xd0\x37\x10\x7b\x27\x55\x96\x9a\xd8\x97\x15\xeb\x8e\xb8\xfa\xa1\xcd\xd0\xe3\x8d\x1e\x47\x73\xf9\x0b\x52\x15\x35\x34\x9c\xae\xdb\xbe\xe1\x54\x48\x0d\xad\x28\xec\xa5\x20\xe5\xa6\x50\x74\x5b\xd3\xd3\x84\x44\x6d\x66\xc2\xcd\x2b\xa8\xed\xa5\xd4\x6b\xf8\x06\xf3\x1c\xda\x91\x23\xb2\x3d\xfd\x7a\x3c\x08\x9b\x6b\x93\xd9\x8f\x0b\xbe\x25\xd5\xb5\x65\x8b\xdb\xdd\x3b\xb8\xc7\xb3\x48\xd9\x62\x0a\x9b\xdc\x2e\xbd\xdd\x32\x71\x75\xb2\x0f\x2e\xb9\x58\x1b\x25\x1f\x95\xf1\xe9\x9d\x30\x91\x6a\xb5\xaa\xdb\xfd\x52\x37\xef\xe1\x3a\x52\xd8\xcc\xe1\x9a\xe1\x5c\xf6\x68\x9b\x62\x14\x2e\xff\x01\xe2\xb4\x8c\xfe\x3f\x00\x00\xff\xff\x3d\xf4\x36\xc4\x0d\x02\x00\x00") func templateDialectSqlErrorsTmplBytes() ([]byte, error) { return bindataRead( @@ -747,7 +747,7 @@ func templateDialectSqlErrorsTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/errors.tmpl", size: 826, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/dialect/sql/errors.tmpl", size: 525, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/entc/gen/template/dialect/sql/errors.tmpl b/entc/gen/template/dialect/sql/errors.tmpl index 34e506f6c..1792d2491 100644 --- a/entc/gen/template/dialect/sql/errors.tmpl +++ b/entc/gen/template/dialect/sql/errors.tmpl @@ -15,14 +15,4 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { return nil, false } -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} {{ end }} diff --git a/entc/integration/cascadelete/ent/ent.go b/entc/integration/cascadelete/ent/ent.go index 14f9e277a..032e326d7 100644 --- a/entc/integration/cascadelete/ent/ent.go +++ b/entc/integration/cascadelete/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/cascadelete/ent/comment" @@ -274,14 +273,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/config/ent/ent.go b/entc/integration/config/ent/ent.go index 0e09282bb..9dd11fb70 100644 --- a/entc/integration/config/ent/ent.go +++ b/entc/integration/config/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/config/ent/user" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/customid/ent/ent.go b/entc/integration/customid/ent/ent.go index fa74aa918..ba0d4fe0c 100644 --- a/entc/integration/customid/ent/ent.go +++ b/entc/integration/customid/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/customid/ent/blob" @@ -284,14 +283,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/edgefield/ent/ent.go b/entc/integration/edgefield/ent/ent.go index ffd141bd2..5d015eacc 100644 --- a/entc/integration/edgefield/ent/ent.go +++ b/entc/integration/edgefield/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/edgefield/ent/car" @@ -284,14 +283,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/ent/ent.go b/entc/integration/ent/ent.go index 054982660..b9a8e00c0 100644 --- a/entc/integration/ent/ent.go +++ b/entc/integration/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/ent/card" @@ -296,14 +295,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/hooks/ent/ent.go b/entc/integration/hooks/ent/ent.go index d85c8ccb9..8abda5f36 100644 --- a/entc/integration/hooks/ent/ent.go +++ b/entc/integration/hooks/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/hooks/ent/card" @@ -272,14 +271,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/idtype/ent/ent.go b/entc/integration/idtype/ent/ent.go index 95c3c8574..9be169e2a 100644 --- a/entc/integration/idtype/ent/ent.go +++ b/entc/integration/idtype/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/idtype/ent/user" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/json/ent/ent.go b/entc/integration/json/ent/ent.go index 04170cf55..2f526b487 100644 --- a/entc/integration/json/ent/ent.go +++ b/entc/integration/json/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/json/ent/user" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/migrate/entv1/ent.go b/entc/integration/migrate/entv1/ent.go index df8e044bc..c3b46fdeb 100644 --- a/entc/integration/migrate/entv1/ent.go +++ b/entc/integration/migrate/entv1/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/migrate/entv1/car" @@ -276,14 +275,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/migrate/entv2/ent.go b/entc/integration/migrate/entv2/ent.go index 849f9d4f8..f9dee9425 100644 --- a/entc/integration/migrate/entv2/ent.go +++ b/entc/integration/migrate/entv2/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/migrate/entv2/car" @@ -282,14 +281,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/multischema/ent/ent.go b/entc/integration/multischema/ent/ent.go index 908ec171e..2deadcaac 100644 --- a/entc/integration/multischema/ent/ent.go +++ b/entc/integration/multischema/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/multischema/ent/group" @@ -274,14 +273,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/privacy/ent/ent.go b/entc/integration/privacy/ent/ent.go index 761cd4e4f..cb093846a 100644 --- a/entc/integration/privacy/ent/ent.go +++ b/entc/integration/privacy/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/privacy/ent/task" @@ -274,14 +273,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/entc/integration/template/ent/ent.go b/entc/integration/template/ent/ent.go index 40843dc61..b584dad45 100644 --- a/entc/integration/template/ent/ent.go +++ b/entc/integration/template/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/entc/integration/template/ent/group" @@ -274,14 +273,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/edgeindex/ent/ent.go b/examples/edgeindex/ent/ent.go index 4acf86a2e..2286f7336 100644 --- a/examples/edgeindex/ent/ent.go +++ b/examples/edgeindex/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/edgeindex/ent/city" @@ -272,14 +271,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/entcpkg/ent/ent.go b/examples/entcpkg/ent/ent.go index 6cfd58df2..3625b0536 100644 --- a/examples/entcpkg/ent/ent.go +++ b/examples/entcpkg/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/entcpkg/ent/user" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/fs/ent/ent.go b/examples/fs/ent/ent.go index 27ae4194e..9ecf396a5 100644 --- a/examples/fs/ent/ent.go +++ b/examples/fs/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/fs/ent/file" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/m2m2types/ent/ent.go b/examples/m2m2types/ent/ent.go index 44c615802..8c9c1427a 100644 --- a/examples/m2m2types/ent/ent.go +++ b/examples/m2m2types/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/m2m2types/ent/group" @@ -272,14 +271,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/m2mbidi/ent/ent.go b/examples/m2mbidi/ent/ent.go index c1d270fd9..c0b45367d 100644 --- a/examples/m2mbidi/ent/ent.go +++ b/examples/m2mbidi/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/m2mbidi/ent/user" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/m2mrecur/ent/ent.go b/examples/m2mrecur/ent/ent.go index 497418ec9..be5650d66 100644 --- a/examples/m2mrecur/ent/ent.go +++ b/examples/m2mrecur/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/m2mrecur/ent/user" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/o2m2types/ent/ent.go b/examples/o2m2types/ent/ent.go index 5ec17ab98..2c0de228e 100644 --- a/examples/o2m2types/ent/ent.go +++ b/examples/o2m2types/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/o2m2types/ent/pet" @@ -272,14 +271,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/o2mrecur/ent/ent.go b/examples/o2mrecur/ent/ent.go index 5a5df17a8..430ed7d08 100644 --- a/examples/o2mrecur/ent/ent.go +++ b/examples/o2mrecur/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/o2mrecur/ent/node" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/o2o2types/ent/ent.go b/examples/o2o2types/ent/ent.go index 1bb9dd7ca..edf6b9c4c 100644 --- a/examples/o2o2types/ent/ent.go +++ b/examples/o2o2types/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/o2o2types/ent/card" @@ -272,14 +271,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/o2obidi/ent/ent.go b/examples/o2obidi/ent/ent.go index ef394ec73..31ebf67e8 100644 --- a/examples/o2obidi/ent/ent.go +++ b/examples/o2obidi/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/o2obidi/ent/user" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/o2orecur/ent/ent.go b/examples/o2orecur/ent/ent.go index dfdd0c9b0..c01134de8 100644 --- a/examples/o2orecur/ent/ent.go +++ b/examples/o2orecur/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/o2orecur/ent/node" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/privacyadmin/ent/ent.go b/examples/privacyadmin/ent/ent.go index 5a3b41c1f..3c4ea6318 100644 --- a/examples/privacyadmin/ent/ent.go +++ b/examples/privacyadmin/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/privacyadmin/ent/user" @@ -270,14 +269,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/privacytenant/ent/ent.go b/examples/privacytenant/ent/ent.go index 8fc3880e7..39af5906a 100644 --- a/examples/privacytenant/ent/ent.go +++ b/examples/privacytenant/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/privacytenant/ent/group" @@ -274,14 +273,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/start/ent/ent.go b/examples/start/ent/ent.go index e3883ec7b..66405d17b 100644 --- a/examples/start/ent/ent.go +++ b/examples/start/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/start/ent/car" @@ -274,14 +273,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -} diff --git a/examples/traversal/ent/ent.go b/examples/traversal/ent/ent.go index 70c618558..ae4b6da22 100644 --- a/examples/traversal/ent/ent.go +++ b/examples/traversal/ent/ent.go @@ -11,7 +11,6 @@ import ( "fmt" "entgo.io/ent" - "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/examples/traversal/ent/group" @@ -274,14 +273,3 @@ func isSQLConstraintError(err error) (*ConstraintError, bool) { } return nil, false } - -// rollback calls tx.Rollback and wraps the given error with the rollback error if present. -func rollback(tx dialect.Tx, err error) error { - if rerr := tx.Rollback(); rerr != nil { - err = fmt.Errorf("%w: %v", err, rerr) - } - if err, ok := isSQLConstraintError(err); ok { - return err - } - return err -}