From ca1a248d7a752d88f5162b3df9c61009f1ee69f2 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Mon, 6 Sep 2021 19:55:41 -0700 Subject: [PATCH] engine/mysql: Add support for LIKE --- .../testdata/pattern_matching/mysql/go/db.go | 29 +++++++++++++++ .../pattern_matching/mysql/go/models.go | 11 ++++++ .../pattern_matching/mysql/go/query.sql.go | 36 +++++++++++++++++++ .../testdata/pattern_matching/mysql/query.sql | 4 +++ .../testdata/pattern_matching/mysql/sqlc.json | 12 +++++++ .../pattern_matching/postgresql/go/db.go | 29 +++++++++++++++ .../pattern_matching/postgresql/go/models.go | 11 ++++++ .../postgresql/go/query.sql.go | 36 +++++++++++++++++++ .../pattern_matching/postgresql/query.sql | 4 +++ .../pattern_matching/postgresql/sqlc.json | 12 +++++++ internal/engine/dolphin/convert.go | 11 +++++- 11 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 internal/endtoend/testdata/pattern_matching/mysql/go/db.go create mode 100644 internal/endtoend/testdata/pattern_matching/mysql/go/models.go create mode 100644 internal/endtoend/testdata/pattern_matching/mysql/go/query.sql.go create mode 100644 internal/endtoend/testdata/pattern_matching/mysql/query.sql create mode 100644 internal/endtoend/testdata/pattern_matching/mysql/sqlc.json create mode 100644 internal/endtoend/testdata/pattern_matching/postgresql/go/db.go create mode 100644 internal/endtoend/testdata/pattern_matching/postgresql/go/models.go create mode 100644 internal/endtoend/testdata/pattern_matching/postgresql/go/query.sql.go create mode 100644 internal/endtoend/testdata/pattern_matching/postgresql/query.sql create mode 100644 internal/endtoend/testdata/pattern_matching/postgresql/sqlc.json diff --git a/internal/endtoend/testdata/pattern_matching/mysql/go/db.go b/internal/endtoend/testdata/pattern_matching/mysql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/pattern_matching/mysql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/pattern_matching/mysql/go/models.go b/internal/endtoend/testdata/pattern_matching/mysql/go/models.go new file mode 100644 index 0000000000..bef773dc9a --- /dev/null +++ b/internal/endtoend/testdata/pattern_matching/mysql/go/models.go @@ -0,0 +1,11 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Pet struct { + Name sql.NullString +} diff --git a/internal/endtoend/testdata/pattern_matching/mysql/go/query.sql.go b/internal/endtoend/testdata/pattern_matching/mysql/go/query.sql.go new file mode 100644 index 0000000000..a1b3f7b76e --- /dev/null +++ b/internal/endtoend/testdata/pattern_matching/mysql/go/query.sql.go @@ -0,0 +1,36 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const petsByName = `-- name: PetsByName :many +SELECT name FROM pet WHERE name LIKE ? +` + +func (q *Queries) PetsByName(ctx context.Context, name sql.NullString) ([]sql.NullString, error) { + rows, err := q.db.QueryContext(ctx, petsByName, name) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullString + for rows.Next() { + var name sql.NullString + if err := rows.Scan(&name); err != nil { + return nil, err + } + items = append(items, name) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/pattern_matching/mysql/query.sql b/internal/endtoend/testdata/pattern_matching/mysql/query.sql new file mode 100644 index 0000000000..57bbcd0287 --- /dev/null +++ b/internal/endtoend/testdata/pattern_matching/mysql/query.sql @@ -0,0 +1,4 @@ +CREATE TABLE pet (name text); + +-- name: PetsByName :many +SELECT * FROM pet WHERE name LIKE ?; diff --git a/internal/endtoend/testdata/pattern_matching/mysql/sqlc.json b/internal/endtoend/testdata/pattern_matching/mysql/sqlc.json new file mode 100644 index 0000000000..0657f4db83 --- /dev/null +++ b/internal/endtoend/testdata/pattern_matching/mysql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "engine": "mysql", + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/pattern_matching/postgresql/go/db.go b/internal/endtoend/testdata/pattern_matching/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/pattern_matching/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/pattern_matching/postgresql/go/models.go b/internal/endtoend/testdata/pattern_matching/postgresql/go/models.go new file mode 100644 index 0000000000..bef773dc9a --- /dev/null +++ b/internal/endtoend/testdata/pattern_matching/postgresql/go/models.go @@ -0,0 +1,11 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Pet struct { + Name sql.NullString +} diff --git a/internal/endtoend/testdata/pattern_matching/postgresql/go/query.sql.go b/internal/endtoend/testdata/pattern_matching/postgresql/go/query.sql.go new file mode 100644 index 0000000000..10e2e2c3ff --- /dev/null +++ b/internal/endtoend/testdata/pattern_matching/postgresql/go/query.sql.go @@ -0,0 +1,36 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const petsByName = `-- name: PetsByName :many +SELECT name FROM pet WHERE name LIKE $1 +` + +func (q *Queries) PetsByName(ctx context.Context, name sql.NullString) ([]sql.NullString, error) { + rows, err := q.db.QueryContext(ctx, petsByName, name) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullString + for rows.Next() { + var name sql.NullString + if err := rows.Scan(&name); err != nil { + return nil, err + } + items = append(items, name) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/pattern_matching/postgresql/query.sql b/internal/endtoend/testdata/pattern_matching/postgresql/query.sql new file mode 100644 index 0000000000..083695e5f2 --- /dev/null +++ b/internal/endtoend/testdata/pattern_matching/postgresql/query.sql @@ -0,0 +1,4 @@ +CREATE TABLE pet (name text); + +-- name: PetsByName :many +SELECT * FROM pet WHERE name LIKE $1; diff --git a/internal/endtoend/testdata/pattern_matching/postgresql/sqlc.json b/internal/endtoend/testdata/pattern_matching/postgresql/sqlc.json new file mode 100644 index 0000000000..de427d069f --- /dev/null +++ b/internal/endtoend/testdata/pattern_matching/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "engine": "postgresql", + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/engine/dolphin/convert.go b/internal/engine/dolphin/convert.go index 94d9c1b8f9..e27752cfd0 100644 --- a/internal/engine/dolphin/convert.go +++ b/internal/engine/dolphin/convert.go @@ -880,7 +880,16 @@ func (c *cc) convertPatternInExpr(n *pcast.PatternInExpr) ast.Node { } func (c *cc) convertPatternLikeExpr(n *pcast.PatternLikeExpr) ast.Node { - return todo(n) + return &ast.A_Expr{ + Kind: ast.A_Expr_Kind(9), + Name: &ast.List{ + Items: []ast.Node{ + &ast.String{Str: "~~"}, + }, + }, + Lexpr: c.convert(n.Expr), + Rexpr: c.convert(n.Pattern), + } } func (c *cc) convertPatternRegexpExpr(n *pcast.PatternRegexpExpr) ast.Node {