diff --git a/dialect/sql/schema/atlas.go b/dialect/sql/schema/atlas.go index f1134e502..6a56ca97d 100644 --- a/dialect/sql/schema/atlas.go +++ b/dialect/sql/schema/atlas.go @@ -183,7 +183,7 @@ func (a *Atlas) NamedDiff(ctx context.Context, name string, tables ...*Table) er return err } if len(s.Tables) > 0 { - return migrate.ErrNotClean + return migrate.NotCleanError{Reason: fmt.Sprintf("found table %q", s.Tables[0].Name)} } // Clean up once done. defer func() { diff --git a/entc/integration/migrate/migrate_test.go b/entc/integration/migrate/migrate_test.go index 20c45b67f..6d3443345 100644 --- a/entc/integration/migrate/migrate_test.go +++ b/entc/integration/migrate/migrate_test.go @@ -285,7 +285,7 @@ func Versioned(t *testing.T, drv sql.ExecQuerier, devURL string, client *version hf, err := migrate.HashSum(dir) require.NoError(t, err) require.NoError(t, migrate.WriteSumFile(dir, hf)) - require.ErrorIs(t, client.Schema.Diff(ctx, opts...), migrate.ErrNotClean) + require.ErrorAs(t, client.Schema.Diff(ctx, opts...), &migrate.NotCleanError{}) // Diffing by replaying should not create new files. require.Equal(t, 2, countFiles(t, dir)) diff --git a/go.mod b/go.mod index 7167d8ec4..3bded2926 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module entgo.io/ent go 1.17 require ( - ariga.io/atlas v0.4.3-0.20220708180314-c4867b18d9f8 + ariga.io/atlas v0.4.3-0.20220711120113-a190b01c6ef9 github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/go-openapi/inflect v0.19.0 github.com/go-sql-driver/mysql v1.6.0 diff --git a/go.sum b/go.sum index fde17350a..524a4c32d 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ ariga.io/atlas v0.4.3-0.20220708180314-c4867b18d9f8 h1:8C5iwh5F9AKxtUvMKFIgEoctAHFhow1vvjHoM0FNdts= ariga.io/atlas v0.4.3-0.20220708180314-c4867b18d9f8/go.mod h1:ofVetkJqlaWle3mvYmaS2uyFGFcc7dSq436tmxa/Mzk= +ariga.io/atlas v0.4.3-0.20220711120113-a190b01c6ef9 h1:fCGaHuxbtYaE+OjQGl1hYTq4nwy659FLPVOCySF8MiQ= +ariga.io/atlas v0.4.3-0.20220711120113-a190b01c6ef9/go.mod h1:ofVetkJqlaWle3mvYmaS2uyFGFcc7dSq436tmxa/Mzk= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=