From d93b55d0d2bbcd6694f0c182a1e692cb5a3410fa Mon Sep 17 00:00:00 2001
From: Jannik Clausen <github@masseelch.de>
Date: Wed, 15 Jun 2022 08:42:15 +0200
Subject: [PATCH] fix tests

---
 dialect/sql/schema/atlas.go              |  9 +++------
 entc/integration/migrate/migrate_test.go | 13 ++++++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/dialect/sql/schema/atlas.go b/dialect/sql/schema/atlas.go
index df6cd97590..e91ce3ed93 100644
--- a/dialect/sql/schema/atlas.go
+++ b/dialect/sql/schema/atlas.go
@@ -583,6 +583,9 @@ func (m *Migrate) ensureTypeTable(next Differ) Differ {
 			if err := m.aColumns(m, et, at); err != nil {
 				return nil, err
 			}
+			if err := m.aIndexes(m, et, at); err != nil {
+				return nil, err
+			}
 			desired.Tables = append(desired.Tables, at)
 		}
 		changes, err := next.Diff(current, desired)
@@ -590,12 +593,6 @@ func (m *Migrate) ensureTypeTable(next Differ) Differ {
 			return nil, err
 		}
 		if len(m.dbTypeRanges) > 0 && len(m.fileTypeRanges) == 0 {
-			// Check if all types added by the diff process are present in the "old" types table.
-			for _, t := range m.typeRanges {
-				if indexOf(m.dbTypeRanges, t) < 0 {
-					return nil, fmt.Errorf("unexpected missing type range for %q", t)
-				}
-			}
 			// Override the types file created in the diff process with the "old" allocated types ranges.
 			if err := m.typeStore.(*dirTypeStore).save(m.dbTypeRanges); err != nil {
 				return nil, err
diff --git a/entc/integration/migrate/migrate_test.go b/entc/integration/migrate/migrate_test.go
index 5ca664ff14..aad25badd7 100644
--- a/entc/integration/migrate/migrate_test.go
+++ b/entc/integration/migrate/migrate_test.go
@@ -67,7 +67,10 @@ func TestMySQL(t *testing.T) {
 			require.NoError(t, err, root.Exec(ctx, "DROP DATABASE IF EXISTS versioned_migrate", []interface{}{}, new(sql.Result)))
 			require.NoError(t, root.Exec(ctx, "CREATE DATABASE IF NOT EXISTS versioned_migrate", []interface{}{}, new(sql.Result)))
 			defer root.Exec(ctx, "DROP DATABASE IF EXISTS versioned_migrate", []interface{}{}, new(sql.Result))
-			Versioned(t, drv, versioned.NewClient(versioned.Driver(drv)))
+			vdrv, err := sql.Open("mysql", fmt.Sprintf("root:pass@tcp(localhost:%d)/versioned_migrate?parseTime=True", port))
+			require.NoError(t, err, "connecting to versioned migrate database")
+			defer vdrv.Close()
+			Versioned(t, vdrv, versioned.NewClient(versioned.Driver(vdrv)))
 		})
 	}
 }
@@ -228,7 +231,11 @@ func Versioned(t *testing.T, drv sql.ExecQuerier, client *versioned.Client) {
 		template.Must(template.New("name").Parse(`{{ range .Changes }}{{ printf "%s;\n" .Cmd }}{{ end }}`)),
 	)
 	require.NoError(t, err)
-	opts := []schema.MigrateOption{schema.WithDir(dir), schema.WithDeterministicGlobalUniqueID(), schema.WithFormatter(format)}
+	opts := []schema.MigrateOption{
+		schema.WithDir(dir),
+		schema.WithDeterministicGlobalUniqueID(),
+		schema.WithFormatter(format),
+	}
 
 	// Compared to empty database.
 	require.NoError(t, client.Schema.NamedDiff(ctx, "first", opts...))
@@ -242,7 +249,7 @@ func Versioned(t *testing.T, drv sql.ExecQuerier, client *versioned.Client) {
 		for sc.Scan() {
 			if sc.Text() != "" {
 				_, err := drv.ExecContext(ctx, sc.Text())
-				require.NoError(t, err)
+				require.NoError(t, err, sc.Text())
 			}
 		}
 	}