mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-12-29 06:02:07 +03:00
SQL Utility: Redesigned the input loop
The existing input loop called the `read_sql` method recursively. This lead to strange behaviour in the event loop. This is solved by encapsulating the REPL in an object and ensuring the `read_sql` method is not called recursively. The method now returns after the first recognized SQL statement or command.
This commit is contained in:
Jan de Visser
Andreas Kling
parent
9d9f082221
commit
89835ec83c
Notes:
sideshowbarker
2024-07-18 03:03:04 +09:00
Author: https://github.com/JanDeVisser Commit: https://github.com/SerenityOS/serenity/commit/89835ec83cf Pull-request: https://github.com/SerenityOS/serenity/pull/10094 Reviewed-by: https://github.com/trflynn89 ✅
@ -15,134 +15,27 @@
|
||||
#include <LibSQL/SQLClient.h>
|
||||
#include <unistd.h>
|
||||
|
||||
namespace {
|
||||
class SQLRepl {
|
||||
public:
|
||||
explicit SQLRepl(String const& database_name)
|
||||
: m_loop()
|
||||
{
|
||||
m_editor = Line::Editor::construct();
|
||||
m_editor->load_history(m_history_path);
|
||||
|
||||
String s_history_path = String::formatted("{}/.sql-history", Core::StandardPaths::home_directory());
|
||||
RefPtr<Line::Editor> s_editor;
|
||||
int s_repl_line_level = 0;
|
||||
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)
|
||||
{
|
||||
static StringBuilder prompt_builder;
|
||||
prompt_builder.clear();
|
||||
prompt_builder.append("> ");
|
||||
|
||||
for (auto i = 0; i < level; ++i)
|
||||
prompt_builder.append(" ");
|
||||
|
||||
return prompt_builder.build();
|
||||
}
|
||||
|
||||
String read_next_piece()
|
||||
{
|
||||
StringBuilder piece;
|
||||
|
||||
do {
|
||||
if (!piece.is_empty())
|
||||
piece.append('\n');
|
||||
|
||||
auto line_result = s_editor->get_line(prompt_for_level(s_repl_line_level));
|
||||
|
||||
if (line_result.is_error()) {
|
||||
s_keep_running = false;
|
||||
return {};
|
||||
}
|
||||
|
||||
auto& line = line_result.value();
|
||||
auto lexer = SQL::AST::Lexer(line);
|
||||
|
||||
s_editor->add_to_history(line);
|
||||
piece.append(line);
|
||||
|
||||
bool is_first_token = true;
|
||||
bool is_command = false;
|
||||
bool last_token_ended_statement = false;
|
||||
|
||||
for (SQL::AST::Token token = lexer.next(); token.type() != SQL::AST::TokenType::Eof; token = lexer.next()) {
|
||||
switch (token.type()) {
|
||||
case SQL::AST::TokenType::ParenOpen:
|
||||
++s_repl_line_level;
|
||||
break;
|
||||
case SQL::AST::TokenType::ParenClose:
|
||||
--s_repl_line_level;
|
||||
break;
|
||||
case SQL::AST::TokenType::SemiColon:
|
||||
last_token_ended_statement = true;
|
||||
break;
|
||||
case SQL::AST::TokenType::Period:
|
||||
if (is_first_token)
|
||||
is_command = true;
|
||||
break;
|
||||
default:
|
||||
last_token_ended_statement = is_command;
|
||||
break;
|
||||
}
|
||||
|
||||
is_first_token = false;
|
||||
}
|
||||
|
||||
s_repl_line_level = last_token_ended_statement ? 0 : (s_repl_line_level > 0 ? s_repl_line_level : 1);
|
||||
} while ((s_repl_line_level > 0) || piece.is_empty());
|
||||
|
||||
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)
|
||||
{
|
||||
if (command == ".exit" || command == ".quit") {
|
||||
s_keep_running = false;
|
||||
} 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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
String database_name(getlogin());
|
||||
|
||||
Core::ArgsParser args_parser;
|
||||
args_parser.set_general_help("This is a client for the SerenitySQL database server.");
|
||||
args_parser.add_option(database_name, "Database to connect to", "database", 'd', "database");
|
||||
args_parser.parse(argc, argv);
|
||||
|
||||
s_editor = Line::Editor::construct();
|
||||
s_editor->load_history(s_history_path);
|
||||
|
||||
s_editor->on_display_refresh = [](Line::Editor& editor) {
|
||||
m_editor->on_display_refresh = [this](Line::Editor& editor) {
|
||||
editor.strip_styles();
|
||||
|
||||
size_t open_indents = s_repl_line_level;
|
||||
int open_indents = m_repl_line_level;
|
||||
|
||||
auto line = editor.line();
|
||||
SQL::AST::Lexer lexer(line);
|
||||
|
||||
bool indenters_starting_line = true;
|
||||
for (SQL::AST::Token token = lexer.next(); token.type() != SQL::AST::TokenType::Eof; token = lexer.next()) {
|
||||
auto length = token.value().length();
|
||||
auto start = token.start_position().column - 1;
|
||||
auto end = token.end_position().column - 1;
|
||||
auto end = start + length;
|
||||
|
||||
if (indenters_starting_line) {
|
||||
if (token.type() != SQL::AST::TokenType::ParenClose)
|
||||
@ -175,41 +68,20 @@ int main(int argc, char** argv)
|
||||
}
|
||||
}
|
||||
|
||||
editor.set_prompt(prompt_for_level(open_indents));
|
||||
m_editor->set_prompt(prompt_for_level(open_indents));
|
||||
};
|
||||
|
||||
Core::EventLoop loop;
|
||||
s_sql_client = SQL::SQLClient::construct();
|
||||
int the_connection_id;
|
||||
m_sql_client = SQL::SQLClient::construct();
|
||||
|
||||
auto read_sql = [&]() {
|
||||
do {
|
||||
String piece = read_next_piece();
|
||||
if (!s_keep_running)
|
||||
break;
|
||||
if (piece.is_empty())
|
||||
continue;
|
||||
|
||||
if (piece.starts_with('.')) {
|
||||
handle_command(piece);
|
||||
} else {
|
||||
auto statement_id = s_sql_client->sql_statement(the_connection_id, piece);
|
||||
s_sql_client->async_statement_execute(statement_id);
|
||||
return;
|
||||
}
|
||||
} while (s_keep_running);
|
||||
s_sql_client->async_disconnect(the_connection_id);
|
||||
};
|
||||
|
||||
s_sql_client->on_connected = [&](int connection_id, String const& connected_to_database) {
|
||||
outln("** Connected to {} **", connected_to_database);
|
||||
s_current_database = connected_to_database;
|
||||
s_pending_database = "";
|
||||
s_connection_id = connection_id;
|
||||
m_sql_client->on_connected = [this](int connection_id, String const& connected_to_database) {
|
||||
outln("Connected to \033[33;1m{}\033[0m", connected_to_database);
|
||||
m_current_database = connected_to_database;
|
||||
m_pending_database = "";
|
||||
m_connection_id = connection_id;
|
||||
read_sql();
|
||||
};
|
||||
|
||||
s_sql_client->on_execution_success = [&](int, bool has_results, int updated, int created, int deleted) {
|
||||
m_sql_client->on_execution_success = [this](int, bool has_results, int updated, int created, int deleted) {
|
||||
if (updated != 0 || created != 0 || deleted != 0) {
|
||||
outln("{} row(s) updated, {} created, {} deleted", updated, created, deleted);
|
||||
}
|
||||
@ -218,41 +90,183 @@ int main(int argc, char** argv)
|
||||
}
|
||||
};
|
||||
|
||||
s_sql_client->on_next_result = [&](int, Vector<String> const& row) {
|
||||
m_sql_client->on_next_result = [](int, Vector<String> const& row) {
|
||||
StringBuilder builder;
|
||||
builder.join(", ", row);
|
||||
outln("{}", builder.build());
|
||||
outln(builder.build());
|
||||
};
|
||||
|
||||
s_sql_client->on_results_exhausted = [&](int, int total_rows) {
|
||||
m_sql_client->on_results_exhausted = [this](int, int total_rows) {
|
||||
outln("{} row(s)", total_rows);
|
||||
read_sql();
|
||||
};
|
||||
|
||||
s_sql_client->on_connection_error = [&](int, int code, String const& message) {
|
||||
m_sql_client->on_connection_error = [this](int, int code, String const& message) {
|
||||
outln("\033[33;1mConnection error:\033[0m {}", message);
|
||||
loop.quit(code);
|
||||
m_loop.quit(code);
|
||||
};
|
||||
|
||||
s_sql_client->on_execution_error = [&](int, int, String const& message) {
|
||||
m_sql_client->on_execution_error = [this](int, int, String const& message) {
|
||||
outln("\033[33;1mExecution error:\033[0m {}", message);
|
||||
read_sql();
|
||||
};
|
||||
|
||||
s_sql_client->on_disconnected = [&](int) {
|
||||
if (s_pending_database.is_empty()) {
|
||||
loop.quit(0);
|
||||
m_sql_client->on_disconnected = [this](int) {
|
||||
if (m_pending_database.is_empty()) {
|
||||
outln("Disconnected from \033[33;1m{}\033[0m and terminating", m_current_database);
|
||||
m_loop.quit(0);
|
||||
} else {
|
||||
outln("** Disconnected from {} **", s_current_database);
|
||||
s_current_database = "";
|
||||
s_sql_client->connect(s_pending_database);
|
||||
outln("Disconnected from \033[33;1m{}\033[0m", m_current_database);
|
||||
m_current_database = "";
|
||||
m_sql_client->connect(m_pending_database);
|
||||
}
|
||||
};
|
||||
|
||||
if (!database_name.is_empty())
|
||||
connect(database_name);
|
||||
auto rc = loop.exec();
|
||||
}
|
||||
|
||||
s_editor->save_history(s_history_path);
|
||||
~SQLRepl()
|
||||
{
|
||||
m_editor->save_history(m_history_path);
|
||||
}
|
||||
|
||||
return rc;
|
||||
void connect(String const& database_name)
|
||||
{
|
||||
if (m_current_database.is_empty()) {
|
||||
m_sql_client->connect(database_name);
|
||||
} else {
|
||||
m_pending_database = database_name;
|
||||
m_sql_client->async_disconnect(m_connection_id);
|
||||
}
|
||||
}
|
||||
|
||||
auto run()
|
||||
{
|
||||
return m_loop.exec();
|
||||
}
|
||||
|
||||
private:
|
||||
String m_history_path { String::formatted("{}/.sql-history", Core::StandardPaths::home_directory()) };
|
||||
RefPtr<Line::Editor> m_editor { nullptr };
|
||||
int m_repl_line_level { 0 };
|
||||
bool m_keep_running { true };
|
||||
String m_pending_database {};
|
||||
String m_current_database {};
|
||||
AK::RefPtr<SQL::SQLClient> m_sql_client { nullptr };
|
||||
int m_connection_id { 0 };
|
||||
Core::EventLoop m_loop;
|
||||
|
||||
String read_next_piece()
|
||||
{
|
||||
StringBuilder piece;
|
||||
|
||||
do {
|
||||
if (!piece.is_empty())
|
||||
piece.append('\n');
|
||||
|
||||
auto line_result = m_editor->get_line(prompt_for_level(m_repl_line_level));
|
||||
|
||||
if (line_result.is_error()) {
|
||||
m_keep_running = false;
|
||||
return {};
|
||||
}
|
||||
|
||||
auto& line = line_result.value();
|
||||
auto lexer = SQL::AST::Lexer(line);
|
||||
|
||||
m_editor->add_to_history(line);
|
||||
piece.append(line);
|
||||
|
||||
bool is_first_token = true;
|
||||
bool is_command = false;
|
||||
bool last_token_ended_statement = false;
|
||||
|
||||
for (SQL::AST::Token token = lexer.next(); token.type() != SQL::AST::TokenType::Eof; token = lexer.next()) {
|
||||
switch (token.type()) {
|
||||
case SQL::AST::TokenType::ParenOpen:
|
||||
++m_repl_line_level;
|
||||
break;
|
||||
case SQL::AST::TokenType::ParenClose:
|
||||
--m_repl_line_level;
|
||||
break;
|
||||
case SQL::AST::TokenType::SemiColon:
|
||||
last_token_ended_statement = true;
|
||||
break;
|
||||
case SQL::AST::TokenType::Period:
|
||||
if (is_first_token)
|
||||
is_command = true;
|
||||
break;
|
||||
default:
|
||||
last_token_ended_statement = is_command;
|
||||
break;
|
||||
}
|
||||
|
||||
is_first_token = false;
|
||||
}
|
||||
|
||||
m_repl_line_level = last_token_ended_statement ? 0 : (m_repl_line_level > 0 ? m_repl_line_level : 1);
|
||||
} while ((m_repl_line_level > 0) || piece.is_empty());
|
||||
|
||||
return piece.to_string();
|
||||
}
|
||||
|
||||
void read_sql()
|
||||
{
|
||||
String piece = read_next_piece();
|
||||
if (piece.is_empty())
|
||||
return;
|
||||
|
||||
if (piece.starts_with('.')) {
|
||||
handle_command(piece);
|
||||
} else {
|
||||
auto statement_id = m_sql_client->sql_statement(m_connection_id, piece);
|
||||
m_sql_client->async_statement_execute(statement_id);
|
||||
}
|
||||
|
||||
if (!m_keep_running) {
|
||||
m_sql_client->async_disconnect(m_connection_id);
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
static String prompt_for_level(int level)
|
||||
{
|
||||
static StringBuilder prompt_builder;
|
||||
prompt_builder.clear();
|
||||
prompt_builder.append("> ");
|
||||
|
||||
for (auto i = 0; i < level; ++i)
|
||||
prompt_builder.append(" ");
|
||||
|
||||
return prompt_builder.build();
|
||||
}
|
||||
|
||||
void handle_command(StringView command)
|
||||
{
|
||||
if (command == ".exit" || command == ".quit") {
|
||||
m_keep_running = false;
|
||||
} 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);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
String database_name(getlogin());
|
||||
|
||||
Core::ArgsParser args_parser;
|
||||
args_parser.set_general_help("This is a client for the SerenitySQL database server.");
|
||||
args_parser.add_option(database_name, "Database to connect to", "database", 'd', "database");
|
||||
args_parser.parse(argc, argv);
|
||||
|
||||
SQLRepl repl(database_name);
|
||||
return repl.run();
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user