From 70400d51814d39060f16f85117cf35904ded6689 Mon Sep 17 00:00:00 2001 From: Kazuyuki Honda Date: Thu, 4 Aug 2022 05:31:49 +0900 Subject: [PATCH] feat(sqlite) add support subquery and table function --- .../sqlite/go/db.go | 31 ++++++++ .../sqlite/go/models.go | 14 ++++ .../sqlite/go/query.sql.go | 37 +++++++++ .../sqlite/query.sql | 4 + .../sqlite/sqlc.json | 12 +++ .../table_function/postgresql/pgx/go/db.go | 32 ++++++++ .../postgresql/pgx/go/models.go | 14 ++++ .../postgresql/pgx/go/query.sql.go | 56 ++++++++++++++ .../table_function/postgresql/pgx/query.sql | 20 +++++ .../table_function/postgresql/pgx/sqlc.json | 13 ++++ .../table_function/postgresql/stdlib/go/db.go | 31 ++++++++ .../postgresql/stdlib/go/models.go | 14 ++++ .../postgresql/stdlib/go/query.sql.go | 59 ++++++++++++++ .../postgresql/stdlib/query.sql | 20 +++++ .../postgresql/stdlib/sqlc.json | 12 +++ .../testdata/table_function/sqlite/go/db.go | 31 ++++++++ .../table_function/sqlite/go/models.go | 13 ++++ .../table_function/sqlite/go/query.sql.go | 59 ++++++++++++++ .../testdata/table_function/sqlite/query.sql | 19 +++++ .../testdata/table_function/sqlite/sqlc.json | 12 +++ internal/engine/sqlite/convert.go | 76 +++++++++++++++---- 21 files changed, 563 insertions(+), 16 deletions(-) create mode 100644 internal/endtoend/testdata/subquery_calculated_column/sqlite/go/db.go create mode 100644 internal/endtoend/testdata/subquery_calculated_column/sqlite/go/models.go create mode 100644 internal/endtoend/testdata/subquery_calculated_column/sqlite/go/query.sql.go create mode 100644 internal/endtoend/testdata/subquery_calculated_column/sqlite/query.sql create mode 100644 internal/endtoend/testdata/subquery_calculated_column/sqlite/sqlc.json create mode 100644 internal/endtoend/testdata/table_function/postgresql/pgx/go/db.go create mode 100644 internal/endtoend/testdata/table_function/postgresql/pgx/go/models.go create mode 100644 internal/endtoend/testdata/table_function/postgresql/pgx/go/query.sql.go create mode 100644 internal/endtoend/testdata/table_function/postgresql/pgx/query.sql create mode 100644 internal/endtoend/testdata/table_function/postgresql/pgx/sqlc.json create mode 100644 internal/endtoend/testdata/table_function/postgresql/stdlib/go/db.go create mode 100644 internal/endtoend/testdata/table_function/postgresql/stdlib/go/models.go create mode 100644 internal/endtoend/testdata/table_function/postgresql/stdlib/go/query.sql.go create mode 100644 internal/endtoend/testdata/table_function/postgresql/stdlib/query.sql create mode 100644 internal/endtoend/testdata/table_function/postgresql/stdlib/sqlc.json create mode 100644 internal/endtoend/testdata/table_function/sqlite/go/db.go create mode 100644 internal/endtoend/testdata/table_function/sqlite/go/models.go create mode 100644 internal/endtoend/testdata/table_function/sqlite/go/query.sql.go create mode 100644 internal/endtoend/testdata/table_function/sqlite/query.sql create mode 100644 internal/endtoend/testdata/table_function/sqlite/sqlc.json diff --git a/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/db.go b/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/db.go new file mode 100644 index 0000000000..19557a6a5a --- /dev/null +++ b/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 + +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/subquery_calculated_column/sqlite/go/models.go b/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/models.go new file mode 100644 index 0000000000..04c0d2ab79 --- /dev/null +++ b/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/models.go @@ -0,0 +1,14 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + A sql.NullInt64 + B sql.NullInt64 +} diff --git a/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/query.sql.go b/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/query.sql.go new file mode 100644 index 0000000000..c451758a89 --- /dev/null +++ b/internal/endtoend/testdata/subquery_calculated_column/sqlite/go/query.sql.go @@ -0,0 +1,37 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const subqueryCalcColumn = `-- name: SubqueryCalcColumn :many +SELECT sum FROM (SELECT a + b AS sum FROM foo) AS f +` + +func (q *Queries) SubqueryCalcColumn(ctx context.Context) ([]int64, error) { + rows, err := q.db.QueryContext(ctx, subqueryCalcColumn) + if err != nil { + return nil, err + } + defer rows.Close() + var items []int64 + for rows.Next() { + var sum int64 + if err := rows.Scan(&sum); err != nil { + return nil, err + } + items = append(items, sum) + } + 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/subquery_calculated_column/sqlite/query.sql b/internal/endtoend/testdata/subquery_calculated_column/sqlite/query.sql new file mode 100644 index 0000000000..7e1281cc8e --- /dev/null +++ b/internal/endtoend/testdata/subquery_calculated_column/sqlite/query.sql @@ -0,0 +1,4 @@ +CREATE TABLE foo (a int, b int); + +-- name: SubqueryCalcColumn :many +SELECT sum FROM (SELECT a + b AS sum FROM foo) AS f; diff --git a/internal/endtoend/testdata/subquery_calculated_column/sqlite/sqlc.json b/internal/endtoend/testdata/subquery_calculated_column/sqlite/sqlc.json new file mode 100644 index 0000000000..fcb288cb35 --- /dev/null +++ b/internal/endtoend/testdata/subquery_calculated_column/sqlite/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "sqlite", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} \ No newline at end of file diff --git a/internal/endtoend/testdata/table_function/postgresql/pgx/go/db.go b/internal/endtoend/testdata/table_function/postgresql/pgx/go/db.go new file mode 100644 index 0000000000..6c6a7eb822 --- /dev/null +++ b/internal/endtoend/testdata/table_function/postgresql/pgx/go/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 + +package querytest + +import ( + "context" + + "github.com/jackc/pgconn" + "github.com/jackc/pgx/v4" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/table_function/postgresql/pgx/go/models.go b/internal/endtoend/testdata/table_function/postgresql/pgx/go/models.go new file mode 100644 index 0000000000..dc207d91b6 --- /dev/null +++ b/internal/endtoend/testdata/table_function/postgresql/pgx/go/models.go @@ -0,0 +1,14 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 + +package querytest + +import () + +type Transaction struct { + ID int64 + Uri string + ProgramID string + Data string +} diff --git a/internal/endtoend/testdata/table_function/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/table_function/postgresql/pgx/go/query.sql.go new file mode 100644 index 0000000000..abc5bd9b83 --- /dev/null +++ b/internal/endtoend/testdata/table_function/postgresql/pgx/go/query.sql.go @@ -0,0 +1,56 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const getTransaction = `-- name: GetTransaction :many +SELECT + json_extract(transactions.data, '$.transaction.signatures[0]'), + json_group_array(instructions.value) +FROM + transactions, + json_each(json_extract(transactions.data, '$.transaction.message.instructions')) AS instructions +WHERE + transactions.program_id = $1 + AND json_extract(transactions.data, '$.transaction.signatures[0]') > $2 + AND json_extract(json_extract(transactions.data, '$.transaction.message.accountKeys'), '$[' || json_extract(instructions.value, '$.programIdIndex') || ']') = transactions.program_id +GROUP BY transactions.id +LIMIT $3 +` + +type GetTransactionParams struct { + ProgramID string + Data string + Limit int32 +} + +type GetTransactionRow struct { + JsonExtract interface{} + JsonGroupArray interface{} +} + +func (q *Queries) GetTransaction(ctx context.Context, arg GetTransactionParams) ([]GetTransactionRow, error) { + rows, err := q.db.Query(ctx, getTransaction, arg.ProgramID, arg.Data, arg.Limit) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetTransactionRow + for rows.Next() { + var i GetTransactionRow + if err := rows.Scan(&i.JsonExtract, &i.JsonGroupArray); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/table_function/postgresql/pgx/query.sql b/internal/endtoend/testdata/table_function/postgresql/pgx/query.sql new file mode 100644 index 0000000000..0fbe85cbac --- /dev/null +++ b/internal/endtoend/testdata/table_function/postgresql/pgx/query.sql @@ -0,0 +1,20 @@ +CREATE TABLE transactions ( + id BIGSERIAL PRIMARY KEY, + uri text NOT NULL, + program_id text NOT NULL, + data text NOT NULL +); + +/* name: GetTransaction :many */ +SELECT + json_extract(transactions.data, '$.transaction.signatures[0]'), + json_group_array(instructions.value) +FROM + transactions, + json_each(json_extract(transactions.data, '$.transaction.message.instructions')) AS instructions +WHERE + transactions.program_id = $1 + AND json_extract(transactions.data, '$.transaction.signatures[0]') > $2 + AND json_extract(json_extract(transactions.data, '$.transaction.message.accountKeys'), '$[' || json_extract(instructions.value, '$.programIdIndex') || ']') = transactions.program_id +GROUP BY transactions.id +LIMIT $3; \ No newline at end of file diff --git a/internal/endtoend/testdata/table_function/postgresql/pgx/sqlc.json b/internal/endtoend/testdata/table_function/postgresql/pgx/sqlc.json new file mode 100644 index 0000000000..9403bd0279 --- /dev/null +++ b/internal/endtoend/testdata/table_function/postgresql/pgx/sqlc.json @@ -0,0 +1,13 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "sql_package": "pgx/v4", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/table_function/postgresql/stdlib/go/db.go b/internal/endtoend/testdata/table_function/postgresql/stdlib/go/db.go new file mode 100644 index 0000000000..19557a6a5a --- /dev/null +++ b/internal/endtoend/testdata/table_function/postgresql/stdlib/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 + +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/table_function/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/table_function/postgresql/stdlib/go/models.go new file mode 100644 index 0000000000..dc207d91b6 --- /dev/null +++ b/internal/endtoend/testdata/table_function/postgresql/stdlib/go/models.go @@ -0,0 +1,14 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 + +package querytest + +import () + +type Transaction struct { + ID int64 + Uri string + ProgramID string + Data string +} diff --git a/internal/endtoend/testdata/table_function/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/table_function/postgresql/stdlib/go/query.sql.go new file mode 100644 index 0000000000..71dc79d8bf --- /dev/null +++ b/internal/endtoend/testdata/table_function/postgresql/stdlib/go/query.sql.go @@ -0,0 +1,59 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const getTransaction = `-- name: GetTransaction :many +SELECT + json_extract(transactions.data, '$.transaction.signatures[0]'), + json_group_array(instructions.value) +FROM + transactions, + json_each(json_extract(transactions.data, '$.transaction.message.instructions')) AS instructions +WHERE + transactions.program_id = $1 + AND json_extract(transactions.data, '$.transaction.signatures[0]') > $2 + AND json_extract(json_extract(transactions.data, '$.transaction.message.accountKeys'), '$[' || json_extract(instructions.value, '$.programIdIndex') || ']') = transactions.program_id +GROUP BY transactions.id +LIMIT $3 +` + +type GetTransactionParams struct { + ProgramID string + Data string + Limit int32 +} + +type GetTransactionRow struct { + JsonExtract interface{} + JsonGroupArray interface{} +} + +func (q *Queries) GetTransaction(ctx context.Context, arg GetTransactionParams) ([]GetTransactionRow, error) { + rows, err := q.db.QueryContext(ctx, getTransaction, arg.ProgramID, arg.Data, arg.Limit) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetTransactionRow + for rows.Next() { + var i GetTransactionRow + if err := rows.Scan(&i.JsonExtract, &i.JsonGroupArray); err != nil { + return nil, err + } + items = append(items, i) + } + 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/table_function/postgresql/stdlib/query.sql b/internal/endtoend/testdata/table_function/postgresql/stdlib/query.sql new file mode 100644 index 0000000000..94da269962 --- /dev/null +++ b/internal/endtoend/testdata/table_function/postgresql/stdlib/query.sql @@ -0,0 +1,20 @@ +CREATE TABLE transactions ( + id BIGSERIAL PRIMARY KEY, + uri text NOT NULL, + program_id text NOT NULL, + data text NOT NULL +); + +/* name: GetTransaction :many */ +SELECT + json_extract(transactions.data, '$.transaction.signatures[0]'), + json_group_array(instructions.value) +FROM + transactions, + json_each(json_extract(transactions.data, '$.transaction.message.instructions')) AS instructions +WHERE + transactions.program_id = $1 + AND json_extract(transactions.data, '$.transaction.signatures[0]') > $2 + AND json_extract(json_extract(transactions.data, '$.transaction.message.accountKeys'), '$[' || json_extract(instructions.value, '$.programIdIndex') || ']') = transactions.program_id +GROUP BY transactions.id +LIMIT $3; diff --git a/internal/endtoend/testdata/table_function/postgresql/stdlib/sqlc.json b/internal/endtoend/testdata/table_function/postgresql/stdlib/sqlc.json new file mode 100644 index 0000000000..c72b6132d5 --- /dev/null +++ b/internal/endtoend/testdata/table_function/postgresql/stdlib/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/table_function/sqlite/go/db.go b/internal/endtoend/testdata/table_function/sqlite/go/db.go new file mode 100644 index 0000000000..19557a6a5a --- /dev/null +++ b/internal/endtoend/testdata/table_function/sqlite/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 + +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/table_function/sqlite/go/models.go b/internal/endtoend/testdata/table_function/sqlite/go/models.go new file mode 100644 index 0000000000..9c161a719d --- /dev/null +++ b/internal/endtoend/testdata/table_function/sqlite/go/models.go @@ -0,0 +1,13 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 + +package querytest + +import () + +type Transaction struct { + Uri string + ProgramID string + Data string +} diff --git a/internal/endtoend/testdata/table_function/sqlite/go/query.sql.go b/internal/endtoend/testdata/table_function/sqlite/go/query.sql.go new file mode 100644 index 0000000000..0158a924b6 --- /dev/null +++ b/internal/endtoend/testdata/table_function/sqlite/go/query.sql.go @@ -0,0 +1,59 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.14.0 +// source: query.sql + +package querytest + +import ( + "context" +) + +const getTransaction = `-- name: GetTransaction :many +SELECT + json_extract(transactions.data, '$.transaction.signatures[0]'), + json_group_array(instructions.value) +FROM + transactions, + json_each(json_extract(transactions.data, '$.transaction.message.instructions')) AS instructions +WHERE + transactions.program_id = ? + AND json_extract(transactions.data, '$.transaction.signatures[0]') > ? + AND json_extract(json_extract(transactions.data, '$.transaction.message.accountKeys'), '$[' || json_extract(instructions.value, '$.programIdIndex') || ']') = transactions.program_id +GROUP BY transactions.rowid +LIMIT ? +` + +type GetTransactionParams struct { + ProgramID string + Data string + Limit int64 +} + +type GetTransactionRow struct { + JsonExtract interface{} + JsonGroupArray interface{} +} + +func (q *Queries) GetTransaction(ctx context.Context, arg GetTransactionParams) ([]GetTransactionRow, error) { + rows, err := q.db.QueryContext(ctx, getTransaction, arg.ProgramID, arg.Data, arg.Limit) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetTransactionRow + for rows.Next() { + var i GetTransactionRow + if err := rows.Scan(&i.JsonExtract, &i.JsonGroupArray); err != nil { + return nil, err + } + items = append(items, i) + } + 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/table_function/sqlite/query.sql b/internal/endtoend/testdata/table_function/sqlite/query.sql new file mode 100644 index 0000000000..bbc43dba7e --- /dev/null +++ b/internal/endtoend/testdata/table_function/sqlite/query.sql @@ -0,0 +1,19 @@ +CREATE TABLE transactions ( + uri text NOT NULL, + program_id text NOT NULL, + data text NOT NULL +); + +/* name: GetTransaction :many */ +SELECT + json_extract(transactions.data, '$.transaction.signatures[0]'), + json_group_array(instructions.value) +FROM + transactions, + json_each(json_extract(transactions.data, '$.transaction.message.instructions')) AS instructions +WHERE + transactions.program_id = ? + AND json_extract(transactions.data, '$.transaction.signatures[0]') > ? + AND json_extract(json_extract(transactions.data, '$.transaction.message.accountKeys'), '$[' || json_extract(instructions.value, '$.programIdIndex') || ']') = transactions.program_id +GROUP BY transactions.rowid +LIMIT ?; diff --git a/internal/endtoend/testdata/table_function/sqlite/sqlc.json b/internal/endtoend/testdata/table_function/sqlite/sqlc.json new file mode 100644 index 0000000000..fcb288cb35 --- /dev/null +++ b/internal/endtoend/testdata/table_function/sqlite/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "sqlite", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} \ No newline at end of file diff --git a/internal/engine/sqlite/convert.go b/internal/engine/sqlite/convert.go index b97f8e333e..fe957af979 100644 --- a/internal/engine/sqlite/convert.go +++ b/internal/engine/sqlite/convert.go @@ -658,28 +658,72 @@ func (c *cc) convertColumnNames(cols []parser.IColumn_nameContext) *ast.List { return list } -func (c *cc) convertTablesOrSubquery(tableOrSubquery []parser.ITable_or_subqueryContext) []ast.Node { +func (c *cc) convertTablesOrSubquery(n []parser.ITable_or_subqueryContext) []ast.Node { var tables []ast.Node - for _, ifrom := range tableOrSubquery { + for _, ifrom := range n { from, ok := ifrom.(*parser.Table_or_subqueryContext) if !ok { continue } - rel := from.Table_name().GetText() - name := ast.RangeVar{ - Relname: &rel, - Location: from.GetStart().GetStart(), - } - if from.Schema_name() != nil { - schema := from.Schema_name().GetText() - name.Schemaname = &schema - } - if from.Table_alias() != nil { - alias := from.Table_alias().GetText() - name.Alias = &ast.Alias{Aliasname: &alias} - } - tables = append(tables, &name) + if from.Table_name() != nil { + rel := from.Table_name().GetText() + rv := &ast.RangeVar{ + Relname: &rel, + Location: from.GetStart().GetStart(), + } + + if from.Schema_name() != nil { + schema := from.Schema_name().GetText() + rv.Schemaname = &schema + } + if from.Table_alias() != nil { + alias := from.Table_alias().GetText() + rv.Alias = &ast.Alias{Aliasname: &alias} + } + + tables = append(tables, rv) + } else if from.Table_function_name() != nil { + rel := from.Table_function_name().GetText() + rf := &ast.RangeFunction{ + Functions: &ast.List{ + Items: []ast.Node{ + &ast.FuncCall{ + Func: &ast.FuncName{ + Name: rel, + }, + Funcname: &ast.List{ + Items: []ast.Node{ + NewIdentifer(rel), + }, + }, + Args: &ast.List{ + Items: []ast.Node{&ast.TODO{}}, + }, + Location: from.GetStart().GetStart(), + }, + }, + }, + } + + if from.Table_alias() != nil { + alias := from.Table_alias().GetText() + rf.Alias = &ast.Alias{Aliasname: &alias} + } + + tables = append(tables, rf) + } else if from.Select_stmt() != nil { + rs := &ast.RangeSubselect{ + Subquery: c.convert(from.Select_stmt()), + } + + if from.Table_alias() != nil { + alias := from.Table_alias().GetText() + rs.Alias = &ast.Alias{Aliasname: &alias} + } + + tables = append(tables, rs) + } } return tables