Skip to content

fix: support quoted select aliases #198

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

Open
shurarama wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: support quoted select aliases #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions cassandra-bigtable-migration-tools/cassandra-bigtable-proxy/translators/common/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,14 +970,25 @@ func ParseAs(a cql.IAsSpecContext) (string, error) {
return "", nil
}

alias := a.OBJECT_NAME().GetText()
if utilities.IsReservedCqlKeyword(alias) {
alias := NormalizeCqlIdentifier(a.OBJECT_NAME().GetText())
if !IsQuotedIdentifier(a.OBJECT_NAME().GetText()) && utilities.IsReservedCqlKeyword(alias) {
return "", fmt.Errorf("cannot use reserved word as alias: '%s'", alias)
}

return alias, nil
}

func NormalizeCqlIdentifier(identifier string) string {
if IsQuotedIdentifier(identifier) {
return TrimDoubleQuotes(identifier)
}
return strings.ToLower(identifier)
}

func IsQuotedIdentifier(identifier string) bool {
return strings.HasPrefix(identifier, "\"") && strings.HasSuffix(identifier, "\"")
}

func ConvertStrictConditionsToRowKeyValues(table *schemaMapping.TableSchema, conditions []types.Condition) ([]types.DynamicValue, error) {
if len(conditions) > len(table.PrimaryKeys) {
return nil, fmt.Errorf("only primary keys supported in where clause")
Expand Down
20 changes: 12 additions & 8 deletions ...tion-tools/cassandra-bigtable-proxy/translators/select_translator/select_query_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,14 @@ func createBtqlSelectClause(tableConfig *sm.TableSchema, s *types.SelectClause,
return strings.Join(columns, ", "), nil
}

func formatBtqlAlias(alias string) string {
return "`" + strings.NewReplacer("\\", "\\\\", "`", "\\`").Replace(alias) + "`"
}

func createBtqlFunc(col types.SelectedColumn, tableConfig *sm.TableSchema) (string, error) {
if col.Func == types.FuncCodeCount && col.ColumnName == "*" {
if col.Alias != "" {
return "count(*) as " + col.Alias, nil
return "count(*) as " + formatBtqlAlias(col.Alias), nil
}
return "count(*)", nil
}
Expand All @@ -56,7 +60,7 @@ func createBtqlFunc(col types.SelectedColumn, tableConfig *sm.TableSchema) (stri
if col.Func == types.FuncCodeWriteTime {
// todo what about collections?
if col.Alias != "" {
return fmt.Sprintf("UNIX_MICROS(WRITE_TIMESTAMP(%s, '%s')) AS %s", colMeta.ColumnFamily, colMeta.Name, col.Alias), nil
return fmt.Sprintf("UNIX_MICROS(WRITE_TIMESTAMP(%s, '%s')) AS %s", colMeta.ColumnFamily, colMeta.Name, formatBtqlAlias(col.Alias)), nil
}
return fmt.Sprintf("UNIX_MICROS(WRITE_TIMESTAMP(%s, '%s'))", colMeta.ColumnFamily, colMeta.Name), nil
}
Expand All @@ -67,14 +71,14 @@ func createBtqlFunc(col types.SelectedColumn, tableConfig *sm.TableSchema) (stri
return "", err
}
if col.Alias != "" {
return fmt.Sprintf("%s AS %s", castValue, col.Alias), nil
return fmt.Sprintf("%s AS %s", castValue, formatBtqlAlias(col.Alias)), nil
}
return castValue, nil
}

if col.Func == types.FuncCodeNow {
if col.Alias != "" {
return "CURRENT_TIMESTAMP() AS " + col.Alias, nil // CURRENT_TIMESTAMP returns a timestamp, we'll convert it to UUID in result processor if needed, but it's better to return raw bits if we can.
return "CURRENT_TIMESTAMP() AS " + formatBtqlAlias(col.Alias), nil // CURRENT_TIMESTAMP returns a timestamp, we'll convert it to UUID in result processor if needed, but it's better to return raw bits if we can.
}
return "CURRENT_TIMESTAMP()", nil
}
Expand All @@ -86,7 +90,7 @@ func createBtqlFunc(col types.SelectedColumn, tableConfig *sm.TableSchema) (stri
column := fmt.Sprintf("%s(%s)", col.Func.String(), castValue)

if col.Alias != "" {
column = column + " as " + col.Alias
column = column + " as " + formatBtqlAlias(col.Alias)
}

return column, nil
Expand Down Expand Up @@ -115,7 +119,7 @@ func createBtqlSelectCol(tableConfig *sm.TableSchema, selectedColumn types.Selec
}

if selectedColumn.Alias != "" {
sql = fmt.Sprintf("%s as %s", sql, selectedColumn.Alias)
sql = fmt.Sprintf("%s as %s", sql, formatBtqlAlias(selectedColumn.Alias))
}
return sql, nil
}
Expand Down Expand Up @@ -195,7 +199,7 @@ func createBigtableSql(t *SelectTranslator, st *types.PreparedSelectQuery) (stri
for _, col := range st.GroupByColumns {
lookupCol := col
if _, ok := aliasToColumn[col]; ok {
groupByKeys = append(groupByKeys, col)
groupByKeys = append(groupByKeys, formatBtqlAlias(col))
} else {
if colMeta, ok := tableConfig.Columns[types.ColumnName(lookupCol)]; ok {
if !colMeta.CQLType.IsCollection() {
Expand All @@ -218,7 +222,7 @@ func createBigtableSql(t *SelectTranslator, st *types.PreparedSelectQuery) (stri
for _, orderByCol := range st.OrderBy.Columns {
lookupCol := orderByCol.Column
if _, ok := aliasToColumn[orderByCol.Column]; ok {
orderByClauses = append(orderByClauses, orderByCol.Column+" "+string(orderByCol.Operation))
orderByClauses = append(orderByClauses, formatBtqlAlias(orderByCol.Column)+" "+string(orderByCol.Operation))
} else {
if colMeta, ok := tableConfig.Columns[types.ColumnName(lookupCol)]; ok {
if colMeta.IsPrimaryKey {
Expand Down
Loading