Rename ASTNode to Expr #119
Merged
Conversation
This file contains hidden or 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
Pull Request Test Coverage Report for Build 365
💛 - Coveralls |
nickolay
approved these changes
Jun 18, 2019
src/sqlast/query.rs
Outdated
| @@ -177,9 +177,9 @@ impl ToString for Cte { | |||
| #[derive(Debug, Clone, PartialEq, Hash)] | |||
| pub enum SQLSelectItem { | |||
| /// Any expression, not followed by `[ AS ] alias` | |||
| UnnamedExpression(ASTNode), | |||
| UnnamedExpression(Expr), | |||
There was a problem hiding this comment.
Should we keep UnnamedExpression and ExpressionWithAlias or rename them to use Expr? Same for parse_.._expression() methods.
There was a problem hiding this comment.
Oh, good idea! Done.
nickolay
reviewed
Jun 18, 2019
src/sqlast/mod.rs
Outdated
| }, | ||
| /// Unary operation e.g. `NOT foo` | ||
| SQLUnaryOp { | ||
| op: SQLUnaryOperator, | ||
| expr: Box<ASTNode>, | ||
| expr: Box<Expr>, | ||
| }, | ||
| /// CAST an expression to a different data type e.g. `CAST(foo AS VARCHAR(123))` | ||
| SQLCast { |
There was a problem hiding this comment.
My version of cargo fmt reformats this (and a few others) on one line. I wonder why CI doesn't catch it..
There was a problem hiding this comment.
What version of the Rust toolchain are you using? Perhaps the formatting here is different in different versions.
There was a problem hiding this comment.
Never mind. I think something's broken in CI.
The ASTNode enum was confusingly named. In the past, the name made sense, as the enum contained nearly all of the nodes in the AST, but over time, pieces have been split into different structs, like SQLStatement and SQLQuery. The ASTNode enum now contains only contains expression nodes, so Expr is a better name. Also rename the UnnamedExpression and ExpressionWithAlias variants of SQLSelectItem to UnnamedExpr and ExprWithAlias, respectively, to match the new shorthand for the word "expression".
|
This looks ready to merge to me! |
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.
The ASTNode enum was confusingly named. In the past, the name made
sense, as the enum contained nearly all of the nodes in the AST, but
over time, pieces have been split into different structs, like
SQLStatement and SQLQuery. The ASTNode enum now contains only contains
expression nodes, so Expr is a better name.
Extracted from #105.