Skip to content

Commit

Permalink
Merge pull request #390 from dolthub/daylon/comparisons
Browse files Browse the repository at this point in the history
Added comparison operators
  • Loading branch information
Hydrocharged authored Jun 15, 2024
2 parents ecdf387 + 60a81e5 commit 643b270
Show file tree
Hide file tree
Showing 14 changed files with 5,746 additions and 159 deletions.
125 changes: 0 additions & 125 deletions server/analyzer/comparison_casts.go

This file was deleted.

2 changes: 0 additions & 2 deletions server/analyzer/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (

const (
ruleId_TypeSanitizer analyzer.RuleId = iota + 1000
ruleId_ComparisonCasts
ruleId_AssignInsertCasts
ruleId_AssignUpdateCasts
ruleId_ReplaceSerial
Expand All @@ -35,7 +34,6 @@ func Init() {
analyzer.AlwaysBeforeDefault = append(analyzer.AlwaysBeforeDefault,
analyzer.Rule{Id: ruleId_TypeSanitizer, Apply: TypeSanitizer},
getAnalyzerRule(analyzer.OnceBeforeDefault, analyzer.ValidateColumnDefaultsId),
analyzer.Rule{Id: ruleId_ComparisonCasts, Apply: ComparisonCasts},
analyzer.Rule{Id: ruleId_AssignInsertCasts, Apply: AssignInsertCasts},
analyzer.Rule{Id: ruleId_AssignUpdateCasts, Apply: AssignUpdateCasts},
)
Expand Down
92 changes: 61 additions & 31 deletions server/ast/expr.go
Original file line number Diff line number Diff line change
Expand Up @@ -294,24 +294,49 @@ func nodeExpr(node tree.Expr) (vitess.Expr, error) {
var operator string
switch node.Operator {
case tree.EQ:
operator = vitess.EqualStr
return vitess.InjectedExpr{
Expression: pgexprs.NewBinaryOperator(framework.Operator_BinaryEqual),
Children: vitess.Exprs{left, right},
}, nil
case tree.LT:
operator = vitess.LessThanStr
return vitess.InjectedExpr{
Expression: pgexprs.NewBinaryOperator(framework.Operator_BinaryLessThan),
Children: vitess.Exprs{left, right},
}, nil
case tree.GT:
operator = vitess.GreaterThanStr
return vitess.InjectedExpr{
Expression: pgexprs.NewBinaryOperator(framework.Operator_BinaryGreaterThan),
Children: vitess.Exprs{left, right},
}, nil
case tree.LE:
operator = vitess.LessEqualStr
return vitess.InjectedExpr{
Expression: pgexprs.NewBinaryOperator(framework.Operator_BinaryLessOrEqual),
Children: vitess.Exprs{left, right},
}, nil
case tree.GE:
operator = vitess.GreaterEqualStr
return vitess.InjectedExpr{
Expression: pgexprs.NewBinaryOperator(framework.Operator_BinaryGreaterOrEqual),
Children: vitess.Exprs{left, right},
}, nil
case tree.NE:
operator = vitess.NotEqualStr
return vitess.InjectedExpr{
Expression: pgexprs.NewBinaryOperator(framework.Operator_BinaryNotEqual),
Children: vitess.Exprs{left, right},
}, nil
case tree.In:
return vitess.InjectedExpr{
Expression: pgexprs.NewInTuple(),
Children: vitess.Exprs{left, right},
}, nil
case tree.NotIn:
operator = vitess.NotInStr
innerExpr := vitess.InjectedExpr{
Expression: pgexprs.NewInTuple(),
Children: vitess.Exprs{left, right},
}
return vitess.InjectedExpr{
Expression: pgexprs.NewNot(),
Children: vitess.Exprs{innerExpr},
}, nil
case tree.Like:
operator = vitess.LikeStr
case tree.NotLike:
Expand Down Expand Up @@ -538,10 +563,6 @@ func nodeExpr(node tree.Expr) (vitess.Expr, error) {
mysqlBindVarIdx := node.Idx + 1
return vitess.NewValArg([]byte(fmt.Sprintf(":v%d", mysqlBindVarIdx))), nil
case *tree.RangeCond:
operator := vitess.BetweenStr
if node.Not {
operator = vitess.NotBetweenStr
}
left, err := nodeExpr(node.Left)
if err != nil {
return nil, err
Expand All @@ -554,29 +575,38 @@ func nodeExpr(node tree.Expr) (vitess.Expr, error) {
if err != nil {
return nil, err
}
retExpr := vitess.Expr(&vitess.AndExpr{
Left: vitess.InjectedExpr{
Expression: pgexprs.NewBinaryOperator(framework.Operator_BinaryGreaterOrEqual),
Children: vitess.Exprs{left, from},
},
Right: vitess.InjectedExpr{
Expression: pgexprs.NewBinaryOperator(framework.Operator_BinaryLessOrEqual),
Children: vitess.Exprs{left, to},
},
})
if node.Symmetric {
return &vitess.OrExpr{
Left: &vitess.RangeCond{
Operator: operator,
Left: left,
From: from,
To: to,
retExpr = &vitess.OrExpr{
Left: retExpr,
Right: &vitess.AndExpr{
Left: vitess.InjectedExpr{
Expression: pgexprs.NewBinaryOperator(framework.Operator_BinaryGreaterOrEqual),
Children: vitess.Exprs{left, to},
},
Right: vitess.InjectedExpr{
Expression: pgexprs.NewBinaryOperator(framework.Operator_BinaryLessOrEqual),
Children: vitess.Exprs{left, from},
},
},
Right: &vitess.RangeCond{
Operator: operator,
Left: left,
From: to,
To: from,
},
}, nil
} else {
return &vitess.RangeCond{
Operator: operator,
Left: left,
From: from,
To: to,
}, nil
}
}
if node.Not {
retExpr = vitess.InjectedExpr{
Expression: pgexprs.NewNot(),
Children: vitess.Exprs{retExpr},
}
}
return retExpr, nil
case *tree.StrVal:
//TODO: determine what to do when node.WasScannedAsBytes() is true
stringLiteral := pgexprs.NewStringLiteral(node.RawString())
Expand Down
109 changes: 109 additions & 0 deletions server/expression/not.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
// Copyright 2024 Dolthub, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package expression

import (
"fmt"

"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/go-mysql-server/sql/expression"
vitess "github.com/dolthub/vitess/go/vt/sqlparser"

pgtypes "github.com/dolthub/doltgresql/server/types"
)

// Not represents a NOT expression.
type Not struct {
child sql.Expression
}

var _ vitess.Injectable = (*BinaryOperator)(nil)
var _ sql.Expression = (*BinaryOperator)(nil)
var _ expression.BinaryExpression = (*BinaryOperator)(nil)

// NewNot returns a new *Not.
func NewNot() *Not {
return &Not{
child: nil,
}
}

// Children implements the sql.Expression interface.
func (n *Not) Children() []sql.Expression {
return []sql.Expression{n.child}
}

// Eval implements the sql.Expression interface.
func (n *Not) Eval(ctx *sql.Context, row sql.Row) (any, error) {
val, err := n.child.Eval(ctx, row)
if err != nil {
return nil, err
}
if val == nil {
return nil, nil
}
boolVal, ok := val.(bool)
if !ok {
return nil, fmt.Errorf("NOT only applies to boolean values")
}
return !boolVal, nil
}

// IsNullable implements the sql.Expression interface.
func (n *Not) IsNullable() bool {
return true
}

// Resolved implements the sql.Expression interface.
func (n *Not) Resolved() bool {
return n.child != nil && n.child.Resolved()
}

// String implements the sql.Expression interface.
func (n *Not) String() string {
if n.child == nil {
return "NOT ?"
}
return "NOT " + n.child.String()
}

// Type implements the sql.Expression interface.
func (n *Not) Type() sql.Type {
return pgtypes.Bool
}

// WithChildren implements the sql.Expression interface.
func (n *Not) WithChildren(children ...sql.Expression) (sql.Expression, error) {
if len(children) != 1 {
return nil, sql.ErrInvalidChildrenNumber.New(n, len(children), 1)
}
return &Not{
child: children[0],
}, nil
}

// WithResolvedChildren implements the vitess.InjectableExpression interface.
func (n *Not) WithResolvedChildren(children []any) (any, error) {
if len(children) != 1 {
return nil, fmt.Errorf("invalid vitess child count, expected `1` but got `%d`", len(children))
}
child, ok := children[0].(sql.Expression)
if !ok {
return nil, fmt.Errorf("expected vitess child to be an expression but has type `%T`", children[0])
}
return &Not{
child: child,
}, nil
}
Loading

0 comments on commit 643b270

Please sign in to comment.