errors: move PartitionKeyExtraction variant from ProtError to BadQuery

I believe that this is currently the best fitting place for this variant.

Author: muzarski

scylla/src/errors.rs

@@ -161,11 +161,7 @@ pub enum NewSessionError {
 /// of internal driver API - a driver bug.
 #[derive(Error, Debug, Clone)]
 #[non_exhaustive]
-pub enum ProtocolError {
-    /// Unable extract a partition key based on prepared statement's metadata.
-    #[error("Unable extract a partition key based on prepared statement's metadata")]
-    PartitionKeyExtraction,
-}
+pub enum ProtocolError {}
 
 /// An error that occurred during `USE KEYSPACE <>` request.
 #[derive(Error, Debug, Clone)]
@@ -437,6 +433,10 @@ pub enum TablesMetadataError {
 #[error("Invalid query passed to Session")]
 #[non_exhaustive]
 pub enum BadQuery {
+    /// Unable extract a partition key based on prepared statement's metadata.
+    #[error("Unable extract a partition key based on prepared statement's metadata")]
+    PartitionKeyExtraction,
+
     #[error("Serializing values failed: {0} ")]
     SerializationError(#[from] SerializationError),
 

scylla/src/statement/prepared_statement.rs

@@ -14,7 +14,7 @@ use uuid::Uuid;
 
 use super::{PageSize, StatementConfig};
 use crate::client::execution_profile::ExecutionProfileHandle;
-use crate::errors::{BadQuery, ExecutionError, ProtocolError};
+use crate::errors::{BadQuery, ExecutionError};
 use crate::frame::response::result::PreparedMetadata;
 use crate::frame::types::{Consistency, SerialConsistency};
 use crate::observability::history::HistoryListener;
@@ -498,7 +498,7 @@ impl PartitionKeyError {
     pub fn into_execution_error(self) -> ExecutionError {
         match self {
             PartitionKeyError::PartitionKeyExtraction(_) => {
-                ExecutionError::ProtocolError(ProtocolError::PartitionKeyExtraction)
+                ExecutionError::BadQuery(BadQuery::PartitionKeyExtraction)
             }
             PartitionKeyError::TokenCalculation(TokenCalculationError::ValueTooLong(
                 values_len,