Merge pull request #3 from gamedolphin/bug/patch-relation

fix: also use table name to find correct relation to alter
covrom · Jun 26, 2022 · 5b7c18b · 5b7c18b
2 parents a95fe7d + 7e38dc9
commit 5b7c18b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/schema/diff.go b/schema/diff.go
@@ -593,7 +593,7 @@ func (s *PatchSchema) Build(from, to *Schema) {
 		pt := &PatchRelation{
 			from: r,
 		}
-		rt, err := to.FindRelation(r.Columns, r.ParentColumns)
+		rt, err := to.FindRelation(r.Table.Name, r.Columns, r.ParentColumns)
 		if err == nil {
 			pt.to = rt
 		}
@@ -604,7 +604,7 @@ func (s *PatchSchema) Build(from, to *Schema) {
 		pt := &PatchRelation{
 			to: r,
 		}
-		_, err := from.FindRelation(r.Columns, r.ParentColumns)
+		_, err := from.FindRelation(r.Table.Name, r.Columns, r.ParentColumns)
 		if err != nil {
 			s.relations = append(s.relations, pt)
 		}

diff --git a/schema/schema.go b/schema/schema.go
@@ -116,10 +116,10 @@ func (s *Schema) FindTableByName(name string) (*Table, error) {
 }
 
 // FindRelation ...
-func (s *Schema) FindRelation(cs, pcs []*Column) (*Relation, error) {
+func (s *Schema) FindRelation(tblName string, cs, pcs []*Column) (*Relation, error) {
 L:
 	for _, r := range s.Relations {
-		if len(r.Columns) != len(cs) || len(r.ParentColumns) != len(pcs) {
+		if len(r.Columns) != len(cs) || len(r.ParentColumns) != len(pcs) || r.Table.Name != tblName {
 			continue
 		}
 		for _, rc := range r.Columns {