bring up JOIN USING and make README query work #5477
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit gets the using condition for joins working and now allows the query that is now in the top-level README to work. We unified some of the join logic between SQL and SPQ and relaxed some of the checking of group-by keys with selection, which had been too aggressive. We also added a test that emulates the README query with smaller data in local files rather than APIs.
nwt
approved these changes
Nov 13, 2024
Comment on lines
+342
to
350
| for k, col := range scalars { | ||
| path := col.scalar | ||
| if this, ok := col.scalar.(*dag.This); ok { | ||
| if field.Path(this.Path).In(paths) { | ||
| continue | ||
| } | ||
| } | ||
| if !(field.Path{col.name}).In(paths) { | ||
| a.error(exprs[k], fmt.Errorf("'%s': selected expression is missing from GROUP BY clause (and is not an aggregation)", path)) |
There was a problem hiding this comment.
Nit:
Suggested change
| for k, col := range scalars { | |
| path := col.scalar | |
| if this, ok := col.scalar.(*dag.This); ok { | |
| if field.Path(this.Path).In(paths) { | |
| continue | |
| } | |
| } | |
| if !(field.Path{col.name}).In(paths) { | |
| a.error(exprs[k], fmt.Errorf("'%s': selected expression is missing from GROUP BY clause (and is not an aggregation)", path)) | |
| for k, col := range scalars { | |
| if this, ok := col.scalar.(*dag.This); ok { | |
| if paths.Has(this.Path) { | |
| continue | |
| } | |
| } | |
| if !paths.Has(col.name) { | |
| a.error(exprs[k], fmt.Errorf("%q: selected expression is missing from GROUP BY clause (and is not an aggregation)", col.scalar)) |
| case *ast.JoinUsingExpr: | ||
| c.write("using (") | ||
| c.exprs(cond.Fields) | ||
| c.write(")") |
There was a problem hiding this comment.
Nit:
Suggested change
| c.write(")") | |
| c.write(")") | |
| default: | |
| panic(cond) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit gets the using condition for joins working and now allows the query that is now in the top-level README to work. We unified some of the join logic between SQL and SPQ and relaxed some of the checking of group-by keys with selection, which had been too aggressive. We also added a test that emulates the README query with smaller data in local files rather than APIs.