RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:47:34 +00:00
Code Issues Activity Actions

SQL Utility: Implement connection switching

Browse source 
You can now connect to a different database using the .connect meta
command.
This commit is contained in:
Jan de Visser 2021-09-02 12:08:11 +02:00 • committed by Andreas Kling
parent e923cb3739
commit 9d9f082221
1 changed files with 45 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

61
Userland/Utilities/sql.cpp
View file

@ -21,6 +21,10 @@ String s_history_path = String::formatted("{}/.sql-history", Core::StandardPaths
RefPtr<Line::Editor> s_editor; RefPtr<Line::Editor> s_editor;
int s_repl_line_level = 0; int s_repl_line_level = 0;
bool s_keep_running = true; bool s_keep_running = true;
String s_pending_database = "";
String s_current_database = "";
AK::RefPtr<SQL::SQLClient> s_sql_client;
int s_connection_id = 0;
String prompt_for_level(int level) String prompt_for_level(int level)
{ {
@ -88,12 +92,29 @@ String read_next_piece()
return piece.to_string(); return piece.to_string();
} }
void connect(String const& database_name)
{
if (s_current_database.is_empty()) {
s_sql_client->connect(database_name);
} else {
s_pending_database = database_name;
s_sql_client->async_disconnect(s_connection_id);
}
}
void handle_command(StringView command) void handle_command(StringView command)
{ {
if (command == ".exit" || command == ".quit") if (command == ".exit" || command == ".quit") {
s_keep_running = false; s_keep_running = false;
else } else if (command.starts_with(".connect ")) {
auto parts = command.split_view(' ');
if (parts.size() == 2)
connect(parts[1]);
else
outln("\033[33;1mUsage: .connect <database name>\033[0m {}", command);
} else {
outln("\033[33;1mUnrecognized command:\033[0m {}", command); outln("\033[33;1mUnrecognized command:\033[0m {}", command);
}
} }
} }
@ -158,7 +179,7 @@ int main(int argc, char** argv)
}; };
Core::EventLoop loop; Core::EventLoop loop;
auto sql_client = SQL::SQLClient::construct(); s_sql_client = SQL::SQLClient::construct();
int the_connection_id; int the_connection_id;
auto read_sql = [&]() { auto read_sql = [&]() {
@ -172,21 +193,23 @@ int main(int argc, char** argv)
if (piece.starts_with('.')) { if (piece.starts_with('.')) {
handle_command(piece); handle_command(piece);
} else { } else {
auto statement_id = sql_client->sql_statement(the_connection_id, piece); auto statement_id = s_sql_client->sql_statement(the_connection_id, piece);
sql_client->async_statement_execute(statement_id); s_sql_client->async_statement_execute(statement_id);
return; return;
} }
} while (s_keep_running); } while (s_keep_running);
sql_client->async_disconnect(the_connection_id); s_sql_client->async_disconnect(the_connection_id);
}; };
sql_client->on_connected = [&](int connection_id, String const& connected_to_database) { s_sql_client->on_connected = [&](int connection_id, String const& connected_to_database) {
outln("** Connected to {} **", connected_to_database); outln("** Connected to {} **", connected_to_database);
the_connection_id = connection_id; s_current_database = connected_to_database;
s_pending_database = "";
s_connection_id = connection_id;
read_sql(); read_sql();
}; };
sql_client->on_execution_success = [&](int, bool has_results, int updated, int created, int deleted) { s_sql_client->on_execution_success = [&](int, bool has_results, int updated, int created, int deleted) {
if (updated != 0 || created != 0 || deleted != 0) { if (updated != 0 || created != 0 || deleted != 0) {
outln("{} row(s) updated, {} created, {} deleted", updated, created, deleted); outln("{} row(s) updated, {} created, {} deleted", updated, created, deleted);
} }
@ -195,32 +218,38 @@ int main(int argc, char** argv)
} }
}; };
sql_client->on_next_result = [&](int, Vector<String> const& row) { s_sql_client->on_next_result = [&](int, Vector<String> const& row) {
StringBuilder builder; StringBuilder builder;
builder.join(", ", row); builder.join(", ", row);
outln("{}", builder.build()); outln("{}", builder.build());
}; };
sql_client->on_results_exhausted = [&](int, int total_rows) { s_sql_client->on_results_exhausted = [&](int, int total_rows) {
outln("{} row(s)", total_rows); outln("{} row(s)", total_rows);
read_sql(); read_sql();
}; };
sql_client->on_connection_error = [&](int, int code, String const& message) { s_sql_client->on_connection_error = [&](int, int code, String const& message) {
outln("\033[33;1mConnection error:\033[0m {}", message); outln("\033[33;1mConnection error:\033[0m {}", message);
loop.quit(code); loop.quit(code);
}; };
sql_client->on_execution_error = [&](int, int, String const& message) { s_sql_client->on_execution_error = [&](int, int, String const& message) {
outln("\033[33;1mExecution error:\033[0m {}", message); outln("\033[33;1mExecution error:\033[0m {}", message);
read_sql(); read_sql();
}; };
sql_client->on_disconnected = [&](int) { s_sql_client->on_disconnected = [&](int) {
loop.quit(0); if (s_pending_database.is_empty()) {
loop.quit(0);
} else {
outln("** Disconnected from {} **", s_current_database);
s_current_database = "";
s_sql_client->connect(s_pending_database);
}
}; };
sql_client->connect(database_name); connect(database_name);
auto rc = loop.exec(); auto rc = loop.exec();
s_editor->save_history(s_history_path); s_editor->save_history(s_history_path);