Skip to content

Commit

Permalink
chore(embedded/sql): improve internal index naming
Browse files Browse the repository at this point in the history
Signed-off-by: Jeronimo Irazabal <jeronimo.irazabal@gmail.com>
  • Loading branch information
jeroiraz committed Sep 20, 2023
1 parent d4568d3 commit b89c956
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions embedded/sql/catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ func indexName(tableName string, cols []*Column) string {

buf.WriteString(tableName)

buf.WriteString("[")
buf.WriteString("(")

for c, col := range cols {
buf.WriteString(col.colName)
Expand All @@ -263,7 +263,7 @@ func indexName(tableName string, cols []*Column) string {
}
}

buf.WriteString("]")
buf.WriteString(")")

return buf.String()
}
Expand Down
10 changes: 5 additions & 5 deletions embedded/sql/engine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6054,14 +6054,14 @@ func TestSingleDBCatalogQueries(t *testing.T) {
row, err := r.Read(context.Background())
require.NoError(t, err)
require.Equal(t, "mytable1", row.ValuesBySelector["(indexes.table)"].RawValue())
require.Equal(t, "mytable1[id]", row.ValuesBySelector["(indexes.name)"].RawValue())
require.Equal(t, "mytable1(id)", row.ValuesBySelector["(indexes.name)"].RawValue())
require.True(t, row.ValuesBySelector["(indexes.unique)"].RawValue().(bool))
require.True(t, row.ValuesBySelector["(indexes.primary)"].RawValue().(bool))

row, err = r.Read(context.Background())
require.NoError(t, err)
require.Equal(t, "mytable1", row.ValuesBySelector["(indexes.table)"].RawValue())
require.Equal(t, "mytable1[title]", row.ValuesBySelector["(indexes.name)"].RawValue())
require.Equal(t, "mytable1(title)", row.ValuesBySelector["(indexes.name)"].RawValue())
require.False(t, row.ValuesBySelector["(indexes.unique)"].RawValue().(bool))
require.False(t, row.ValuesBySelector["(indexes.primary)"].RawValue().(bool))

Expand All @@ -6078,21 +6078,21 @@ func TestSingleDBCatalogQueries(t *testing.T) {
row, err := r.Read(context.Background())
require.NoError(t, err)
require.Equal(t, "mytable2", row.ValuesBySelector["(indexes.table)"].RawValue())
require.Equal(t, "mytable2[id]", row.ValuesBySelector["(indexes.name)"].RawValue())
require.Equal(t, "mytable2(id)", row.ValuesBySelector["(indexes.name)"].RawValue())
require.True(t, row.ValuesBySelector["(indexes.unique)"].RawValue().(bool))
require.True(t, row.ValuesBySelector["(indexes.primary)"].RawValue().(bool))

row, err = r.Read(context.Background())
require.NoError(t, err)
require.Equal(t, "mytable2", row.ValuesBySelector["(indexes.table)"].RawValue())
require.Equal(t, "mytable2[name]", row.ValuesBySelector["(indexes.name)"].RawValue())
require.Equal(t, "mytable2(name)", row.ValuesBySelector["(indexes.name)"].RawValue())
require.False(t, row.ValuesBySelector["(indexes.unique)"].RawValue().(bool))
require.False(t, row.ValuesBySelector["(indexes.primary)"].RawValue().(bool))

row, err = r.Read(context.Background())
require.NoError(t, err)
require.Equal(t, "mytable2", row.ValuesBySelector["(indexes.table)"].RawValue())
require.Equal(t, "mytable2[name,active]", row.ValuesBySelector["(indexes.name)"].RawValue())
require.Equal(t, "mytable2(name,active)", row.ValuesBySelector["(indexes.name)"].RawValue())
require.True(t, row.ValuesBySelector["(indexes.unique)"].RawValue().(bool))
require.False(t, row.ValuesBySelector["(indexes.primary)"].RawValue().(bool))

Expand Down

0 comments on commit b89c956

Please sign in to comment.