Merge pull request #527 from corydoraspanda/fix/#525/sort-function-ar…

…guments

Add arguments as second sort key for functions.

schema/schema.go

@@ -290,7 +290,10 @@ func (s *Schema) Sort() error {
 		return s.Relations[i].Table.Name < s.Relations[j].Table.Name
 	})
 	sort.SliceStable(s.Functions, func(i, j int) bool {
-		return s.Functions[i].Name < s.Functions[j].Name
+		if s.Functions[i].Name != s.Functions[j].Name {
+			return s.Functions[i].Name < s.Functions[j].Name
+		}
+		return s.Functions[i].Arguments < s.Functions[j].Arguments
 	})
 	sort.SliceStable(s.Viewpoints, func(i, j int) bool {
 		return s.Viewpoints[i].Name < s.Viewpoints[j].Name

schema/schema_test.go

@@ -210,6 +210,16 @@ func TestSchema_Sort(t *testing.T) {
 				},
 			},
 		},
+		Functions: []*Function{
+			&Function{
+				Name:   "b",
+				Arguments: "arg b",
+			},
+			&Function{
+				Name:   "b",
+				Arguments: "arg a",
+			},
+		},
 	}
 	if err := schema.Sort(); err != nil {
 		t.Error(err)
@@ -224,6 +234,11 @@ func TestSchema_Sort(t *testing.T) {
 	if got2 != want2 {
 		t.Errorf("got %v\nwant %v", got2, want2)
 	}
+	want3 := "arg a"
+	got3 := schema.Functions[0].Arguments
+	if got3 != want3 {
+		t.Errorf("got %v\nwant %v", got3, want3)
+	}
 }
 
 func TestRepair(t *testing.T) {