Skip to content

Commit

Permalink
fix: New cases for From
Browse files Browse the repository at this point in the history
  • Loading branch information
@can-keklik
can-keklik committed Dec 22, 2023
1 parent d0eb0f0 commit 62bed33
Show file tree
Hide file tree
Showing 2 changed files with 161 additions and 17 deletions.
46 changes: 29 additions & 17 deletions server/src/lang/serializer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ impl<'a> ToString for ProgramSerializer<'a> {
}

impl<'a> ProgramSerializer<'a> {
fn serialize_sql_expr(&self, sql_expr: &SqlExpr) -> Value {
fn visit_sql_expr(&self, sql_expr: &SqlExpr) -> Value {
if let SqlExpr::Default(eidx) = sql_expr {
self.visit_expr(*eidx).unwrap()
} else {
panic!("Not implemented");
}
}

fn serialize_sql_select_core(&self, core: &SqlSelectCore) -> Value {
fn visit_sql_select_core(&self, core: &SqlSelectCore) -> Value {
let core_projection: Value = core
.projection
.iter()
Expand All @@ -56,7 +56,7 @@ impl<'a> ProgramSerializer<'a> {
SqlProjection::Expr { expr, alias } => {
json!({
"type": "Expr",
"expr": self.serialize_sql_expr(&expr),
"expr": self.visit_sql_expr(&expr),
"alias": alias.as_ref().map(|token| token.lexeme.to_owned())
})
}
Expand All @@ -65,11 +65,11 @@ impl<'a> ProgramSerializer<'a> {

json!({
"projection": core_projection,
"from": core.from.as_ref().map(|x| self.serialize_sql_subquery(&x))
"from": core.from.as_ref().map(|x| self.visit_sql_subquery(&x))
})
}

fn serialize_sql_subquery(&self, subquery: &SqlCollectionSubquery) -> Value {
fn visit_sql_subquery(&self, subquery: &SqlCollectionSubquery) -> Value {
match subquery {
SqlCollectionSubquery::Collection {
namespace,
Expand All @@ -84,10 +84,7 @@ impl<'a> ProgramSerializer<'a> {
})
}
SqlCollectionSubquery::Group(groups) => {
let subqueries: Value = groups
.iter()
.map(|x| self.serialize_sql_subquery(x))
.collect();
let subqueries: Value = groups.iter().map(|x| self.visit_sql_subquery(x)).collect();
json!({
"type": "Group",
"subqueries": subqueries
Expand All @@ -96,27 +93,42 @@ impl<'a> ProgramSerializer<'a> {
SqlCollectionSubquery::Select { expr, alias } => {
json!({
"type": "Select",
"expr": self.visit_expr(*expr),
"expr": self.visit_expr(*expr).unwrap(),
"alias": alias.as_ref().map(|token| token.lexeme.to_owned())
})
}
SqlCollectionSubquery::Join(_, _) => {
json!({})
SqlCollectionSubquery::Join(join_subquery, joins) => {
let joins_ser: Value = joins
.iter()
.map(|x| {
json!({
"type": format!("{:?}", x.join_type),
"subquery": self.visit_sql_subquery(&x.subquery),
"constraint": x.join_constraint.as_ref().map(|y| {
self.visit_sql_expr(&y)
})
})
})
.collect();
json!({
"subquery": self.visit_sql_subquery(&join_subquery),
"joins": joins_ser
})
}
}
}
}

impl<'a> ImmutableVisitor<Value, ()> for ProgramSerializer<'a> {
fn visit_select(&self, select: &SqlSelect) -> Result<Value, ()> {
let core = self.serialize_sql_select_core(&select.core);
let core = self.visit_sql_select_core(&select.core);

let compound: Value = select
.compound
.iter()
.map(|x| {
json!({
"core": self.serialize_sql_select_core(&x.core),
"core": self.visit_sql_select_core(&x.core),
"operator": format!("{:?}", x.operator),
})
})
Expand All @@ -125,7 +137,7 @@ impl<'a> ImmutableVisitor<Value, ()> for ProgramSerializer<'a> {
let order_by: Option<Value> = select.order_by.as_ref().map(|x| {
x.iter()
.map(|order| {
let expr = self.serialize_sql_expr(&order.expr);
let expr = self.visit_sql_expr(&order.expr);
let val = json!({
"expr": expr,
"ordering": format!("{:?}", order.ordering),
Expand All @@ -136,10 +148,10 @@ impl<'a> ImmutableVisitor<Value, ()> for ProgramSerializer<'a> {
});

let limit: Option<Value> = select.limit.as_ref().map(|x| {
let count_part = self.serialize_sql_expr(&x.count);
let count_part = self.visit_sql_expr(&x.count);

let offset_part = if x.offset.is_some() {
self.serialize_sql_expr(&x.offset.as_ref().unwrap())
self.visit_sql_expr(&x.offset.as_ref().unwrap())
} else {
json!(serde_json::Value::Null)
};
Expand Down
132 changes: 132 additions & 0 deletions server/src/lang/tests/sql/select_from.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,137 @@ assert_parsing! {
}
]
}
},
multi_0: {
"SELECT * from users, admins;" => {
"type": "Stmt::Program",
"body": [
{
"type": "Stmt::Expression",
"expr": {
"type": "Expr::Select",
"value": {
"core": {
"from": {
"type": "Group",
"subqueries": [{
"type": "Collection",
"alias": null,
"name": "users",
"namespace": null,
},
{
"type": "Collection",
"alias": null,
"name": "admins",
"namespace": null,
}],
},
"projection": [{
"type": "All",
"collection": null
}]
},
"compound": [],
"limit": null,
"order_by": null
}
}
}
]
}
},
multi_1: {
"SELECT * from users u, admins as a;" => {
"type": "Stmt::Program",
"body": [
{
"type": "Stmt::Expression",
"expr": {
"type": "Expr::Select",
"value": {
"core": {
"from": {
"type": "Group",
"subqueries": [{
"type": "Collection",
"alias": "u",
"name": "users",
"namespace": null,
},
{
"type": "Collection",
"alias": "a",
"name": "admins",
"namespace": null,
}],
},
"projection": [{
"type": "All",
"collection": null
}]
},
"compound": [],
"limit": null,
"order_by": null
}
}
}
]
}
},
multi_2: {
"SELECT * from (SELECT * from users) u;" => {
"type": "Stmt::Program",
"body": [
{
"type": "Stmt::Expression",
"expr": {
"type": "Expr::Select",
"value": {
"core": {
"from": {
"type": "Group",
"subqueries": [{
"type": "Select",
"alias": "u",
"expr": {
"type": "Expr::Select",
"value": {
"core": {
"from": {
"type": "Group",
"subqueries": [{
"type": "Collection",
"alias": null,
"name": "users",
"namespace": null,
}],
},
"projection": [{
"type": "All",
"collection": null
}]
},
"compound": [],
"limit": null,
"order_by": null
}
}
}],
},
"projection": [{
"type": "All",
"collection": null
}]
},
"compound": [],
"limit": null,
"order_by": null
}
}
}
]
}
}
}

0 comments on commit 62bed33

Please sign in to comment.