From 1f6f3226768ba5132c13819098437775d50c264f Mon Sep 17 00:00:00 2001 From: Richard Bailey Date: Fri, 5 Mar 2021 17:30:42 -0800 Subject: [PATCH] Resolve merge / backport conflicts Signed-off-by: Richard Bailey --- go/vt/vtctl/workflow/vexec/query_planner.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/go/vt/vtctl/workflow/vexec/query_planner.go b/go/vt/vtctl/workflow/vexec/query_planner.go index 74dfbb2a876..a850cc9816a 100644 --- a/go/vt/vtctl/workflow/vexec/query_planner.go +++ b/go/vt/vtctl/workflow/vexec/query_planner.go @@ -265,14 +265,14 @@ func addDefaultWheres(planner QueryPlanner, where *sqlparser.Where) *sqlparser.W Left: &sqlparser.ColName{ Name: sqlparser.NewColIdent(params.DBNameColumn), }, - Operator: sqlparser.EqualStr, - Right: sqlparser.NewStrVal([]byte(params.DBName)), + Operator: sqlparser.EqualOp, + Right: sqlparser.NewStrLiteral([]byte(params.DBName)), } switch newWhere { case nil: newWhere = &sqlparser.Where{ - Type: sqlparser.WhereStr, + Type: sqlparser.WhereClause, Expr: expr, } default: @@ -288,8 +288,8 @@ func addDefaultWheres(planner QueryPlanner, where *sqlparser.Where) *sqlparser.W Left: &sqlparser.ColName{ Name: sqlparser.NewColIdent(params.WorkflowColumn), }, - Operator: sqlparser.EqualStr, - Right: sqlparser.NewStrVal([]byte(params.Workflow)), + Operator: sqlparser.EqualOp, + Right: sqlparser.NewStrLiteral([]byte(params.Workflow)), } newWhere.Expr = &sqlparser.AndExpr{