diff --git a/internal/core/analyzer/expr.go b/internal/core/analyzer/expr.go index 62a69b273d..cb1b5905f7 100644 --- a/internal/core/analyzer/expr.go +++ b/internal/core/analyzer/expr.go @@ -32,6 +32,9 @@ func (a *analyzer) typeExpr(n ast.Node) (exprType, error) { return exprType{}, nil case *ast.TODO: + if e.UnsupportedFeature != "" { + return exprType{}, fmt.Errorf("%s is not supported", e.UnsupportedFeature) + } return exprType{}, nil case *ast.A_Const: diff --git a/internal/endtoend/testdata/analyze_modified_star/duckdb/exec.json b/internal/endtoend/testdata/analyze_modified_star/duckdb/exec.json new file mode 100644 index 0000000000..56cb4b3fff --- /dev/null +++ b/internal/endtoend/testdata/analyze_modified_star/duckdb/exec.json @@ -0,0 +1,5 @@ +{ + "command": "analyze", + "args": ["--dialect", "duckdb", "--schema", "schema.sql", "query.sql"], + "contexts": ["base"] +} diff --git a/internal/endtoend/testdata/analyze_modified_star/duckdb/query.sql b/internal/endtoend/testdata/analyze_modified_star/duckdb/query.sql new file mode 100644 index 0000000000..b9bcb3548c --- /dev/null +++ b/internal/endtoend/testdata/analyze_modified_star/duckdb/query.sql @@ -0,0 +1,5 @@ +-- name: PublicPeople :many +SELECT * EXCLUDE (secret) FROM people; + +-- name: RenumberedPeople :many +SELECT * REPLACE (id + 1 AS id) FROM people; diff --git a/internal/endtoend/testdata/analyze_modified_star/duckdb/schema.sql b/internal/endtoend/testdata/analyze_modified_star/duckdb/schema.sql new file mode 100644 index 0000000000..b66becbb84 --- /dev/null +++ b/internal/endtoend/testdata/analyze_modified_star/duckdb/schema.sql @@ -0,0 +1 @@ +CREATE TABLE people (id INTEGER, name VARCHAR, secret VARCHAR); diff --git a/internal/endtoend/testdata/analyze_modified_star/duckdb/stderr.txt b/internal/endtoend/testdata/analyze_modified_star/duckdb/stderr.txt new file mode 100644 index 0000000000..caf24852e4 --- /dev/null +++ b/internal/endtoend/testdata/analyze_modified_star/duckdb/stderr.txt @@ -0,0 +1 @@ +Error: error parsing queries: query.sql:1:1: DuckDB star expression with modifiers or COLUMNS is not supported; query.sql:5:1: DuckDB star expression with modifiers or COLUMNS is not supported diff --git a/internal/engine/duckdb/convert.go b/internal/engine/duckdb/convert.go index 29721bb60d..92a756ee22 100644 --- a/internal/engine/duckdb/convert.go +++ b/internal/engine/duckdb/convert.go @@ -770,7 +770,7 @@ func (c *cc) convertStar(e *dw.StarExpression) ast.Node { // COLUMNS(...) and EXCLUDE/REPLACE/RENAME modifiers have no equivalent. if e.Columns || e.Expr != nil || len(e.ExcludeList) > 0 || len(e.QualifiedExcludeList) > 0 || len(e.ReplaceList) > 0 || len(e.RenameList) > 0 { - return todo(e) + return &ast.TODO{UnsupportedFeature: "DuckDB star expression with modifiers or COLUMNS"} } fields := &ast.List{} if e.RelationName != "" { diff --git a/internal/sql/ast/todo.go b/internal/sql/ast/todo.go index c9b9d054f1..4e24b20623 100644 --- a/internal/sql/ast/todo.go +++ b/internal/sql/ast/todo.go @@ -1,7 +1,8 @@ package ast type TODO struct { - Tag NodeTag[TODO] `json:"tag"` + Tag NodeTag[TODO] `json:"tag"` + UnsupportedFeature string `json:"unsupportedFeature,omitempty"` } func (n *TODO) Pos() int {