fix(tests): proxy jsonb integration tests

Author: freshtonic

packages/cipherstash-proxy-integration/src/insert/insert_with_literal.rs

@@ -9,6 +9,10 @@ mod tests {
 
     macro_rules! test_insert_with_literal {
         ($name: ident, $type: ident, $pg_type: ident) => {
+            test_insert_with_literal!($name, $type, $pg_type, false);
+        };
+
+        ($name: ident, $type: ident, $pg_type: ident, $cast: expr) => {
             #[tokio::test]
             pub async fn $name() {
                 trace();
@@ -22,8 +26,14 @@ mod tests {
 
                 let expected = vec![encrypted_val.clone()];
 
-                let insert_sql = format!("INSERT INTO encrypted (id, {encrypted_col}) VALUES ($1, '{encrypted_val}')");
-                let select_sql = format!("SELECT {encrypted_col} FROM encrypted WHERE id = $1");
+                let cast_to_type: &str = if $cast {
+                    &format!("::{}", stringify!($pg_type))
+                } else {
+                    ""
+                };
+
+                let insert_sql = format!("INSERT INTO encrypted (id, {encrypted_col}) VALUES ($1, '{encrypted_val}'{cast_to_type})");
+                let select_sql = format!("SELECT {encrypted_col}{cast_to_type} FROM encrypted WHERE id = $1");
 
                 execute_query(&insert_sql, &[&id]).await;
                 let actual = query_by::<$type>(&select_sql, &id).await;
@@ -36,6 +46,10 @@ mod tests {
 
     macro_rules! test_insert_simple_query_with_literal {
         ($name: ident, $type: ident, $pg_type: ident) => {
+            test_insert_simple_query_with_literal!($name, $type, $pg_type, false);
+        };
+
+        ($name: ident, $type: ident, $pg_type: ident, $cast: expr) => {
             #[tokio::test]
             pub async fn $name() {
                 trace();
@@ -48,8 +62,14 @@ mod tests {
                 let encrypted_col = format!("encrypted_{}", stringify!($pg_type));
                 let encrypted_val = crate::value_for_type!($type, random_limited());
 
-                let insert_sql = format!("INSERT INTO encrypted (id, {encrypted_col}) VALUES ({id}, '{encrypted_val}')");
-                let select_sql = format!("SELECT {encrypted_col} FROM encrypted WHERE id = {id}");
+                let cast_to_type: &str = if $cast {
+                    &format!("::{}", stringify!($pg_type))
+                } else {
+                    ""
+                };
+
+                let insert_sql = format!("INSERT INTO encrypted (id, {encrypted_col}) VALUES ({id}, '{encrypted_val}'{cast_to_type})");
+                let select_sql = format!("SELECT {encrypted_col}{cast_to_type} FROM encrypted WHERE id = {id}");
 
 
                 let expected = vec![encrypted_val];
@@ -69,7 +89,7 @@ mod tests {
     test_insert_with_literal!(insert_with_literal_bool, bool, bool);
     test_insert_with_literal!(insert_with_literal_text, String, text);
     test_insert_with_literal!(insert_with_literal_date, NaiveDate, date);
-    test_insert_with_literal!(insert_with_literal_jsonb, Value, jsonb);
+    test_insert_with_literal!(insert_with_literal_jsonb, Value, jsonb, true);
 
     test_insert_simple_query_with_literal!(insert_simple_query_with_literal_int2, i16, int2);
     test_insert_simple_query_with_literal!(insert_simple_query_with_literal_int4, i32, int4);
@@ -78,7 +98,12 @@ mod tests {
     test_insert_simple_query_with_literal!(insert_simple_query_with_literal_bool, bool, bool);
     test_insert_simple_query_with_literal!(insert_simple_query_with_literal_text, String, text);
     test_insert_simple_query_with_literal!(insert_simple_query_with_literal_date, NaiveDate, date);
-    test_insert_simple_query_with_literal!(insert_simple_query_with_literal_jsonb, Value, jsonb);
+    test_insert_simple_query_with_literal!(
+        insert_simple_query_with_literal_jsonb,
+        Value,
+        jsonb,
+        true
+    );
 
     // -----------------------------------------------------------------
 

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

@@ -55,12 +55,12 @@ mod tests {
         let encrypted_jsonb = serde_json::json!({"key": "value"});
 
         let sql = format!(
-            "INSERT INTO encrypted (id, encrypted_jsonb) VALUES ($1, '{encrypted_jsonb}')",
+            "INSERT INTO encrypted (id, encrypted_jsonb) VALUES ($1, '{encrypted_jsonb}'::jsonb)",
         );
 
         client.query(&sql, &[&id]).await.unwrap();
 
-        let sql = "SELECT id, encrypted_jsonb FROM encrypted WHERE id = $1";
+        let sql = "SELECT id, encrypted_jsonb::jsonb FROM encrypted WHERE id = $1";
         let rows = client.query(sql, &[&id]).await.unwrap();
 
         assert_eq!(rows.len(), 1);

tests/benchmark/sql/benchmark-schema.sql

@@ -19,6 +19,8 @@ SELECT eql_v2.add_column(
   'email'
 );
 
-SELECT eql_v2.encrypt();
-SELECT eql_v2.activate();
+-- SELECT eql_v2.encrypt();
+-- SELECT eql_v2.activate();
 
+SELECT eql_v2.migrate_config();
+SELECT eql_v2.activate_config();