Revert "Merge pull request #806 from sylwiaszunejko/prepare_query"

This reverts commit 5d27034, reversing
changes made to 6f0dcfd.

scylla/src/transport/connection.rs

@@ -657,20 +657,6 @@ impl Connection {
     ) -> Result<QueryResponse, QueryError> {
         let serialized_values = values.serialized()?;
 
-        let values_size = serialized_values.size();
-        if values_size != 0 {
-            let prepared = self.prepare(query).await?;
-            return self
-                .execute_with_consistency(
-                    &prepared,
-                    values,
-                    consistency,
-                    serial_consistency,
-                    paging_state,
-                )
-                .await;
-        }
-
         let query_frame = query::Query {
             contents: Cow::Borrowed(&query.contents),
             parameters: query::QueryParameters {

scylla/tests/integration/main.rs

@@ -5,5 +5,4 @@ mod lwt_optimisation;
 mod new_session;
 mod retries;
 mod shards;
-mod silent_prepare_query;
 pub(crate) mod utils;

scylla/tests/integration/retries.rs

@@ -46,7 +46,7 @@ async fn speculative_execution_is_fired() {
         q.set_is_idempotent(true); // this is to allow speculative execution to fire
 
         let drop_frame_rule = RequestRule(
-            Condition::RequestOpcode(RequestOpcode::Prepare)
+            Condition::RequestOpcode(RequestOpcode::Query)
                 .and(Condition::BodyContainsCaseSensitive(Box::new(*b"t"))),
             RequestReaction::drop_frame(),
         );
@@ -121,7 +121,7 @@ async fn retries_occur() {
         q.set_is_idempotent(true); // this is to allow retry to fire
 
         let forge_error_rule = RequestRule(
-            Condition::RequestOpcode(RequestOpcode::Prepare)
+            Condition::RequestOpcode(RequestOpcode::Query)
                 .and(Condition::BodyContainsCaseSensitive(Box::new(*b"INTO t"))),
             RequestReaction::forge().server_error(),
         );