Projects/muscl
12
5
Fork 0
Code Issues 75 Pull Requests Actions Packages Releases 1 Activity

core: split mysql user/db into separate types module

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-11-26 02:03:18 +09:00
parent 9e39401049
commit 1571f6e2c7
25 changed files with 170 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/commands/create_db.rs
View File

@@ -4,9 +4,12 @@ use tokio_stream::StreamExt;
use crate::{
client::commands::erroneous_server_response,
core::protocol::{
ClientToServerMessageStream, MySQLDatabase, Request, Response,
print_create_databases_output_status, print_create_databases_output_status_json,
core::{
protocol::{
ClientToServerMessageStream, Request, Response, print_create_databases_output_status,
print_create_databases_output_status_json,
},
types::MySQLDatabase,
},
};

10
src/client/commands/create_user.rs
View File

@@ -5,10 +5,12 @@ use tokio_stream::StreamExt;
use crate::{
client::commands::{erroneous_server_response, read_password_from_stdin_with_double_check},
core::protocol::{
ClientToServerMessageStream, MySQLUser, Request, Response,
print_create_users_output_status, print_create_users_output_status_json,
print_set_password_output_status,
core::{
protocol::{
ClientToServerMessageStream, Request, Response, print_create_users_output_status,
print_create_users_output_status_json, print_set_password_output_status,
},
types::MySQLUser,
},
};

9
src/client/commands/drop_db.rs
View File

@@ -4,9 +4,12 @@ use tokio_stream::StreamExt;
use crate::{
client::commands::erroneous_server_response,
core::protocol::{
ClientToServerMessageStream, MySQLDatabase, Request, Response,
print_drop_databases_output_status, print_drop_databases_output_status_json,
core::{
protocol::{
ClientToServerMessageStream, Request, Response, print_drop_databases_output_status,
print_drop_databases_output_status_json,
},
types::MySQLDatabase,
},
};

9
src/client/commands/drop_user.rs
View File

@@ -4,9 +4,12 @@ use tokio_stream::StreamExt;
use crate::{
client::commands::erroneous_server_response,
core::protocol::{
ClientToServerMessageStream, MySQLUser, Request, Response, print_drop_users_output_status,
print_drop_users_output_status_json,
core::{
protocol::{
ClientToServerMessageStream, Request, Response, print_drop_users_output_status,
print_drop_users_output_status_json,
},
types::MySQLUser,
},
};

3
src/client/commands/edit_db_privs.rs
View File

@@ -17,9 +17,10 @@ use crate::{
parse_privilege_data_from_editor_content, reduce_privilege_diffs,
},
protocol::{
ClientToServerMessageStream, MySQLDatabase, Request, Response,
ClientToServerMessageStream, Request, Response,
print_modify_database_privileges_output_status,
},
types::MySQLDatabase,
},
};

9
src/client/commands/lock_user.rs
View File

@@ -4,9 +4,12 @@ use tokio_stream::StreamExt;
use crate::{
client::commands::erroneous_server_response,
core::protocol::{
ClientToServerMessageStream, MySQLUser, Request, Response, print_lock_users_output_status,
print_lock_users_output_status_json,
core::{
protocol::{
ClientToServerMessageStream, Request, Response, print_lock_users_output_status,
print_lock_users_output_status_json,
},
types::MySQLUser,
},
};

9
src/client/commands/passwd_user.rs
View File

@@ -6,9 +6,12 @@ use tokio_stream::StreamExt;
use crate::{
client::commands::erroneous_server_response,
core::protocol::{
ClientToServerMessageStream, ListUsersError, MySQLUser, Request, Response,
print_set_password_output_status,
core::{
protocol::{
ClientToServerMessageStream, ListUsersError, Request, Response,
print_set_password_output_status,
},
types::MySQLUser,
},
};

5
src/client/commands/show_db.rs
View File

@@ -5,7 +5,10 @@ use tokio_stream::StreamExt;
use crate::{
client::commands::erroneous_server_response,
core::protocol::{ClientToServerMessageStream, MySQLDatabase, Request, Response},
core::{
protocol::{ClientToServerMessageStream, Request, Response},
types::MySQLDatabase,
},
};
#[derive(Parser, Debug, Clone)]

3
src/client/commands/show_db_privs.rs
View File

@@ -8,7 +8,8 @@ use crate::{
core::{
common::yn,
database_privileges::{DATABASE_PRIVILEGE_FIELDS, db_priv_field_human_readable_name},
protocol::{ClientToServerMessageStream, MySQLDatabase, Request, Response},
protocol::{ClientToServerMessageStream, Request, Response},
types::MySQLDatabase,
},
};

5
src/client/commands/show_user.rs
View File

@@ -5,7 +5,10 @@ use tokio_stream::StreamExt;
use crate::{
client::commands::erroneous_server_response,
core::protocol::{ClientToServerMessageStream, MySQLUser, Request, Response},
core::{
protocol::{ClientToServerMessageStream, Request, Response},
types::MySQLUser,
},
};
#[derive(Parser, Debug, Clone)]

9
src/client/commands/unlock_user.rs
View File

@@ -4,9 +4,12 @@ use tokio_stream::StreamExt;
use crate::{
client::commands::erroneous_server_response,
core::protocol::{
ClientToServerMessageStream, MySQLUser, Request, Response,
print_unlock_users_output_status, print_unlock_users_output_status_json,
core::{
protocol::{
ClientToServerMessageStream, Request, Response, print_unlock_users_output_status,
print_unlock_users_output_status_json,
},
types::MySQLUser,
},
};

2
src/client/mysql_admutils_compatibility/common.rs
View File

@@ -1,4 +1,4 @@
use crate::core::protocol::{MySQLDatabase, MySQLUser};
use crate::core::types::{MySQLDatabase, MySQLUser};
#[inline]
pub fn trim_db_name_to_32_chars(db_name: &MySQLDatabase) -> MySQLDatabase {

5
src/client/mysql_admutils_compatibility/mysql_dbadm.rs
View File

@@ -19,9 +19,10 @@ use crate::{
bootstrap::bootstrap_server_connection_and_drop_privileges,
database_privileges::DatabasePrivilegeRow,
protocol::{
ClientToServerMessageStream, GetDatabasesPrivilegeDataError, MySQLDatabase, Request,
Response, create_client_to_server_message_stream,
ClientToServerMessageStream, GetDatabasesPrivilegeDataError, Request, Response,
create_client_to_server_message_stream,
},
types::MySQLDatabase,
},
};

4
src/client/mysql_admutils_compatibility/mysql_useradm.rs
View File

@@ -18,9 +18,9 @@ use crate::{
core::{
bootstrap::bootstrap_server_connection_and_drop_privileges,
protocol::{
ClientToServerMessageStream, MySQLUser, Request, Response,
create_client_to_server_message_stream,
ClientToServerMessageStream, Request, Response, create_client_to_server_message_stream,
},
types::MySQLUser,
},
server::sql::user_operations::DatabaseUser,
};