Preserve columns names when SELECT * and JOIN #268
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
ngrislain
reviewed
Feb 26, 2024
src/sql/relation.rs
Outdated
| .field_inputs() | ||
| .map(|(f, i)| (i, f.into())) | ||
| .collect(); | ||
| let composed_columns = all_columns.and_then(join_columns.clone()); |
There was a problem hiding this comment.
Where are you using this ?
There was a problem hiding this comment.
Not sure to understand, here the only difference from before is that the name of join columns which I change it from new_columns to join_columns
ngrislain
reviewed
Feb 26, 2024
src/sql/relation.rs
Outdated
| .collect(); | ||
| composed_columns.and_then(original_not_ambiguous_columns) | ||
| } else { | ||
| composed_columns |
There was a problem hiding this comment.
You're relying on the previously defined composed column here ? It's a bit hard to read
ngrislain
reviewed
Feb 26, 2024
| @@ -251,6 +251,7 @@ impl<'a, T: QueryToRelationTranslator + Copy + Clone> VisitedQueryRelations<'a, | |||
| fn try_from_table_with_joins( | |||
There was a problem hiding this comment.
This function is becoming too complex, can you try to split it in independent sub-functions with explicit names ?
ngrislain
reviewed
Feb 26, 2024
src/relation/rewriting.rs
Outdated
| .chain(self.field_inputs().filter_map(|(name, id)| { | ||
| }).collect::<Vec<_>>(); | ||
|
|
||
| let fields_not_in_vec = self |
There was a problem hiding this comment.
This is really obscure, can you separate well between name preservation and collision management?
ngrislain
reviewed
Mar 19, 2024
src/hierarchy.rs
Outdated
| /// It creates a new hierarchy with elements for which the tail of their | ||
| /// path is not ambiguous. In the new hierarchy, only the tails of the original | ||
| /// path are used as a path. | ||
| pub fn non_ambiguous_tails(&self) -> Hierarchy<T> { |
There was a problem hiding this comment.
Remove this from this file
ngrislain
approved these changes
Mar 19, 2024
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.
It fixes this issue.
The fix:
When constructing the relation from the ast query, we pass a parameter
preserve_input_names: booltotry_from_tables_with_joinsand then totry_from_table_with_joinsdepending weather the there is a Wildcard in the SelectItem or not.In
try_from_table_with_joinsafter the Join (that is created as usual with automatically generated names for fields) a Map is also created where ifpreserve_input_namesis True the original fields names of the Join inputs inserted back but only if they don't create naming collision.Notice that if
SELECT * FROM tableA JOIN tableB USING(id)theidcolumn name can be found as a field name along with all the other non ambiguous original column names in the resulting relation whereasSELECT * FROM tableA JOIN tableB ON(tableA.id=tableB.id)theidfield name is no longer present anymore since it is ambiguous, however. the field will still be present but with a generated field name.