Skip to content

Commit

Permalink
using string builder
Browse files Browse the repository at this point in the history
Signed-off-by: Shlomi Noach <[email protected]>
  • Loading branch information
shlomi-noach committed Feb 6, 2025
1 parent 3a238d1 commit 7221c51
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
10 changes: 7 additions & 3 deletions go/vt/schemadiff/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -394,11 +394,15 @@ type ViewDependencyUnresolvedError struct {
}

func (e *ViewDependencyUnresolvedError) Error() string {
s := make([]string, len(e.MissingReferencedEntities))
var b strings.Builder
b.WriteString(fmt.Sprintf("view %s has unresolved/loop dependencies: ", sqlescape.EscapeID(e.View)))
for i, entity := range e.MissingReferencedEntities {
s[i] = sqlescape.EscapeID(entity)
if i > 0 {
b.WriteString(", ")
}
sqlescape.WriteEscapeID(&b, entity)
}
return fmt.Sprintf("view %s has unresolved/loop dependencies: %s", sqlescape.EscapeID(e.View), strings.Join(s, ", "))
return b.String()
}

type InvalidColumnReferencedInViewError struct {
Expand Down
1 change: 1 addition & 0 deletions go/vt/schemadiff/schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ func TestNewSchemaFromQueriesUnresolvedMulti(t *testing.T) {
schema, err := NewSchemaFromQueries(NewTestEnv(), queries)
assert.Error(t, err)
assert.EqualError(t, err, (&ViewDependencyUnresolvedError{View: "v7", MissingReferencedEntities: []string{"v8", "t20", "v21"}}).Error())
assert.Equal(t, "view `v7` has unresolved/loop dependencies: `v8`, `t20`, `v21`", err.Error())
v := schema.sorted[len(schema.sorted)-1]
assert.IsType(t, &CreateViewEntity{}, v)
assert.Equal(t, "CREATE VIEW `v7` AS SELECT * FROM `v8`, `t2`, `t20`, `v21`", v.Create().CanonicalStatementString())
Expand Down

0 comments on commit 7221c51

Please sign in to comment.