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.

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

Refactor and add a comment to schema initialisation code #13309

Merged
merged 2 commits into from
Jun 14, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion go/vt/sidecardb/sidecardb.go
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,11 @@ func (si *schemaInit) setCurrentDatabase(dbName string) error {
func (si *schemaInit) getCurrentSchema(tableName string) (string, error) {
var currentTableSchema string

rs, err := si.exec(si.ctx, sqlparser.BuildParsedQuery(showCreateTableQuery, GetIdentifier(), sqlparser.String(sqlparser.NewIdentifierCS(tableName))).Query, 1, false)
// We escape the tableName because it can be a keyword.
// Converting the tableName to a case-sensitive identifier and converting back to a string using the
// sqlparser package, ensures that the table name is escaped with backticks if required.
escapedTableName := sqlparser.String(sqlparser.NewIdentifierCS(tableName))
rs, err := si.exec(si.ctx, sqlparser.BuildParsedQuery(showCreateTableQuery, GetIdentifier(), escapedTableName).Query, 1, false)
if err != nil {
if sqlErr, ok := err.(*mysql.SQLError); ok && sqlErr.Number() == mysql.ERNoSuchTable {
// table does not exist in the sidecar database
Expand Down