wip: lint fix

Author: pranshi06

crates/query-engine/sql/src/sql/ast.rs

@@ -161,10 +161,10 @@ impl Join {
     /// Get the select expression and table alias regardless of the join type.
     pub fn get_select_and_alias(self) -> (Box<Select>, TableAlias) {
         match self {
-            Join::LeftOuterJoin(LeftOuterJoin { select, alias, .. }) => (select, alias),
-            Join::InnerJoin(InnerJoin { select, alias }) => (select, alias),
-            Join::CrossJoin(CrossJoin { select, alias }) => (select, alias),
-            Join::FullOuterJoin(FullOuterJoin { select, alias }) => (select, alias),
+            Join::LeftOuterJoin(LeftOuterJoin { select, alias, .. })
+            | Join::InnerJoin(InnerJoin { select, alias })
+            | Join::CrossJoin(CrossJoin { select, alias })
+            | Join::FullOuterJoin(FullOuterJoin { select, alias }) => (select, alias),
         }
     }
 }

crates/query-engine/sql/src/sql/convert.rs

@@ -640,8 +640,7 @@ impl Value {
             Value::EmptyJsonArray => sql.append_syntax("'[]'"),
             Value::Int8(i) => sql.append_syntax(format!("{i}").as_str()),
             Value::Float8(n) => sql.append_syntax(format!("{n}").as_str()),
-            Value::Character(s) => sql.append_param(Param::String(s.clone())),
-            Value::String(s) => sql.append_param(Param::String(s.clone())),
+            Value::Character(s) | Value::String(s) => sql.append_param(Param::String(s.clone())),
             Value::Variable(v) => sql.append_param(Param::Variable(v.clone())),
             Value::Bool(true) => sql.append_syntax("true"),
             Value::Bool(false) => sql.append_syntax("false"),
@@ -749,13 +748,12 @@ impl TableName {
 
 impl TableAlias {
     pub fn to_sql(&self, sql: &mut SQL) {
-        let name = self.to_string();
+        let name = self.to_aliased_string();
         sql.append_identifier(&name);
     }
 
-    pub fn to_string(&self) -> String {
-        let name = format!("{}_{}", self.name, self.unique_index);
-        name
+    pub fn to_aliased_string(&self) -> String {
+        format!("{}_{}", self.name, self.unique_index)
     }
 }
 

crates/query-engine/sql/src/sql/helpers.rs

@@ -252,11 +252,11 @@ pub fn select_rowset(
     (output_table_alias, output_column_alias): (TableAlias, ColumnAlias),
     (row_table_alias, row_inner_table_alias_): (TableAlias, TableAlias),
     (aggregate_table_alias, _aggregate_inner_table_alias): (TableAlias, TableAlias),
-    _variables: Option<(From, TableReference)>,
+    _variables: &Option<(From, TableReference)>,
     // output_agg_table_alias: &TableAlias,
     // with: With,
     select_set: SelectSet,
-    returns_field: ReturnsFields,
+    returns_field: &ReturnsFields,
 ) -> Select {
     dbg!(output_table_alias);
     dbg!(output_column_alias.clone());
@@ -305,13 +305,13 @@ pub fn select_rowset(
                 ReturnsFields::NoFieldsWereRequested => {
                     let row1 = vec![(
                         ColumnAlias {
-                            name: row_table_alias.to_string(),
+                            name: row_table_alias.to_aliased_string(),
                         },
                         (Expression::JsonBuildObject(BTreeMap::new())),
                     )];
                     let mut sel = simple_select(row1);
                     dbg!("-------------------------------------------");
-                    dbg!(row_table_alias.to_string());
+                    dbg!(row_table_alias.to_aliased_string());
                     dbg!("-------------------------------------------");
                     sel.from = Some(From::Select {
                         alias: row_inner_table_alias_.clone(),

crates/query-engine/translation/src/translation/query/mod.rs

@@ -57,7 +57,7 @@ pub fn translate(
             state.make_table_alias("aggregates".to_string()),
             state.make_table_alias("aggregates_inner".to_string()),
         ),
-        variables_from,
+        &variables_from,
         // &state.make_table_alias("universe_agg".to_string()),
         // native queries if there are any
         // sql::ast::With {
@@ -70,7 +70,7 @@ pub fn translate(
         //     },
         // },
         select_set,
-        returns_field,
+        &returns_field,
     );
 
     dbg!(json_select.clone());

crates/query-engine/translation/src/translation/query/relationships.rs

@@ -67,9 +67,9 @@ pub fn translate_joins(
                     state.make_table_alias("aggregates".to_string()),
                     state.make_table_alias("aggregates_inner".to_string()),
                 ),
-                None,
+                &None,
                 select_set,
-                returns_field,
+                &returns_field,
             );
 
             Ok(sql::ast::Join::LeftOuterJoin(sql::ast::LeftOuterJoin {