mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-04-26 06:18:59 +00:00
f9d23e1d2f
Currently, when clients connect to SQL server, we inform them of any errors opening the database via an asynchronous IPC. But we already know about these errors before returning from the connect() IPC, so this roundabout propagation is a bit unnecessary. Now if we fail to open the database, we will simply not send back a valid connection ID. Disconnect has a similar story. Rather than disconnecting and invoking an asynchronous IPC to inform the client of the disconnect, make the disconnect() IPC synchronous (because all it does is remove the database from the map of open databases). Further, the only user of this command is the SQL REPL when it wants to connect to a different database, so it makes sense to block it. This did require moving a bit of logic around in the REPL to accommodate this change.
40 lines
1.5 KiB
C++
40 lines
1.5 KiB
C++
/*
|
|
* Copyright (c) 2021, Jan de Visser <jan@de-visser.net>
|
|
* Copyright (c) 2022, the SerenityOS developers.
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <LibIPC/ConnectionToServer.h>
|
|
#include <LibSQL/Result.h>
|
|
#include <SQLServer/SQLClientEndpoint.h>
|
|
#include <SQLServer/SQLServerEndpoint.h>
|
|
|
|
namespace SQL {
|
|
|
|
class SQLClient
|
|
: public IPC::ConnectionToServer<SQLClientEndpoint, SQLServerEndpoint>
|
|
, public SQLClientEndpoint {
|
|
IPC_CLIENT_CONNECTION(SQLClient, "/tmp/session/%sid/portal/sql"sv)
|
|
virtual ~SQLClient() = default;
|
|
|
|
Function<void(u64, u64, SQLErrorCode, DeprecatedString const&)> on_execution_error;
|
|
Function<void(u64, u64, bool, size_t, size_t, size_t)> on_execution_success;
|
|
Function<void(u64, u64, Vector<DeprecatedString> const&)> on_next_result;
|
|
Function<void(u64, u64, size_t)> on_results_exhausted;
|
|
|
|
private:
|
|
SQLClient(NonnullOwnPtr<Core::Stream::LocalSocket> socket)
|
|
: IPC::ConnectionToServer<SQLClientEndpoint, SQLServerEndpoint>(*this, move(socket))
|
|
{
|
|
}
|
|
|
|
virtual void execution_success(u64 statement_id, u64 execution_id, bool has_results, size_t created, size_t updated, size_t deleted) override;
|
|
virtual void next_result(u64 statement_id, u64 execution_id, Vector<DeprecatedString> const&) override;
|
|
virtual void results_exhausted(u64 statement_id, u64 execution_id, size_t total_rows) override;
|
|
virtual void execution_error(u64 statement_id, u64 execution_id, SQLErrorCode const& code, DeprecatedString const& message) override;
|
|
};
|
|
|
|
}
|