Rebase on our old friend main

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

@@ -107,3 +107,25 @@ pub struct CheckArgument {
 pub fn default_constraint() -> serde_json::Value {
     serde_json::json!({"type": "and", "expressions": []})
 }
+
+// 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 {
+    match mutations_prefix {
+        None => format!("{}_", super::VERSION),
+        Some(str) => match str.as_str() {
+            "" => String::new(),
+            _ => format!("{str}_"),
+        },
+    }
+}
+
+#[test]
+fn test_version_prefix() {
+    assert_eq!(get_version_prefix(&None), "v2_".to_string());
+    assert_eq!(
+        get_version_prefix(&Some("horse".into())),
+        "horse_".to_string()
+    );
+    assert_eq!(get_version_prefix(&Some("".into())), "".to_string());
+}

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

@@ -1,6 +1,5 @@
 //! Auto-generate delete mutations and translate them into sql ast.
 
-use super::common::{self, CheckArgument};
 use crate::translation::error::Error;
 use crate::translation::helpers::{self, TableSourceAndReference};
 use crate::translation::query::filtering;

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

@@ -11,7 +11,7 @@ use query_engine_metadata::metadata::database;
 use query_engine_sql::sql;
 use std::collections::{BTreeMap, BTreeSet};
 
-use super::common::{default_constraint, CheckArgument};
+use super::common::{self, default_constraint, CheckArgument};
 
 /// A representation of an auto-generated insert mutation.
 ///