Merge pull request #206 from erizocosmico/fix/migration-order

fix order of generated tables in migrations

Author: erizocosmico

generator/migration.go

@@ -285,11 +285,7 @@ func (cs ChangeSet) sorted(dropIndex, createIndex map[string]*TableSchema) (Chan
 						continue
 					}
 
-					if r.inverse {
-						createGraph.dependsOn(c.Name, r.name)
-					} else {
-						createGraph.dependsOn(r.name, c.Name)
-					}
+					createGraph.dependsOn(r.name, c.Name)
 				}
 			} else {
 				createGraph.add(c.Name)
@@ -302,11 +298,7 @@ func (cs ChangeSet) sorted(dropIndex, createIndex map[string]*TableSchema) (Chan
 						continue
 					}
 
-					if r.inverse {
-						dropGraph.dependsOn(c.Name, r.name)
-					} else {
-						dropGraph.dependsOn(r.name, c.Name)
-					}
+					dropGraph.dependsOn(r.name, c.Name)
 				}
 			} else {
 				dropGraph.add(c.Name)

generator/migration_test.go

@@ -21,6 +21,51 @@ func TestNewMigration(t *testing.T) {
 	require.Equal(t, migration.Lock, new)
 }
 
+func TestMigrationOrder(t *testing.T) {
+	a := mkTable("a",
+		mkCol("id", SerialColumn, true, false, nil),
+		mkCol("name", TextColumn, false, true, nil),
+	)
+
+	b := mkTable("b",
+		mkCol("id", SerialColumn, true, false, nil),
+		mkCol("a_id", SerialColumn, false, true, mkRef("a", "id", true)),
+	)
+
+	c := mkTable("c",
+		mkCol("id", SerialColumn, true, false, nil),
+		mkCol("a_id", SerialColumn, false, true, mkRef("a", "id", true)),
+		mkCol("b_id", SerialColumn, false, true, mkRef("b", "id", true)),
+	)
+
+	d := mkTable("d",
+		mkCol("id", SerialColumn, true, false, nil),
+		mkCol("name", TextColumn, false, true, nil),
+	)
+
+	old := mkSchema()
+	new := mkSchema(a, b, c, d)
+	migration, err := NewMigration(old, new)
+	require.NoError(t, err)
+
+	expectedUp := ChangeSet{
+		&CreateTable{a},
+		&CreateTable{b},
+		&CreateTable{c},
+		&CreateTable{d},
+	}
+
+	expectedDown := ChangeSet{
+		&DropTable{"d"},
+		&DropTable{"c"},
+		&DropTable{"b"},
+		&DropTable{"a"},
+	}
+
+	require.Equal(t, expectedUp, migration.Up)
+	require.Equal(t, expectedDown, migration.Down)
+}
+
 func TestNewMigration_SelfRef(t *testing.T) {
 	old := mkSchema()
 	new := mkSchema(mkTable(