Bump to Rust 1.83, fix clippy suggestions

.github/workflows/schema-definitions.yaml

@@ -24,5 +24,7 @@ jobs:
           shared-key: "build" # share the cache across jobs
           save-if: false
 
+      # currently there are no tests in here, leaving to ensure any that are
+      # added are run
       - name: OpenAPI Definitions
-        run: cargo nextest run --no-fail-fast --release --filter-expr='package(openapi-generator)'
+        run: cargo nextest run --no-tests=pass --no-fail-fast --release --filter-expr='package(openapi-generator)'

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

@@ -127,9 +127,8 @@ impl Select {
 
         sql.append_syntax(" ");
 
-        match &self.from {
-            Some(from) => from.to_sql(sql),
-            None => (),
+        if let Some(from) = &self.from {
+            from.to_sql(sql);
         }
 
         for join in &self.joins {

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

@@ -548,17 +548,16 @@ impl State {
         &mut self,
         variables: &Option<Vec<BTreeMap<models::VariableName, serde_json::Value>>>,
     ) -> Option<(sql::ast::From, sql::ast::TableReference)> {
-        match variables {
-            None => None,
-            Some(_) => {
-                let variables_table_alias = self.make_table_alias("%variables_table".to_string());
-                let table_reference =
-                    sql::ast::TableReference::AliasedTable(variables_table_alias.clone());
-                Some((
-                    sql::helpers::from_variables(variables_table_alias),
-                    table_reference,
-                ))
-            }
+        if variables.is_none() {
+            None
+        } else {
+            let variables_table_alias = self.make_table_alias("%variables_table".to_string());
+            let table_reference =
+                sql::ast::TableReference::AliasedTable(variables_table_alias.clone());
+            Some((
+                sql::helpers::from_variables(variables_table_alias),
+                table_reference,
+            ))
         }
     }
 

crates/query-engine/translation/src/translation/mutation/generate.rs

@@ -23,7 +23,7 @@ pub fn generate(env: &Env) -> BTreeMap<models::ProcedureName, Mutation> {
             .map(|(name, mutation)| (name, Mutation::V1(mutation)))
             .collect(),
         Some(mutations::MutationsVersion::V2) => {
-            v2::generate(&env.metadata.tables, &env.mutations_prefix)
+            v2::generate(&env.metadata.tables, env.mutations_prefix.as_ref())
                 .into_iter()
                 .map(|(name, mutation)| (name, Mutation::V2(mutation)))
                 .collect()

crates/query-engine/translation/src/translation/mutation/translate.rs

@@ -86,7 +86,7 @@ fn translate_mutation(
             name: return_collection,
             reference: sql::ast::TableReference::AliasedTable(cte_table_alias.clone()),
         },
-        &None,
+        None,
         &query,
     )?;
 
@@ -227,7 +227,7 @@ fn translate_native_query(
             name: procedure_name.to_string().into(),
             reference: table_reference,
         },
-        &None,
+        None,
         &query,
     )?;
 

crates/query-engine/translation/src/translation/mutation/v2/common.rs

@@ -110,7 +110,7 @@ pub fn default_constraint() -> serde_json::Value {
 
 // the old default was to prefix generated mutations with `v2_` or `v1_`
 // but now we are able to override this
-pub fn get_version_prefix(mutations_prefix: &Option<String>) -> String {
+pub fn get_version_prefix(mutations_prefix: Option<&String>) -> String {
     match mutations_prefix {
         None => format!("{}_", super::VERSION),
         Some(str) => match str.as_str() {
@@ -122,10 +122,13 @@ pub fn get_version_prefix(mutations_prefix: &Option<String>) -> String {
 
 #[test]
 fn test_version_prefix() {
-    assert_eq!(get_version_prefix(&None), "v2_".to_string());
+    assert_eq!(get_version_prefix(None), "v2_".to_string());
     assert_eq!(
-        get_version_prefix(&Some("horse".into())),
+        get_version_prefix(Some("horse".into()).as_ref()),
         "horse_".to_string()
     );
-    assert_eq!(get_version_prefix(&Some(String::new())), String::new());
+    assert_eq!(
+        get_version_prefix(Some(String::new()).as_ref()),
+        String::new()
+    );
 }

crates/query-engine/translation/src/translation/mutation/v2/delete.rs

@@ -37,7 +37,7 @@ pub struct DeleteByKey {
 pub fn generate_delete_by_unique(
     collection_name: &models::CollectionName,
     table_info: &database::TableInfo,
-    mutations_prefix: &Option<String>,
+    mutations_prefix: Option<&String>,
 ) -> Vec<(models::ProcedureName, DeleteMutation)> {
     table_info
         .uniqueness_constraints

crates/query-engine/translation/src/translation/mutation/v2/generate.rs

@@ -18,7 +18,7 @@ pub enum Mutation {
 /// Given our introspection data, work out all the mutations we can generate
 pub fn generate(
     tables_info: &database::TablesInfo,
-    mutations_prefix: &Option<String>,
+    mutations_prefix: Option<&String>,
 ) -> BTreeMap<models::ProcedureName, Mutation> {
     let mut mutations = BTreeMap::new();
     for (collection_name, table_info) in &tables_info.0 {

crates/query-engine/translation/src/translation/mutation/v2/insert.rs

@@ -31,7 +31,7 @@ pub struct InsertMutation {
 pub fn generate(
     collection_name: &models::CollectionName,
     table_info: &database::TableInfo,
-    mutations_prefix: &Option<String>,
+    mutations_prefix: Option<&String>,
 ) -> (models::ProcedureName, InsertMutation) {
     let name = format!(
         "{}insert_{collection_name}",

crates/query-engine/translation/src/translation/mutation/v2/translate.rs

@@ -25,7 +25,7 @@ pub fn translate(
     ),
     Error,
 > {
-    let mutation = lookup_generated_mutation(env, procedure_name, &env.mutations_prefix)?;
+    let mutation = lookup_generated_mutation(env, procedure_name, env.mutations_prefix.as_ref())?;
 
     Ok(match mutation {
         super::generate::Mutation::DeleteMutation(delete) => {
@@ -79,7 +79,7 @@ pub fn translate(
 fn lookup_generated_mutation(
     env: &Env<'_>,
     procedure_name: &models::ProcedureName,
-    mutations_prefix: &Option<String>,
+    mutations_prefix: Option<&String>,
 ) -> Result<super::generate::Mutation, Error> {
     // this means we generate them on every mutation request
     // i don't think this is optimal but I'd like to get this working before working out

crates/query-engine/translation/src/translation/mutation/v2/update.rs

@@ -41,7 +41,7 @@ pub struct UpdateByKey {
 pub fn generate_update_by_unique(
     collection_name: &models::CollectionName,
     table_info: &database::TableInfo,
-    mutations_prefix: &Option<String>,
+    mutations_prefix: Option<&String>,
 ) -> Vec<(models::ProcedureName, UpdateMutation)> {
     table_info
         .uniqueness_constraints

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

@@ -40,7 +40,7 @@ pub fn translate(
             name: query_request.collection.clone(),
             arguments: query_request.arguments.clone(),
         },
-        &None,
+        None,
         &query_request.query,
     )?;
 

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

@@ -45,10 +45,11 @@ pub fn translate(
                     arguments,
                 },
                 // We ask to inject the join predicate into the where clause.
-                &Some(root::JoinPredicate {
+                Some(root::JoinPredicate {
                     join_with: current_table,
                     relationship,
-                }),
+                })
+                .as_ref(),
                 &join_field.query,
             )?;
 

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

@@ -24,7 +24,7 @@ pub fn translate_query(
     env: &Env,
     state: &mut State,
     make_from: &MakeFrom,
-    join_predicate: &Option<JoinPredicate<'_, '_>>,
+    join_predicate: Option<&JoinPredicate<'_, '_>>,
     query_request: &models::Query,
 ) -> Result<sql::helpers::SelectSet, Error> {
     // translate rows selection.
@@ -59,7 +59,7 @@ fn translate_aggregates(
     env: &Env,
     state: &mut State,
     make_from: &MakeFrom,
-    join_predicate: &Option<JoinPredicate<'_, '_>>,
+    join_predicate: Option<&JoinPredicate<'_, '_>>,
     query: &models::Query,
 ) -> Result<Option<sql::ast::Select>, Error> {
     // fail if no aggregates defined at all
@@ -111,7 +111,7 @@ fn translate_rows(
     env: &Env,
     state: &mut State,
     make_from: &MakeFrom,
-    join_predicate: &Option<JoinPredicate<'_, '_>>,
+    join_predicate: Option<&JoinPredicate<'_, '_>>,
     query: &models::Query,
 ) -> Result<(ReturnsFields, sql::ast::Select), Error> {
     let (current_table, from_clause) = make_reference_and_from_clause(env, state, make_from)?;
@@ -169,7 +169,7 @@ pub fn translate_query_part(
     env: &Env,
     state: &mut State,
     current_table: &TableSourceAndReference,
-    join_predicate: &Option<JoinPredicate<'_, '_>>,
+    join_predicate: Option<&JoinPredicate<'_, '_>>,
     query: &models::Query,
     select: &mut sql::ast::Select,
 ) -> Result<(), Error> {
@@ -180,8 +180,12 @@ pub fn translate_query_part(
     };
 
     // translate order_by
-    let (order_by, order_by_joins) =
-        sorting::translate(env, state, &root_and_current_tables, &query.order_by)?;
+    let (order_by, order_by_joins) = sorting::translate(
+        env,
+        state,
+        &root_and_current_tables,
+        query.order_by.as_ref(),
+    )?;
 
     select.joins.extend(order_by_joins);
 

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

@@ -23,7 +23,7 @@ pub fn translate(
     env: &Env,
     state: &mut State,
     root_and_current_tables: &RootAndCurrentTables,
-    order_by: &Option<models::OrderBy>,
+    order_by: Option<&models::OrderBy>,
 ) -> Result<(sql::ast::OrderBy, Vec<sql::ast::Join>), Error> {
     let mut joins: Vec<sql::ast::Join> = vec![];
     // skip if there's no order by clause.
@@ -632,7 +632,7 @@ fn process_path_element_for_order_by_targets(
             current_table: last_table,
         },
         relationship,
-        &path_element.predicate,
+        path_element.predicate.as_deref(),
         sql::ast::SelectList::SelectList(select_cols.aliases_and_expressions()),
         (table.clone(), from_clause),
     )?;
@@ -767,7 +767,7 @@ fn select_for_path_element(
     state: &mut State,
     root_and_current_tables: &RootAndCurrentTables,
     relationship: &models::Relationship,
-    predicate: &Option<Box<models::Expression>>,
+    predicate: Option<&models::Expression>,
     select_list: sql::ast::SelectList,
     (join_table, from_clause): (TableSourceAndReference, sql::ast::From),
 ) -> Result<sql::ast::Select, Error> {

flake.nix

@@ -106,6 +106,7 @@
               pkgs.nixpkgs-fmt
               pkgs.nodePackages.prettier
               pkgs.moreutils
+              pkgs.git
 
               # Rust
               pkgs.bacon

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.81.0"
+channel = "1.83.0"
 profile = "default"  # see https://rust-lang.github.io/rustup/concepts/profiles.html
 components = ["rust-analyzer", "rust-src"]  # see https://rust-lang.github.io/rustup/concepts/components.html