Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix table parsing on VSchema generation #7511

Merged
merged 2 commits into from
Feb 18, 2021
Merged

Fix table parsing on VSchema generation #7511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c7727a
fix table parsing for VSchema generation to include reserved and non …
harshit-gangal Feb 15, 2021
7e0cd63
added parse table tests
harshit-gangal Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions go/vt/sqlparser/parse_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ func ParseTable(input string) (keyspace, table string, err error) {
case ID:
table = string(value)
default:
return "", "", vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "invalid table name: %s", input)
table = KeywordString(token)
if table == "" {
return "", "", vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "invalid table name: %s", input)
}
}

// Seen first ID, want '.' or 0
Expand All @@ -52,7 +55,10 @@ func ParseTable(input string) (keyspace, table string, err error) {
case ID:
table = string(value)
default:
return "", "", vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "invalid table name: %s", input)
table = KeywordString(token)
if table == "" {
return "", "", vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "invalid table name: %s", input)
}
}

// Seen second ID, want 0
Expand Down
40 changes: 32 additions & 8 deletions go/vt/sqlparser/parse_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ package sqlparser
import (
"testing"

"github.com/stretchr/testify/require"

"github.com/stretchr/testify/assert"
)

Expand Down Expand Up @@ -55,15 +57,37 @@ func TestParseTable(t *testing.T) {
}, {
input: "k.t.",
err: true,
}, {
input: "k.language",
keyspace: "k",
table: "language",
}, {
input: "language",
keyspace: "",
table: "language",
}, {
input: "language.tables",
keyspace: "language",
table: "tables",
}, {
input: "language.t",
keyspace: "language",
table: "t",
}, {
input: "`from`.`table`",
keyspace: "from",
table: "table",
}}
for _, tcase := range testcases {
keyspace, table, err := ParseTable(tcase.input)
assert.Equal(t, tcase.keyspace, keyspace)
assert.Equal(t, tcase.table, table)
if tcase.err {
assert.Error(t, err)
} else {
assert.NoError(t, err)
}
t.Run(tcase.input, func(t *testing.T) {
keyspace, table, err := ParseTable(tcase.input)
if tcase.err {
require.Error(t, err)
} else {
require.NoError(t, err)
}
assert.Equal(t, tcase.keyspace, keyspace)
assert.Equal(t, tcase.table, table)
})
}
}