integration: extract macros/complex_pk

There was a test case in test_prepared_statement() that actually had
nothing to do with prepared statements, but was testing the ser/de
macros. It was extracted to a separate file.

scylla/tests/integration/macros/complex_pk.rs

@@ -0,0 +1,55 @@
+use crate::utils::{
+    create_new_session_builder, setup_tracing, unique_keyspace_name, PerformDDL as _,
+};
+
+#[tokio::test]
+async fn test_macros_complex_pk() {
+    setup_tracing();
+    let session = create_new_session_builder().build().await.unwrap();
+    let ks = unique_keyspace_name();
+
+    session.ddl(format!("CREATE KEYSPACE IF NOT EXISTS {} WITH REPLICATION = {{'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1}}", ks)).await.unwrap();
+    session.use_keyspace(ks, true).await.unwrap();
+    session
+        .ddl("CREATE TABLE IF NOT EXISTS complex_pk (a int, b int, c text, d int, e int, primary key ((a,b,c),d))")
+        .await
+        .unwrap();
+
+    // Check that SerializeRow and DeserializeRow macros work
+    {
+        #[derive(scylla::SerializeRow, scylla::DeserializeRow, PartialEq, Debug, Clone)]
+        struct ComplexPk {
+            a: i32,
+            b: i32,
+            c: Option<String>,
+            d: i32,
+            e: i32,
+        }
+        let input: ComplexPk = ComplexPk {
+            a: 9,
+            b: 8,
+            c: Some("seven".into()),
+            d: 6,
+            e: 5,
+        };
+        session
+            .query_unpaged(
+                "INSERT INTO complex_pk (a,b,c,d,e) VALUES (?,?,?,?,?)",
+                input.clone(),
+            )
+            .await
+            .unwrap();
+        let output: ComplexPk = session
+            .query_unpaged(
+                "SELECT * FROM complex_pk WHERE a = 9 and b = 8 and c = 'seven'",
+                &[],
+            )
+            .await
+            .unwrap()
+            .into_rows_result()
+            .unwrap()
+            .single_row()
+            .unwrap();
+        assert_eq!(input, output)
+    }
+}

scylla/tests/integration/macros/mod.rs

@@ -1 +1,2 @@
+mod complex_pk;
 mod hygiene;

scylla/tests/integration/statements/prepared.rs

@@ -169,47 +169,4 @@ async fn test_prepared_statement() {
             (17, 16, "I'm prepared!!!", 7, None)
         );
     }
-    // Check that SerializeRow and DeserializeRow macros work
-    {
-        #[derive(scylla::SerializeRow, scylla::DeserializeRow, PartialEq, Debug, Clone)]
-        struct ComplexPk {
-            a: i32,
-            b: i32,
-            c: Option<String>,
-            d: i32,
-            e: i32,
-        }
-        let input: ComplexPk = ComplexPk {
-            a: 9,
-            b: 8,
-            c: Some("seven".into()),
-            d: 6,
-            e: 5,
-        };
-        session
-            .query_unpaged(
-                format!(
-                    "INSERT INTO {}.complex_pk (a,b,c,d,e) VALUES (?,?,?,?,?)",
-                    ks
-                ),
-                input.clone(),
-            )
-            .await
-            .unwrap();
-        let output: ComplexPk = session
-            .query_unpaged(
-                format!(
-                    "SELECT * FROM {}.complex_pk WHERE a = 9 and b = 8 and c = 'seven'",
-                    ks
-                ),
-                &[],
-            )
-            .await
-            .unwrap()
-            .into_rows_result()
-            .unwrap()
-            .single_row()
-            .unwrap();
-        assert_eq!(input, output)
-    }
 }