fix: make sure string literals as columns are handled well

Signed-off-by: Andres Taylor <andres@planetscale.com>
vitessio · Apr 30, 2024 · 0816b98 · 0816b98
1 parent 9dd26be
commit 0816b98
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/go/vt/sqlparser/ast_funcs.go b/go/vt/sqlparser/ast_funcs.go
@@ -2194,8 +2194,13 @@ func (ae *AliasedExpr) ColumnName() string {
  return ae.As.String()
  }
 
- if col, ok := ae.Expr.(*ColName); ok {
- return col.Name.String()
+ switch node := ae.Expr.(type) {
+ case *ColName:
+ return node.Name.String()
+ case *Literal:
+ if node.Type == StrVal {
+ return node.Val
+ }
  }
 
  return String(ae.Expr)

diff --git a/go/vt/vtgate/planbuilder/testdata/union_cases.json b/go/vt/vtgate/planbuilder/testdata/union_cases.json
@@ -601,8 +601,8 @@
  "Name": "user",
  "Sharded": true
  },
- "FieldQuery": "select dt.c0 as `'b'`, dt.c1 as `'c'`, weight_string(dt.c0), weight_string(dt.c1) from (select 'b', 'c' from `user` where 1 != 1) as dt(c0, c1) where 1 != 1",
- "Query": "select dt.c0 as `'b'`, dt.c1 as `'c'`, weight_string(dt.c0), weight_string(dt.c1) from (select distinct 'b', 'c' from `user`) as dt(c0, c1)",
+ "FieldQuery": "select dt.c0 as b, dt.c1 as c, weight_string(dt.c0), weight_string(dt.c1) from (select 'b', 'c' from `user` where 1 != 1) as dt(c0, c1) where 1 != 1",
+ "Query": "select dt.c0 as b, dt.c1 as c, weight_string(dt.c0), weight_string(dt.c1) from (select distinct 'b', 'c' from `user`) as dt(c0, c1)",
  "Table": "`user`"
  }
  ]
@@ -639,8 +639,8 @@
  "Name": "user",
  "Sharded": true
  },
- "FieldQuery": "select dt.c0 as `'b'`, dt.c1 as `'c'`, weight_string(dt.c0), weight_string(dt.c1) from (select 'b', 'c' from `user` where 1 != 1) as dt(c0, c1) where 1 != 1",
- "Query": "select dt.c0 as `'b'`, dt.c1 as `'c'`, weight_string(dt.c0), weight_string(dt.c1) from (select distinct 'b', 'c' from `user`) as dt(c0, c1)",
+ "FieldQuery": "select dt.c0 as b, dt.c1 as c, weight_string(dt.c0), weight_string(dt.c1) from (select 'b', 'c' from `user` where 1 != 1) as dt(c0, c1) where 1 != 1",
+ "Query": "select dt.c0 as b, dt.c1 as c, weight_string(dt.c0), weight_string(dt.c1) from (select distinct 'b', 'c' from `user`) as dt(c0, c1)",
  "Table": "`user`"
  },
  {