Fix protocol error struct name for List(All)PrivilegesError

src/client/commands/show_privs.rs

@@ -9,7 +9,7 @@ use crate::{
     core::{
         completion::mysql_database_completer,
         protocol::{
-            ClientToServerMessageStream, GetDatabasesPrivilegeDataError, Request, Response,
+            ClientToServerMessageStream, ListPrivilegesError, Request, Response,
             print_list_privileges_output_status, print_list_privileges_output_status_json,
             request_validation::ValidationError,
         },
@@ -77,7 +77,7 @@ pub async fn show_database_privileges(
         if privilege_data.iter().any(|(_, res)| {
             matches!(
                 res,
-                Err(GetDatabasesPrivilegeDataError::ValidationError(
+                Err(ListPrivilegesError::ValidationError(
                     ValidationError::AuthorizationError(_)
                 ))
             )

src/client/mysql_admutils_compatibility/error_messages.rs

@@ -1,7 +1,7 @@
 use crate::core::{
     protocol::{
         CreateDatabaseError, CreateUserError, DropDatabaseError, DropUserError,
-        GetDatabasesPrivilegeDataError, ListUsersError, request_validation::ValidationError,
+        ListPrivilegesError, ListUsersError, request_validation::ValidationError,
     },
     types::DbOrUser,
 };
@@ -161,28 +161,25 @@ pub fn handle_drop_database_error(error: DropDatabaseError, name: &str) {
     }
 }
 
-pub fn format_show_database_error_message(
-    error: GetDatabasesPrivilegeDataError,
-    name: &str,
-) -> String {
+pub fn format_show_database_error_message(error: ListPrivilegesError, name: &str) -> String {
     let argv0 = std::env::args()
         .next()
         .unwrap_or_else(|| "mysql-dbadm".to_string());
 
     match error {
-        GetDatabasesPrivilegeDataError::ValidationError(ValidationError::NameValidationError(
-            _,
-        )) => name_validation_error_to_error_message(DbOrUser::Database(name.into())),
-        GetDatabasesPrivilegeDataError::ValidationError(ValidationError::AuthorizationError(_)) => {
+        ListPrivilegesError::ValidationError(ValidationError::NameValidationError(_)) => {
+            name_validation_error_to_error_message(DbOrUser::Database(name.into()))
+        }
+        ListPrivilegesError::ValidationError(ValidationError::AuthorizationError(_)) => {
             authorization_error_message(DbOrUser::Database(name.into()))
         }
-        GetDatabasesPrivilegeDataError::MySqlError(err) => {
+        ListPrivilegesError::MySqlError(err) => {
             format!(
                 "{}: Failed to look up privileges for database '{}': {}",
                 argv0, name, err
             )
         }
-        GetDatabasesPrivilegeDataError::DatabaseDoesNotExist => {
+        ListPrivilegesError::DatabaseDoesNotExist => {
             format!("{}: Database '{}' doesn't exist.", argv0, name)
         }
     }

src/client/mysql_admutils_compatibility/mysql_dbadm.rs

@@ -21,7 +21,7 @@ use crate::{
         completion::mysql_database_completer,
         database_privileges::DatabasePrivilegeRow,
         protocol::{
-            ClientToServerMessageStream, GetDatabasesPrivilegeDataError, Request, Response,
+            ClientToServerMessageStream, ListPrivilegesError, Request, Response,
             create_client_to_server_message_stream,
         },
         types::MySQLDatabase,
@@ -314,7 +314,7 @@ async fn show_databases(
             .map(
                 |(name, rows)| match rows.map(|rows| (name.to_owned(), rows)) {
                     Ok(rows) => Ok(rows),
-                    Err(GetDatabasesPrivilegeDataError::DatabaseDoesNotExist) => Ok((name, vec![])),
+                    Err(ListPrivilegesError::DatabaseDoesNotExist) => Ok((name, vec![])),
                     Err(err) => Err(format_show_database_error_message(err, &name)),
                 },
             )