chore: rename id test helper function

Author: tobyhede

packages/cipherstash-proxy-integration/src/common.rs

@@ -17,7 +17,7 @@ pub const TEST_SCHEMA_SQL: &str = include_str!(concat!("../../../tests/sql/schem
 
 static INIT: Once = Once::new();
 
-pub fn id() -> i64 {
+pub fn random_id() -> i64 {
     use rand::Rng;
     let mut rng = rand::rng();
     rng.random_range(1..=i64::MAX)

packages/cipherstash-proxy-integration/src/decrypt/insert_returning.rs

@@ -2,7 +2,7 @@
 mod tests {
     use chrono::NaiveDate;
 
-    use crate::common::{clear, connect_with_tls, id, trace, PROXY};
+    use crate::common::{clear, connect_with_tls, random_id, trace, PROXY};
 
     #[tokio::test]
     async fn decrypt_insert_returning_with_different_column_order() {

packages/cipherstash-proxy-integration/src/extended_protocol_error_messages.rs

@@ -2,7 +2,7 @@
 mod tests {
     use tracing::{debug, info};
 
-    use crate::common::{clear, connect_with_tls, id, reset_schema, trace, PROXY};
+    use crate::common::{clear, connect_with_tls, random_id, reset_schema, trace, PROXY};
 
     struct Reset;
 
@@ -24,7 +24,7 @@ mod tests {
 
         let _reset = Reset;
 
-        let id = id();
+        let id = random_id();
 
         let client = connect_with_tls(PROXY).await;
 
@@ -55,7 +55,7 @@ mod tests {
 
         // Create a record
         // If select returns no results, no configuration is required
-        let id = id();
+        let id = random_id();
         let encrypted_text = "[email protected]";
 
         let sql = "INSERT INTO unconfigured (id, encrypted_unconfigured) VALUES ($1, $2)";
@@ -82,7 +82,7 @@ mod tests {
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
         // let encrypted_date = NaiveDate::parse_from_str("2025-01-01", "%Y-%m-%d").unwrap();
         let encrypted_date: i32 = 2025;
 
@@ -111,7 +111,7 @@ mod tests {
 
         // Create a record
         // If select returns no results, no configuration is required
-        let id = id();
+        let id = random_id();
         let encrypted_text = "[email protected]";
 
         let sql = "INSERT INTO encrypted id, encrypted_text VALUES ($1, $2)";

packages/cipherstash-proxy-integration/src/map_concat.rs

@@ -1,14 +1,14 @@
 #[cfg(test)]
 mod tests {
-    use crate::common::{clear, connect_with_tls, id, PROXY};
+    use crate::common::{clear, connect_with_tls, random_id, PROXY};
 
     #[tokio::test]
     async fn map_concat_regression() {
         let client = connect_with_tls(PROXY).await;
 
         clear().await;
 
-        let id = id();
+        let id = random_id();
         let encrypted_text = "[email protected]";
 
         let sql = "INSERT INTO encrypted (id, encrypted_text) VALUES ($1, $2)";

packages/cipherstash-proxy-integration/src/map_literals.rs

@@ -1,14 +1,14 @@
 #[cfg(test)]
 mod tests {
-    use crate::common::{clear, connect_with_tls, id, PROXY};
+    use crate::common::{clear, connect_with_tls, random_id, PROXY};
 
     #[tokio::test]
     async fn map_literal() {
         clear().await;
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
         let encrypted_text = "[email protected]";
 
         let sql =
@@ -28,7 +28,7 @@ mod tests {
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
         let encrypted_text = "[email protected]";
         let int2: i16 = 1;
 
@@ -51,7 +51,7 @@ mod tests {
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
         let encrypted_jsonb = serde_json::json!({"key": "value"});
 
         let sql = format!(
@@ -80,7 +80,7 @@ mod tests {
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
 
         let sql =
             format!("INSERT INTO encrypted (id, encrypted_int8) VALUES ({id}, {id}) RETURNING id, encrypted_int8");
@@ -103,7 +103,7 @@ mod tests {
         let client = connect_with_tls(PROXY).await;
 
         let sql =
-            format!("INSERT INTO encrypted (id, encrypted_text) VALUES ({}, 'a'), ({}, 'a') RETURNING encrypted_text", id(), id());
+            format!("INSERT INTO encrypted (id, encrypted_text) VALUES ({}, 'a'), ({}, 'a') RETURNING encrypted_text", random_id(), random_id());
         let rows = client.query(&sql, &[]).await.unwrap();
 
         let actual = rows.iter().map(|row| row.get(0)).collect::<Vec<&str>>();

packages/cipherstash-proxy-integration/src/map_match_index.rs

@@ -1,6 +1,6 @@
 #[cfg(test)]
 mod tests {
-    use crate::common::{clear, connect_with_tls, id, trace, PROXY};
+    use crate::common::{clear, connect_with_tls, random_id, trace, PROXY};
 
     #[tokio::test]
     async fn map_match_index_text() {
@@ -10,7 +10,7 @@ mod tests {
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
         let encrypted_text = "[email protected]";
 
         let sql = "INSERT INTO encrypted (id, encrypted_text) VALUES ($1, $2)";

packages/cipherstash-proxy-integration/src/map_nulls.rs

@@ -1,16 +1,15 @@
 #[cfg(test)]
 mod tests {
+    use crate::common::{clear, connect_with_tls, random_id, trace, PROXY};
     use chrono::NaiveDate;
 
-    use crate::common::{clear, connect_with_tls, id, trace, PROXY};
-
     #[tokio::test]
     async fn map_insert_null_param() {
         trace();
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
         let encrypted_text: Option<String> = None;
 
         let sql = "INSERT INTO encrypted (id, encrypted_text) VALUES ($1, $2)";
@@ -33,7 +32,7 @@ mod tests {
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
         let encrypted_text = "[email protected]";
 
         let sql = "INSERT INTO encrypted (id, encrypted_text) VALUES ($1, $2)";
@@ -71,7 +70,7 @@ mod tests {
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
 
         let sql = "INSERT INTO encrypted (id, encrypted_text) VALUES ($1, NULL)";
         client.query(sql, &[&id]).await.unwrap();
@@ -96,7 +95,7 @@ mod tests {
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
         let encrypted_int2: i16 = 42;
 
         let sql =
@@ -128,7 +127,7 @@ mod tests {
 
         let client = connect_with_tls(PROXY).await;
 
-        let id = id();
+        let id = random_id();
         let plaintext: Option<String> = None;
         let plaintext_date: Option<NaiveDate> = None;
         let encrypted_text: Option<String> = None;