Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
11 changes: 8 additions & 3 deletions enginetest/queries/queries.go
Original file line number Diff line number Diff line change
Expand Up @@ -10146,7 +10146,6 @@ from typestable`,
{uint32(1000)},
},
},

{
Query: `select distinct pk1 from two_pk order by pk1`,
Expected: []sql.Row{
Expand Down Expand Up @@ -10255,14 +10254,12 @@ from typestable`,
{""},
},
},

{
Query: "select @@sql_mode = 1",
Expected: []sql.Row{
{false},
},
},

{
Query: "explain select 1",
SkipServerEngine: true,
Expand Down Expand Up @@ -10290,6 +10287,14 @@ from typestable`,
{" └─ name: "},
},
},
{
Query: "select quote(i), quote(s) from mytable",
Expected: []sql.Row{
{"'1'", "'first row'"},
{"'2'", "'second row'"},
{"'3'", "'third row'"},
},
},
}

var KeylessQueries = []QueryTest{
Expand Down
1 change: 1 addition & 0 deletions sql/expression/function/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ var BuiltIns = []sql.Function{
sql.Function2{Name: "pow", Fn: NewPower},
sql.Function2{Name: "power", Fn: NewPower},
sql.Function1{Name: "quarter", Fn: NewQuarter},
sql.Function1{Name: "quote", Fn: NewQuote},
sql.Function1{Name: "radians", Fn: NewRadians},
sql.FunctionN{Name: "rand", Fn: NewRand},
sql.FunctionN{Name: "regexp_instr", Fn: NewRegexpInstr},
Expand Down
53 changes: 53 additions & 0 deletions sql/expression/function/string.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package function

import (
"bytes"
"encoding/hex"
"fmt"
"math"
Expand Down Expand Up @@ -614,3 +615,55 @@ func (h *Bitlength) WithChildren(children ...sql.Expression) (sql.Expression, er
}
return NewBitlength(children[0]), nil
}

type Quote struct {
*UnaryFunc
}

var _ sql.FunctionExpression = (*Bitlength)(nil)
var _ sql.CollationCoercible = (*Bitlength)(nil)

func NewQuote(arg sql.Expression) sql.Expression {
return &Quote{UnaryFunc: NewUnaryFunc(arg, "QUOTE", types.Text)}
}

func (q *Quote) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
arg, err := q.EvalChild(ctx, row)
if err != nil {
return nil, err
}

val, _, err := types.Blob.Convert(ctx, arg)
if err != nil {
return nil, err
}
if val == nil {
return nil, nil
}
valBytes := val.([]byte)

ret := new(bytes.Buffer)
ret.WriteByte('\'')
for _, c := range valBytes {
switch c {
// '\032' is CTRL+Z character
case '\\', '\'', '\032':
ret.WriteByte('\\')
ret.WriteByte(c)
case '\000':
ret.WriteByte('\\')
ret.WriteByte('0')
default:
ret.WriteByte(c)
}
}
ret.WriteByte('\'')
return ret.String(), nil
}

func (q *Quote) WithChildren(children ...sql.Expression) (sql.Expression, error) {
if len(children) != 1 {
return nil, sql.ErrInvalidChildrenNumber.New(q, len(children), 1)
}
return NewQuote(children[0]), nil
}
12 changes: 12 additions & 0 deletions sql/expression/function/string_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,15 @@ func TestBitLength(t *testing.T) {
tf.AddSucceeding(128, time.Now())
tf.Test(t, nil, nil)
}

func TestQuote(t *testing.T) {
f := sql.Function1{Name: "quote", Fn: NewQuote}
tf := NewTestFactory(f.Fn)
tf.AddSucceeding(nil, nil)
tf.AddSucceeding("'test'", "test")
tf.AddSucceeding("'0'", false)
tf.AddSucceeding("'1'", true)
tf.AddSucceeding("'12345'", 12345)
tf.AddSucceeding("'\\\\, \\', \\0, \\\032'", "\\, ', \000, \032")
tf.Test(t, nil, nil)
}
Loading