test: order by with null

Author: tobyhede

Cargo.lock

@@ -29,4 +29,5 @@ cipherstash-config = "0.2.3"
 clap = "4.5.32"
 fake = { version = "4", features = ["chrono", "derive"] }
 hex = "0.4.3"
+tap = "1.0.1"
 uuid = { version = "1.11.0", features = ["serde", "v4"] }

packages/cipherstash-proxy-integration/Cargo.toml

@@ -143,6 +143,22 @@ where
         .collect()
 }
 
+// Returns a vector of `Option<String>` for each row in the result set.
+// Nulls are represented as `None`, and non-null values are converted to `Some(String)`.
+pub async fn simple_query_with_null(sql: &str) -> Vec<Option<String>> {
+    let client = connect_with_tls(PROXY).await;
+    let rows = client.simple_query(sql).await.unwrap();
+    rows.iter()
+        .filter_map(|row| {
+            if let tokio_postgres::SimpleQueryMessage::Row(r) = row {
+                Some(r.get(0).map(|val| val.to_string()))
+            } else {
+                None
+            }
+        })
+        .collect()
+}
+
 ///
 /// Configure the client TLS settings.
 /// These are the settings for connecting to the database with TLS.

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

@@ -3,20 +3,6 @@ mod tests {
     use crate::common::{clear, insert, query, random_id, simple_query, trace};
     use chrono::NaiveDate;
 
-    macro_rules! value_for_type {
-        (String, $i:expr) => {
-            format!("group_{}", $i)
-        };
-
-        (NaiveDate, $i:expr) => {
-            NaiveDate::parse_from_str(&format!("2023-01-{}", $i), "%Y-%m-%d").unwrap()
-        };
-
-        ($type:ident, $i:expr) => {
-            $i as $type
-        };
-    }
-
     macro_rules! test_group_by {
         ($name: ident, $type: ident, $pg_type: ident) => {
             #[tokio::test]
@@ -28,7 +14,7 @@ mod tests {
                 let encrypted_col = format!("encrypted_{}", stringify!($pg_type));
 
                 for i in 1..=10 {
-                    let encrypted_val = value_for_type!($type, i);
+                    let encrypted_val = crate::value_for_type!($type, i);
 
                     // Create two records with the same encrypted_int4 value
                     for _ in 1..=2 {

packages/cipherstash-proxy-integration/src/select/group_by.rs

@@ -1,2 +1,18 @@
 mod group_by;
 mod order_by;
+mod order_by_with_null;
+
+#[macro_export]
+macro_rules! value_for_type {
+    (String, $i:expr) => {
+        format!("group_{}", $i)
+    };
+
+    (NaiveDate, $i:expr) => {
+        NaiveDate::parse_from_str(&format!("2023-01-{}", $i), "%Y-%m-%d").unwrap()
+    };
+
+    ($type:ident, $i:expr) => {
+        $i as $type
+    };
+}

packages/cipherstash-proxy-integration/src/select/mod.rs

@@ -3,20 +3,6 @@ mod tests {
     use crate::common::{clear, insert, query, random_id, simple_query, trace};
     use chrono::NaiveDate;
 
-    macro_rules! value_for_type {
-        (String, $i:expr) => {
-            ((b'A' + ($i - 1) as u8) as char).to_string()
-        };
-
-        (NaiveDate, $i:expr) => {
-            NaiveDate::parse_from_str(&format!("2023-01-{}", $i), "%Y-%m-%d").unwrap()
-        };
-
-        ($type:ident, $i:expr) => {
-            $i as $type
-        };
-    }
-
     macro_rules! test_order_by {
         ($name: ident, $type: ident, $pg_type: ident) => {
             #[tokio::test]
@@ -28,7 +14,7 @@ mod tests {
 
                 let mut expected = vec![];
                 for i in 1..=10 {
-                    let encrypted_val = value_for_type!($type, i);
+                    let encrypted_val = crate::value_for_type!($type, i);
 
                     let id = random_id();
                     let sql =